From f91a18606f9b47e8c803d37a7a7d9c003ea2727d Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 10 Apr 2018 22:13:15 +0200
Subject: [PATCH 001/200] Add backend support for bookmarks

Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
---
 .../api/v1/bookmarks_controller.rb            | 71 +++++++++++++++++++
 .../api/v1/statuses/bookmarks_controller.rb   | 39 ++++++++++
 app/models/bookmark.rb                        | 26 +++++++
 app/models/concerns/account_associations.rb   |  1 +
 app/models/concerns/account_interactions.rb   |  4 ++
 app/models/status.rb                          |  5 ++
 .../status_relationships_presenter.rb         |  2 +
 app/serializers/rest/status_serializer.rb     |  9 +++
 config/routes.rb                              |  4 ++
 db/migrate/20180831171112_create_bookmarks.rb | 14 ++++
 db/schema.rb                                  | 12 ++++
 11 files changed, 187 insertions(+)
 create mode 100644 app/controllers/api/v1/bookmarks_controller.rb
 create mode 100644 app/controllers/api/v1/statuses/bookmarks_controller.rb
 create mode 100644 app/models/bookmark.rb
 create mode 100644 db/migrate/20180831171112_create_bookmarks.rb

diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
new file mode 100644
index 000000000..49038807d
--- /dev/null
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+class Api::V1::BookmarksController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read }
+  before_action :require_user!
+  after_action :insert_pagination_headers
+
+  respond_to :json
+
+  def index
+    @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+  end
+
+  private
+
+  def load_statuses
+    cached_bookmarks
+  end
+
+  def cached_bookmarks
+    cache_collection(
+      Status.reorder(nil).joins(:bookmarks).merge(results),
+      Status
+    )
+  end
+
+  def results
+    @_results ||= account_bookmarks.paginate_by_max_id(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def account_bookmarks
+    current_account.bookmarks
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    if records_continue?
+      api_v1_bookmarks_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    unless results.empty?
+      api_v1_bookmarks_url pagination_params(since_id: pagination_since_id)
+    end
+  end
+
+  def pagination_max_id
+    results.last.id
+  end
+
+  def pagination_since_id
+    results.first.id
+  end
+
+  def records_continue?
+    results.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
new file mode 100644
index 000000000..d7def5f1f
--- /dev/null
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::BookmarksController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :write }
+  before_action :require_user!
+
+  respond_to :json
+
+  def create
+    @status = bookmarked_status
+    render json: @status, serializer: REST::StatusSerializer
+  end
+
+  def destroy
+    @status = requested_status
+    @bookmarks_map = { @status.id => false }
+
+    bookmark = Bookmark.find_by!(account: current_user.account, status: @status)
+    bookmark.destroy!
+
+    render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, bookmarks_map: @bookmarks_map)
+  end
+
+  private
+
+  def bookmarked_status
+    authorize_with current_user.account, requested_status, :show?
+
+    bookmark = Bookmark.find_or_create_by!(account: current_user.account, status: requested_status)
+
+    bookmark.status.reload
+  end
+
+  def requested_status
+    Status.find(params[:status_id])
+  end
+end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
new file mode 100644
index 000000000..01dc48ee7
--- /dev/null
+++ b/app/models/bookmark.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: bookmarks
+#
+#  id         :integer          not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  account_id :integer          not null
+#  status_id  :integer          not null
+#
+
+class Bookmark < ApplicationRecord
+  include Paginable
+
+  update_index('statuses#status', :status) if Chewy.enabled?
+
+  belongs_to :account, inverse_of: :bookmarks
+  belongs_to :status,  inverse_of: :bookmarks
+
+  validates :status_id, uniqueness: { scope: :account_id }
+
+  before_validation do
+    self.status = status.reblog if status&.reblog?
+  end
+end
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb
index 7dafeee34..4e730451a 100644
--- a/app/models/concerns/account_associations.rb
+++ b/app/models/concerns/account_associations.rb
@@ -11,6 +11,7 @@ module AccountAssociations
     has_many :stream_entries, inverse_of: :account, dependent: :destroy
     has_many :statuses, inverse_of: :account, dependent: :destroy
     has_many :favourites, inverse_of: :account, dependent: :destroy
+    has_many :bookmarks, inverse_of: :account, dependent: :destroy
     has_many :mentions, inverse_of: :account, dependent: :destroy
     has_many :notifications, inverse_of: :account, dependent: :destroy
     has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index ad2909d91..f27d39483 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -186,6 +186,10 @@ module AccountInteractions
     status.proper.favourites.where(account: self).exists?
   end
 
+  def bookmarked?(status)
+    status.proper.bookmarks.where(account: self).exists?
+  end
+
   def reblogged?(status)
     status.proper.reblogs.where(account: self).exists?
   end
diff --git a/app/models/status.rb b/app/models/status.rb
index 035423b40..bd52c3387 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -49,6 +49,7 @@ class Status < ApplicationRecord
   belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
+  has_many :bookmarks, inverse_of: :status, dependent: :destroy
   has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
   has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
   has_many :mentions, dependent: :destroy, inverse_of: :status
@@ -324,6 +325,10 @@ class Status < ApplicationRecord
       Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |f, h| h[f.status_id] = true }
     end
 
+    def bookmarks_map(status_ids, account_id)
+      Bookmark.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
+    end
+
     def reblogs_map(status_ids, account_id)
       select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).reorder(nil).each_with_object({}) { |s, h| h[s.reblog_of_id] = true }
     end
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index b04e10e2f..64e688d87 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -7,6 +7,7 @@ class StatusRelationshipsPresenter
     if current_account_id.nil?
       @reblogs_map    = {}
       @favourites_map = {}
+      @bookmarks_map  = {}
       @mutes_map      = {}
       @pins_map       = {}
     else
@@ -17,6 +18,7 @@ class StatusRelationshipsPresenter
 
       @reblogs_map     = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
       @favourites_map  = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
+      @bookmarks_map   = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
       @mutes_map       = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
       @pins_map        = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
     end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bfc2d78b4..8a61c1056 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -9,6 +9,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
   attribute :muted, if: :current_user?
+  attribute :bookmarked, if: :current_user?
   attribute :pinned, if: :pinnable?
 
   belongs_to :reblog, serializer: REST::StatusSerializer
@@ -85,6 +86,14 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 
+  def bookmarked
+    if instance_options && instance_options[:bookmarks]
+      instance_options[:bookmarks].bookmarks_map[object.id] || false
+    else
+      current_user.account.bookmarked?(object)
+    end
+  end
+
   def pinned
     if instance_options && instance_options[:relationships]
       instance_options[:relationships].pins_map[object.id] || false
diff --git a/config/routes.rb b/config/routes.rb
index af49845cc..d077f1643 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -255,6 +255,9 @@ Rails.application.routes.draw do
           resource :favourite, only: :create
           post :unfavourite, to: 'favourites#destroy'
 
+          resource :bookmark, only: :create
+          post :unbookmark, to: 'bookmarks#destroy'
+
           resource :mute, only: :create
           post :unmute, to: 'mutes#destroy'
 
@@ -294,6 +297,7 @@ Rails.application.routes.draw do
       resources :blocks,       only: [:index]
       resources :mutes,        only: [:index]
       resources :favourites,   only: [:index]
+      resources :bookmarks,    only: [:index]
       resources :reports,      only: [:create]
       resources :filters,      only: [:index, :create, :show, :update, :destroy]
       resources :endorsements, only: [:index]
diff --git a/db/migrate/20180831171112_create_bookmarks.rb b/db/migrate/20180831171112_create_bookmarks.rb
new file mode 100644
index 000000000..208da452b
--- /dev/null
+++ b/db/migrate/20180831171112_create_bookmarks.rb
@@ -0,0 +1,14 @@
+class CreateBookmarks < ActiveRecord::Migration[5.1]
+  def change
+    create_table :bookmarks do |t|
+      t.references :account, null: false
+      t.references :status, null: false
+
+      t.timestamps
+    end
+
+    add_foreign_key :bookmarks, :accounts, column: :account_id, on_delete: :cascade
+    add_foreign_key :bookmarks, :statuses, column: :status_id, on_delete: :cascade
+    add_index :bookmarks, [:account_id, :status_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3487adf08..2dcdf1f0e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -182,6 +182,16 @@ ActiveRecord::Schema.define(version: 2019_01_17_114553) do
     t.index ["target_account_id"], name: "index_blocks_on_target_account_id"
   end
 
+  create_table "bookmarks", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "status_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "status_id"], name: "index_bookmarks_on_account_id_and_status_id", unique: true
+    t.index ["account_id"], name: "index_bookmarks_on_account_id"
+    t.index ["status_id"], name: "index_bookmarks_on_status_id"
+  end
+
   create_table "conversation_mutes", force: :cascade do |t|
     t.bigint "conversation_id", null: false
     t.bigint "account_id", null: false
@@ -702,6 +712,8 @@ ActiveRecord::Schema.define(version: 2019_01_17_114553) do
   add_foreign_key "backups", "users", on_delete: :nullify
   add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade
   add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
+  add_foreign_key "bookmarks", "accounts", on_delete: :cascade
+  add_foreign_key "bookmarks", "statuses", on_delete: :cascade
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
   add_foreign_key "custom_filters", "accounts", on_delete: :cascade

From 4add8797574ca6034886ebe59c1c19346b019f5f Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 11 Apr 2018 21:05:08 +0200
Subject: [PATCH 002/200] Add spec for bookmark endpoints

---
 .../api/v1/bookmarks_controller_spec.rb       | 78 +++++++++++++++++++
 .../v1/statuses/bookmarks_controller_spec.rb  | 57 ++++++++++++++
 spec/fabricators/bookmark_fabricator.rb       |  4 +
 3 files changed, 139 insertions(+)
 create mode 100644 spec/controllers/api/v1/bookmarks_controller_spec.rb
 create mode 100644 spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
 create mode 100644 spec/fabricators/bookmark_fabricator.rb

diff --git a/spec/controllers/api/v1/bookmarks_controller_spec.rb b/spec/controllers/api/v1/bookmarks_controller_spec.rb
new file mode 100644
index 000000000..26130e71b
--- /dev/null
+++ b/spec/controllers/api/v1/bookmarks_controller_spec.rb
@@ -0,0 +1,78 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::BookmarksController, type: :controller do
+  render_views
+
+  let(:user)  { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
+
+  describe 'GET #index' do
+    context 'without token' do
+      it 'returns http unauthorized' do
+        get :index
+        expect(response).to have_http_status :unauthorized
+      end
+    end
+
+    context 'with token' do
+      context 'without read scope' do
+        before do
+          allow(controller).to receive(:doorkeeper_token) do
+            Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: '')
+          end
+        end
+
+        it 'returns http forbidden' do
+          get :index
+          expect(response).to have_http_status :forbidden
+        end
+      end
+
+      context 'without valid resource owner' do
+        before do
+          token = Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
+          user.destroy!
+
+          allow(controller).to receive(:doorkeeper_token) { token }
+        end
+
+        it 'returns http unprocessable entity' do
+          get :index
+          expect(response).to have_http_status :unprocessable_entity
+        end
+      end
+
+      context 'with read scope and valid resource owner' do
+        before do
+          allow(controller).to receive(:doorkeeper_token) do
+            Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
+          end
+        end
+
+        it 'shows bookmarks owned by the user' do
+          bookmarked_by_user = Fabricate(:bookmark, account: user.account)
+          bookmarked_by_others = Fabricate(:bookmark)
+
+          get :index
+
+          expect(assigns(:statuses)).to match_array [bookmarked_by_user.status]
+        end
+
+        it 'adds pagination headers if necessary' do
+          bookmark = Fabricate(:bookmark, account: user.account)
+
+          get :index, params: { limit: 1 }
+
+          expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&max_id=#{bookmark.id}"
+          expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&since_id=#{bookmark.id}"
+        end
+
+        it 'does not add pagination headers if not necessary' do
+          get :index
+
+          expect(response.headers['Link']).to eq nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
new file mode 100644
index 000000000..d881e22ed
--- /dev/null
+++ b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Statuses::BookmarksController do
+  render_views
+
+  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
+
+  context 'with an oauth token' do
+    before do
+      allow(controller).to receive(:doorkeeper_token) { token }
+    end
+
+    describe 'POST #create' do
+      let(:status) { Fabricate(:status, account: user.account) }
+
+      before do
+        post :create, params: { status_id: status.id }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'updates the bookmarked attribute' do
+        expect(user.account.bookmarked?(status)).to be true
+      end
+
+      it 'return json with updated attributes' do
+        hash_body = body_as_json
+
+        expect(hash_body[:id]).to eq status.id.to_s
+        expect(hash_body[:bookmarked]).to be true
+      end
+    end
+
+    describe 'POST #destroy' do
+      let(:status) { Fabricate(:status, account: user.account) }
+
+      before do
+        Bookmark.find_or_create_by!(account: user.account, status: status)
+        post :destroy, params: { status_id: status.id }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'updates the bookmarked attribute' do
+        expect(user.account.bookmarked?(status)).to be false
+      end
+    end
+  end
+end
diff --git a/spec/fabricators/bookmark_fabricator.rb b/spec/fabricators/bookmark_fabricator.rb
new file mode 100644
index 000000000..12cbc5bfa
--- /dev/null
+++ b/spec/fabricators/bookmark_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:bookmark) do
+  account
+  status
+end

From 04c114866f962f2eea03f0e7f94f731a6eefed93 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 11 Apr 2018 20:24:54 +0200
Subject: [PATCH 003/200] Add front-end support for bookmarks

---
 app/javascript/mastodon/actions/bookmarks.js  | 90 +++++++++++++++++
 .../mastodon/actions/interactions.js          | 78 +++++++++++++++
 .../mastodon/components/status_action_bar.js  |  7 ++
 .../mastodon/containers/status_container.js   | 10 ++
 .../features/bookmarked_statuses/index.js     | 98 +++++++++++++++++++
 .../features/getting_started/index.js         |  2 +
 .../features/status/components/action_bar.js  |  7 ++
 .../mastodon/features/status/index.js         | 11 +++
 .../features/ui/components/columns_area.js    |  3 +-
 app/javascript/mastodon/features/ui/index.js  |  2 +
 .../features/ui/util/async-components.js      |  4 +
 .../mastodon/reducers/status_lists.js         | 29 ++++++
 app/javascript/mastodon/reducers/statuses.js  |  6 ++
 13 files changed, 346 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/mastodon/actions/bookmarks.js
 create mode 100644 app/javascript/mastodon/features/bookmarked_statuses/index.js

diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
new file mode 100644
index 000000000..544ed2ff2
--- /dev/null
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -0,0 +1,90 @@
+import api, { getLinks } from '../api';
+import { importFetchedStatuses } from './importer';
+
+export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
+export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
+export const BOOKMARKED_STATUSES_FETCH_FAIL    = 'BOOKMARKED_STATUSES_FETCH_FAIL';
+
+export const BOOKMARKED_STATUSES_EXPAND_REQUEST = 'BOOKMARKED_STATUSES_EXPAND_REQUEST';
+export const BOOKMARKED_STATUSES_EXPAND_SUCCESS = 'BOOKMARKED_STATUSES_EXPAND_SUCCESS';
+export const BOOKMARKED_STATUSES_EXPAND_FAIL    = 'BOOKMARKED_STATUSES_EXPAND_FAIL';
+
+export function fetchBookmarkedStatuses() {
+  return (dispatch, getState) => {
+    if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
+      return;
+    }
+
+    dispatch(fetchBookmarkedStatusesRequest());
+
+    api(getState).get('/api/v1/bookmarks').then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(fetchBookmarkedStatusesFail(error));
+    });
+  };
+};
+
+export function fetchBookmarkedStatusesRequest() {
+  return {
+    type: BOOKMARKED_STATUSES_FETCH_REQUEST,
+  };
+};
+
+export function fetchBookmarkedStatusesSuccess(statuses, next) {
+  return {
+    type: BOOKMARKED_STATUSES_FETCH_SUCCESS,
+    statuses,
+    next,
+  };
+};
+
+export function fetchBookmarkedStatusesFail(error) {
+  return {
+    type: BOOKMARKED_STATUSES_FETCH_FAIL,
+    error,
+  };
+};
+
+export function expandBookmarkedStatuses() {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null);
+
+    if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
+      return;
+    }
+
+    dispatch(expandBookmarkedStatusesRequest());
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandBookmarkedStatusesFail(error));
+    });
+  };
+};
+
+export function expandBookmarkedStatusesRequest() {
+  return {
+    type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
+  };
+};
+
+export function expandBookmarkedStatusesSuccess(statuses, next) {
+  return {
+    type: BOOKMARKED_STATUSES_EXPAND_SUCCESS,
+    statuses,
+    next,
+  };
+};
+
+export function expandBookmarkedStatusesFail(error) {
+  return {
+    type: BOOKMARKED_STATUSES_EXPAND_FAIL,
+    error,
+  };
+};
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 2dc4c574c..3682370fc 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -33,6 +33,14 @@ export const UNPIN_REQUEST = 'UNPIN_REQUEST';
 export const UNPIN_SUCCESS = 'UNPIN_SUCCESS';
 export const UNPIN_FAIL    = 'UNPIN_FAIL';
 
+export const BOOKMARK_REQUEST = 'BOOKMARK_REQUEST';
+export const BOOKMARK_SUCCESS = 'BOOKMARKED_SUCCESS';
+export const BOOKMARK_FAIL    = 'BOOKMARKED_FAIL';
+
+export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
+export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
+export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
+
 export function reblog(status) {
   return function (dispatch, getState) {
     dispatch(reblogRequest(status));
@@ -187,6 +195,76 @@ export function unfavouriteFail(status, error) {
   };
 };
 
+export function bookmark(status) {
+  return function (dispatch, getState) {
+    dispatch(bookmarkRequest(status));
+
+    api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
+      dispatch(bookmarkSuccess(status, response.data));
+    }).catch(function (error) {
+      dispatch(bookmarkFail(status, error));
+    });
+  };
+};
+
+export function unbookmark(status) {
+  return (dispatch, getState) => {
+    dispatch(unbookmarkRequest(status));
+
+    api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
+      dispatch(unbookmarkSuccess(status, response.data));
+    }).catch(error => {
+      dispatch(unbookmarkFail(status, error));
+    });
+  };
+};
+
+export function bookmarkRequest(status) {
+  return {
+    type: BOOKMARK_REQUEST,
+    status: status,
+  };
+};
+
+export function bookmarkSuccess(status, response) {
+  return {
+    type: BOOKMARK_SUCCESS,
+    status: status,
+    response: response,
+  };
+};
+
+export function bookmarkFail(status, error) {
+  return {
+    type: BOOKMARK_FAIL,
+    status: status,
+    error: error,
+  };
+};
+
+export function unbookmarkRequest(status) {
+  return {
+    type: UNBOOKMARK_REQUEST,
+    status: status,
+  };
+};
+
+export function unbookmarkSuccess(status, response) {
+  return {
+    type: UNBOOKMARK_SUCCESS,
+    status: status,
+    response: response,
+  };
+};
+
+export function unbookmarkFail(status, error) {
+  return {
+    type: UNBOOKMARK_FAIL,
+    status: status,
+    error: error,
+  };
+};
+
 export function fetchReblogs(id) {
   return (dispatch, getState) => {
     dispatch(fetchReblogsRequest(id));
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 0995a1490..46af83066 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -23,6 +23,7 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
   report: { id: 'status.report', defaultMessage: 'Report @{name}' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
@@ -65,6 +66,7 @@ class StatusActionBar extends ImmutablePureComponent {
     onEmbed: PropTypes.func,
     onMuteConversation: PropTypes.func,
     onPin: PropTypes.func,
+    onBookmark: PropTypes.func,
     withDismiss: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
@@ -93,6 +95,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onFavourite(this.props.status);
   }
 
+  handleBookmarkClick = () => {
+    this.props.onBookmark(this.props.status);
+  }
+
   handleReblogClick = (e) => {
     this.props.onReblog(this.props.status, e);
   }
@@ -215,6 +221,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
         {shareButton}
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         <div className='status__action-bar-dropdown'>
           <DropdownMenuContainer disabled={anonymousAccess} status={status} items={menu} icon='ellipsis-h' size={18} direction='right' title={intl.formatMessage(messages.more)} />
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index b3555c76e..352d957e6 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -10,8 +10,10 @@ import {
 import {
   reblog,
   favourite,
+  bookmark,
   unreblog,
   unfavourite,
+  unbookmark,
   pin,
   unpin,
 } from '../actions/interactions';
@@ -91,6 +93,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onBookmark (status) {
+    if (status.get('bookmarked')) {
+      dispatch(unbookmark(status));
+    } else {
+      dispatch(bookmark(status));
+    }
+  },
+
   onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.js b/app/javascript/mastodon/features/bookmarked_statuses/index.js
new file mode 100644
index 000000000..195eba2a9
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.js
@@ -0,0 +1,98 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from '../../actions/bookmarks';
+import Column from '../ui/components/column';
+import ColumnHeader from '../../components/column_header';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import StatusList from '../../components/status_list';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { debounce } from 'lodash';
+
+const messages = defineMessages({
+  heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
+});
+
+const mapStateToProps = state => ({
+  statusIds: state.getIn(['status_lists', 'bookmarks', 'items']),
+  isLoading: state.getIn(['status_lists', 'bookmarks', 'isLoading'], true),
+  hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
+});
+
+@connect(mapStateToProps)
+@injectIntl
+export default class Bookmarks extends ImmutablePureComponent {
+
+  static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    statusIds: ImmutablePropTypes.list.isRequired,
+    intl: PropTypes.object.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+  };
+
+  componentWillMount () {
+    this.props.dispatch(fetchBookmarkedStatuses());
+  }
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('BOOKMARKS', {}));
+    }
+  }
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  }
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  }
+
+  setRef = c => {
+    this.column = c;
+  }
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandBookmarkedStatuses());
+  }, 300, { leading: true })
+
+  render () {
+    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
+    const pinned = !!columnId;
+
+    return (
+      <Column ref={this.setRef}>
+        <ColumnHeader
+          icon='bookmark'
+          title={intl.formatMessage(messages.heading)}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+          showBackButton
+        />
+
+        <StatusList
+          trackScroll={!pinned}
+          statusIds={statusIds}
+          scrollKey={`bookmarked_statuses-${columnId}`}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          onLoadMore={this.handleLoadMore}
+        />
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 709a3aa96..9163467fd 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -20,6 +20,7 @@ const messages = defineMessages({
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
   community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
@@ -115,6 +116,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     navItems.push(
       <ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
+      <ColumnLink key={i++} icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
       <ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
       <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
     );
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index d3b725283..df3e9a054 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -17,6 +17,7 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   mute: { id: 'status.mute', defaultMessage: 'Mute @{name}' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
@@ -42,6 +43,7 @@ class ActionBar extends React.PureComponent {
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
+    onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
     onDirect: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
@@ -66,6 +68,10 @@ class ActionBar extends React.PureComponent {
     this.props.onFavourite(this.props.status);
   }
 
+  handleBookmarkClick = (e) => {
+    this.props.onBookmark(this.props.status, e);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -177,6 +183,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         {shareButton}
+        <div className='detailed-status__button'><IconButton active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenuContainer size={18} icon='ellipsis-h' items={menu} direction='left' title='More' />
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index d48b682eb..a5699f192 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -12,6 +12,8 @@ import Column from '../ui/components/column';
 import {
   favourite,
   unfavourite,
+  bookmark,
+  unbookmark,
   reblog,
   unreblog,
   pin,
@@ -191,6 +193,14 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleBookmarkClick = (status) => {
+    if (status.get('bookmarked')) {
+      this.props.dispatch(unbookmark(status));
+    } else {
+      this.props.dispatch(bookmark(status));
+    }
+  }
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -448,6 +458,7 @@ class Status extends ImmutablePureComponent {
                   onReply={this.handleReplyClick}
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
+                  onBookmark={this.handleBookmarkClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index b7e350cbc..fe2d5ea02 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -12,7 +12,7 @@ import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
 import DrawerLoading from './drawer_loading';
 import BundleColumnError from './bundle_column_error';
-import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses, ListTimeline } from '../../ui/util/async-components';
+import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses, BookmarkedStatuses, ListTimeline } from '../../ui/util/async-components';
 
 import detectPassiveEvents from 'detect-passive-events';
 import { scrollRight } from '../../../scroll';
@@ -26,6 +26,7 @@ const componentMap = {
   'HASHTAG': HashtagTimeline,
   'DIRECT': DirectTimeline,
   'FAVOURITES': FavouritedStatuses,
+  'BOOKMARKS': BookmarkedStatuses,
   'LIST': ListTimeline,
 };
 
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index f01c2bf24..ebb0b1a96 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -39,6 +39,7 @@ import {
   FollowRequests,
   GenericNotFound,
   FavouritedStatuses,
+  BookmarkedStatuses,
   ListTimeline,
   Blocks,
   DomainBlocks,
@@ -157,6 +158,7 @@ class SwitchingColumnsArea extends React.PureComponent {
 
           <WrappedRoute path='/notifications' component={Notifications} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
           <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
           <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
 
           <WrappedRoute path='/search' component={Compose} content={children} componentParams={{ isSearchPage: true }} />
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 235fd2a07..c9b922e6b 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -90,6 +90,10 @@ export function FavouritedStatuses () {
   return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses');
 }
 
+export function BookmarkedStatuses () {
+  return import(/* webpackChunkName: "features/bookmarked_statuses" */'../../bookmarked_statuses');
+}
+
 export function Blocks () {
   return import(/* webpackChunkName: "features/blocks" */'../../blocks');
 }
diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index 6c5f33557..9f8f28dee 100644
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -6,6 +6,14 @@ import {
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
   FAVOURITED_STATUSES_EXPAND_FAIL,
 } from '../actions/favourites';
+import {
+  BOOKMARKED_STATUSES_FETCH_REQUEST,
+  BOOKMARKED_STATUSES_FETCH_SUCCESS,
+  BOOKMARKED_STATUSES_FETCH_FAIL,
+  BOOKMARKED_STATUSES_EXPAND_REQUEST,
+  BOOKMARKED_STATUSES_EXPAND_SUCCESS,
+  BOOKMARKED_STATUSES_EXPAND_FAIL,
+} from '../actions/bookmarks';
 import {
   PINNED_STATUSES_FETCH_SUCCESS,
 } from '../actions/pin_statuses';
@@ -13,6 +21,8 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
+  BOOKMARK_SUCCESS,
+  UNBOOKMARK_SUCCESS,
   PIN_SUCCESS,
   UNPIN_SUCCESS,
 } from '../actions/interactions';
@@ -23,6 +33,11 @@ const initialState = ImmutableMap({
     loaded: false,
     items: ImmutableList(),
   }),
+  bookmarks: ImmutableMap({
+    next: null,
+    loaded: false,
+    items: ImmutableList(),
+  }),
   pins: ImmutableMap({
     next: null,
     loaded: false,
@@ -71,10 +86,24 @@ export default function statusLists(state = initialState, action) {
     return normalizeList(state, 'favourites', action.statuses, action.next);
   case FAVOURITED_STATUSES_EXPAND_SUCCESS:
     return appendToList(state, 'favourites', action.statuses, action.next);
+  case BOOKMARKED_STATUSES_FETCH_REQUEST:
+  case BOOKMARKED_STATUSES_EXPAND_REQUEST:
+    return state.setIn(['bookmarks', 'isLoading'], true);
+  case BOOKMARKED_STATUSES_FETCH_FAIL:
+  case BOOKMARKED_STATUSES_EXPAND_FAIL:
+    return state.setIn(['bookmarks', 'isLoading'], false);
+  case BOOKMARKED_STATUSES_FETCH_SUCCESS:
+    return normalizeList(state, 'bookmarks', action.statuses, action.next);
+  case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
+    return appendToList(state, 'bookmarks', action.statuses, action.next);
   case FAVOURITE_SUCCESS:
     return prependOneToList(state, 'favourites', action.status);
   case UNFAVOURITE_SUCCESS:
     return removeOneFromList(state, 'favourites', action.status);
+  case BOOKMARK_SUCCESS:
+    return prependOneToList(state, 'bookmarks', action.status);
+  case UNBOOKMARK_SUCCESS:
+    return removeOneFromList(state, 'bookmarks', action.status);
   case PINNED_STATUSES_FETCH_SUCCESS:
     return normalizeList(state, 'pins', action.statuses, action.next);
   case PIN_SUCCESS:
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 885cc221c..735902e72 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -3,6 +3,8 @@ import {
   REBLOG_FAIL,
   FAVOURITE_REQUEST,
   FAVOURITE_FAIL,
+  BOOKMARK_REQUEST,
+  BOOKMARK_FAIL,
 } from '../actions/interactions';
 import {
   STATUS_MUTE_SUCCESS,
@@ -39,6 +41,10 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.status.get('id'), 'favourited'], true);
   case FAVOURITE_FAIL:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
+  case BOOKMARK_REQUEST:
+    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
+  case BOOKMARK_FAIL:
+    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
   case REBLOG_REQUEST:
     return state.setIn([action.status.get('id'), 'reblogged'], true);
   case REBLOG_FAIL:

From 33a4c201466416546cd2b71ac2a99b46a510896e Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 10 Aug 2018 15:22:04 +0200
Subject: [PATCH 004/200] Introduce OAuth scopes for bookmarks

---
 app/controllers/api/v1/bookmarks_controller.rb                | 2 +-
 app/controllers/api/v1/statuses/bookmarks_controller.rb       | 2 +-
 config/initializers/doorkeeper.rb                             | 2 ++
 config/locales/doorkeeper.en.yml                              | 2 ++
 spec/controllers/api/v1/bookmarks_controller_spec.rb          | 2 +-
 spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index 49038807d..1cab3c372 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::BookmarksController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read }
+  before_action -> { doorkeeper_authorize! :read, :'read:bookmarks' }
   before_action :require_user!
   after_action :insert_pagination_headers
 
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
index d7def5f1f..bb9729cf5 100644
--- a/app/controllers/api/v1/statuses/bookmarks_controller.rb
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -3,7 +3,7 @@
 class Api::V1::Statuses::BookmarksController < Api::BaseController
   include Authorization
 
-  before_action -> { doorkeeper_authorize! :write }
+  before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' }
   before_action :require_user!
 
   respond_to :json
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 367eead6a..2a963b32b 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -58,6 +58,7 @@ Doorkeeper.configure do
   optional_scopes :write,
                   :'write:accounts',
                   :'write:blocks',
+                  :'write:bookmarks',
                   :'write:conversations',
                   :'write:favourites',
                   :'write:filters',
@@ -71,6 +72,7 @@ Doorkeeper.configure do
                   :read,
                   :'read:accounts',
                   :'read:blocks',
+                  :'read:bookmarks',
                   :'read:favourites',
                   :'read:filters',
                   :'read:follows',
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index f1fe03716..211b210d7 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -119,6 +119,7 @@ en:
       read: read all your account's data
       read:accounts: see accounts information
       read:blocks: see your blocks
+      read:bookmarks: see your bookmarks
       read:favourites: see your favourites
       read:filters: see your filters
       read:follows: see your follows
@@ -131,6 +132,7 @@ en:
       write: modify all your account's data
       write:accounts: modify your profile
       write:blocks: block accounts and domains
+      write:bookmarks: bookmark statuses
       write:favourites: favourite statuses
       write:filters: create filters
       write:follows: follow people
diff --git a/spec/controllers/api/v1/bookmarks_controller_spec.rb b/spec/controllers/api/v1/bookmarks_controller_spec.rb
index 26130e71b..79601b6e6 100644
--- a/spec/controllers/api/v1/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/bookmarks_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Api::V1::BookmarksController, type: :controller do
   render_views
 
   let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:bookmarks') }
 
   describe 'GET #index' do
     context 'without token' do
diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
index d881e22ed..b79853718 100644
--- a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
@@ -7,7 +7,7 @@ describe Api::V1::Statuses::BookmarksController do
 
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:bookmarks', application: app) }
 
   context 'with an oauth token' do
     before do

From c4a69903b6990c873a6d127c720ed371cf30485d Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 29 Aug 2018 13:06:37 +0200
Subject: [PATCH 005/200] Add bookmarks to archive takeout

---
 app/services/backup_service.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 4cfa22ab8..5fcc98057 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -45,6 +45,7 @@ class BackupService < BaseService
           dump_media_attachments!(tar)
           dump_outbox!(tar)
           dump_likes!(tar)
+          dump_bookmarks!(tar)
           dump_actor!(tar)
         end
       end
@@ -85,6 +86,7 @@ class BackupService < BaseService
     actor[:image][:url] = 'header' + File.extname(actor[:image][:url]) if actor[:image]
     actor[:outbox]      = 'outbox.json'
     actor[:likes]       = 'likes.json'
+    actor[:bookmarks]   = 'bookmarks.json'
 
     download_to_tar(tar, account.avatar, 'avatar' + File.extname(account.avatar.path)) if account.avatar.exists?
     download_to_tar(tar, account.header, 'header' + File.extname(account.header.path)) if account.header.exists?
@@ -115,6 +117,25 @@ class BackupService < BaseService
     end
   end
 
+  def dump_bookmarks!(tar)
+    collection = serialize(ActivityPub::CollectionPresenter.new(id: 'bookmarks.json', type: :ordered, size: 0, items: []), ActivityPub::CollectionSerializer)
+
+    Status.reorder(nil).joins(:bookmarks).includes(:account).merge(account.bookmarks).find_in_batches do |statuses|
+      statuses.each do |status|
+        collection[:totalItems] += 1
+        collection[:orderedItems] << ActivityPub::TagManager.instance.uri_for(status)
+      end
+
+      GC.start
+    end
+
+    json = Oj.dump(collection)
+
+    tar.add_file_simple('bookmarks.json', 0o444, json.bytesize) do |io|
+      io.write(json)
+    end
+  end
+
   def collection_presenter
     ActivityPub::CollectionPresenter.new(
       id: 'outbox.json',

From 667b598e5ce789fdf93f883b7c77dff274db1de3 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 12 Aug 2019 02:36:51 +0000
Subject: [PATCH 006/200] =?UTF-8?q?=E3=83=96=E3=83=83=E3=82=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=AF=E3=81=AE=E5=86=8D=E5=AE=9F=E8=A3=85?=
 =?UTF-8?q?(=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB=E3=82=AB=E3=83=A9?=
 =?UTF-8?q?=E3=83=A0=E3=83=BB=E7=BF=BB=E8=A8=B3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/features/getting_started/index.js       | 2 +-
 .../mastodon/features/ui/components/navigation_panel.js         | 1 +
 app/javascript/mastodon/locales/ja.json                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index a1e3f86ad..9a2e0fa9c 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -134,7 +134,7 @@ class GettingStarted extends ImmutablePureComponent {
       <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
     );
 
-    height += 48*3;
+    height += 48*4;
 
     if (myAccount.get('locked')) {
       navItems.push(<ColumnLink key={i++} icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 64a40a9da..907dbc665 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -16,6 +16,7 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='colmun-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmark' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
 
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7312ce5ac..362cbf3ab 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -230,6 +230,7 @@
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
   "navigation_bar.apps": "アプリ",
   "navigation_bar.blocks": "ブロックしたユーザー",
+  "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "トゥートの新規作成",
   "navigation_bar.direct": "ダイレクトメッセージ",

From 87875c093e3f6deb3ad27d71bac6ed792b4883f5 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 12 Aug 2019 04:42:03 +0000
Subject: [PATCH 007/200] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E5=BE=A9=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/actions/UtilBtns.js   | 71 +++++++++++++++++++
 .../compose/components/compose_form.js        | 32 +++++++--
 .../compose/components/user_counter.js        | 10 +++
 .../containers/compose_form_container.js      | 17 +++++
 app/javascript/mastodon/locales/ja.json       | 19 +++--
 .../styles/mastodon/components.scss           | 67 ++++++++---------
 6 files changed, 173 insertions(+), 43 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/UtilBtns.js
 create mode 100644 app/javascript/mastodon/features/compose/components/user_counter.js

diff --git a/app/javascript/mastodon/actions/UtilBtns.js b/app/javascript/mastodon/actions/UtilBtns.js
new file mode 100644
index 000000000..52ccc6877
--- /dev/null
+++ b/app/javascript/mastodon/actions/UtilBtns.js
@@ -0,0 +1,71 @@
+import { changeCompose } from '../actions/compose';
+
+
+
+export const UTILBTNS_GOJI = 'UTILBTNS_GOJI';
+export const UTILBTNS_HARUKIN = 'UTILBTNS_HARUKIN';
+
+
+
+export function submitGoji (textarea) {
+  return function (dispatch, getState) {
+    if (!textarea.value) {
+      let text = [
+        "#ゴジモリｨｨィィイイ",
+        ":goji:"
+      ].join("\r\n");
+
+      dispatch(submitGojiRequest());
+      dispatch(changeCompose(text));
+
+      textarea.focus();
+    }
+  }
+}
+
+export function submitGojiRequest () {
+  return {
+    type: UTILBTNS_GOJI
+  }
+}
+
+export function submitHarukin (textarea) {
+  return function (dispatch, getState) {
+    const HARUKINS = [":harukin: ", ":harukin_old: ", ":harukin_ika: ", ":harukin_tako: "];
+    const MAX = 6;
+
+    if (!textarea.value) {
+      let text = "";
+
+      let quantity = Math.round(Math.random() * MAX + 1);
+      let type = Math.round(Math.random() * (HARUKINS.length - 1));
+
+      let harukin = HARUKINS[type];
+
+      switch (quantity) {
+        default:
+          text = [
+            harukin.repeat(quantity),
+            "🔥 ".repeat(quantity)
+          ].join("\r\n");
+
+          break;
+          
+        case MAX + 1:
+          text = `${harukin}💕\r\n`.repeat(6);
+          break;
+      }
+
+      dispatch(submitHarukinRequest());
+      dispatch(changeCompose(text));
+
+      textarea.focus();
+    }
+  }
+}
+
+export function submitHarukinRequest () {
+  return {
+    type: UTILBTNS_HARUKIN
+  }
+}
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 47e189251..14d8ee795 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -20,6 +20,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { length } from 'stringz';
 import { countableText } from '../util/counter';
 import Icon from 'mastodon/components/icon';
+import { UserCounter } from './user_counter';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -28,6 +29,10 @@ const messages = defineMessages({
   spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
   publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
+
+  
+  utilBtns_goji: { id: 'compose_form.utilBtns_goji', defaultMessage: 'Typo!!!' },
+  utilBtns_harukin: { id: 'compose_form.utilBtns_harukin', defaultMessage: 'Burn Harukin' }
 });
 
 export default @injectIntl
@@ -60,7 +65,9 @@ class ComposeForm extends ImmutablePureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     showSearch: PropTypes.bool,
     anyMedia: PropTypes.bool,
-    singleColumn: PropTypes.bool,
+    singleColumn: PropTypes.bool,  
+    onGojiSubmit: PropTypes.func.isRequired,
+    onHarukinSubmit: PropTypes.func.isRequired
   };
 
   static defaultProps = {
@@ -88,7 +95,7 @@ class ComposeForm extends ImmutablePureComponent {
     const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
     const fulltext = [this.props.spoilerText, countableText(this.props.text)].join('');
 
-    if (isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
+    if (isSubmitting || isUploading || isChangingUpload || length(fulltext) > 2048 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
       return;
     }
 
@@ -177,11 +184,15 @@ class ComposeForm extends ImmutablePureComponent {
     this.props.onPickEmoji(position, data, needsSpace);
   }
 
+  
+  handleOnGojiSubmit = () => this.props.onGojiSubmit(this.autosuggestTextarea.textarea);
+  handleOnHarukinSubmit = () => this.props.onHarukinSubmit(this.autosuggestTextarea.textarea);
+
   render () {
     const { intl, onPaste, showSearch, anyMedia } = this.props;
     const disabled = this.props.isSubmitting;
     const text     = [this.props.spoilerText, countableText(this.props.text)].join('');
-    const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 500 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
+    const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 2048 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
     let publishText = '';
 
     if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@@ -243,11 +254,22 @@ class ComposeForm extends ImmutablePureComponent {
             <PrivacyDropdownContainer />
             <SpoilerButtonContainer />
           </div>
-          <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
+          <div className='character-counter__wrapper'><CharacterCounter max={2048} text={text} /></div>
         </div>
 
         <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
+          <div className='compose-form__publish-button-wrapper'>
+            
+            <Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block>
+              <span className="fa fa-send">{publishText}</span>
+            </Button>
+          </div>
+        </div>
+
+        <div className="compose-form__utilBtns">
+
+          <Button className="compose-form__utilBtns-goji" text={intl.formatMessage(messages.utilBtns_goji)} onClick={this.handleOnGojiSubmit} block />
+          <Button className="compose-form__utilBtns-harukin" text={intl.formatMessage(messages.utilBtns_harukin)} onClick={this.handleOnHarukinSubmit} block />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/user_counter.js b/app/javascript/mastodon/features/compose/components/user_counter.js
new file mode 100644
index 000000000..e49d2f1a8
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/user_counter.js
@@ -0,0 +1,10 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+export default class UserCounter extends React.PureComponent {
+  render () {
+    return (
+      <span>10人</span>
+    );
+  }
+}
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 37a0e8845..c4b27ad79 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -11,6 +11,11 @@ import {
   uploadCompose,
 } from '../../../actions/compose';
 
+import {
+  submitGoji,
+  submitHarukin
+} from '../../../actions/UtilBtns';
+
 const mapStateToProps = state => ({
   text: state.getIn(['compose', 'text']),
   suggestions: state.getIn(['compose', 'suggestions']),
@@ -60,6 +65,18 @@ const mapDispatchToProps = (dispatch) => ({
   onPickEmoji (position, data, needsSpace) {
     dispatch(insertEmojiCompose(position, data, needsSpace));
   },
+  
+  onRisaSubmit (textarea) {
+    dispatch(submitRisa(textarea));
+  },
+
+  onGojiSubmit (textarea) {
+    dispatch(submitGoji(textarea));
+  },
+
+  onHarukinSubmit (textarea) {
+    dispatch(submitHarukin(textarea));
+  },
 
 });
 
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 362cbf3ab..95bd39465 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -54,7 +54,7 @@
   "column.lists": "リスト",
   "column.mutes": "ミュートしたユーザー",
   "column.notifications": "通知",
-  "column.pins": "固定されたトゥート",
+  "column.pins": "固定された投稿",
   "column.public": "連合タイムライン",
   "column_back_button.label": "戻る",
   "column_header.hide_settings": "設定を隠す",
@@ -70,7 +70,7 @@
   "compose_form.hashtag_warning": "このトゥートは公開設定ではないのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
-  "compose_form.placeholder": "今なにしてる？",
+  "compose_form.placeholder": "ちょうどL.A.に到着しました。",
   "compose_form.poll.add_option": "追加",
   "compose_form.poll.duration": "アンケート期間",
   "compose_form.poll.option_placeholder": "項目 {number}",
@@ -83,6 +83,8 @@
   "compose_form.spoiler.marked": "閲覧注意が設定されています",
   "compose_form.spoiler.unmarked": "閲覧注意が設定されていません",
   "compose_form.spoiler_placeholder": "ここに警告を書いてください",
+  "compose_form.utilBtns_goji": "誤字盛！",
+  "compose_form.utilBtns_harukin": "はるきん焼却",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
@@ -143,7 +145,7 @@
   "getting_started.invite": "招待",
   "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub ( {github} ) から開発に参加したり、問題を報告したりできます。",
   "getting_started.security": "セキュリティ",
-  "getting_started.terms": "プライバシーポリシー",
+  "getting_started.terms": "利用規約とプライバシーポリシー",
   "hashtag.column_header.tag_mode.all": "と {additional}",
   "hashtag.column_header.tag_mode.any": "か {additional}",
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
@@ -153,6 +155,7 @@
   "hashtag.column_settings.tag_mode.any": "いずれかを含む",
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
+  "home.column_settings.advanced": "高度な設定",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
@@ -230,7 +233,6 @@
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
   "navigation_bar.apps": "アプリ",
   "navigation_bar.blocks": "ブロックしたユーザー",
-  "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "トゥートの新規作成",
   "navigation_bar.direct": "ダイレクトメッセージ",
@@ -241,7 +243,8 @@
   "navigation_bar.filters": "フィルター設定",
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
-  "navigation_bar.info": "このサーバーについて",
+  "navigation_bar.generate_qrcode": "プロフィールのQRコードを生成",
+  "navigation_bar.info": "Yづドンについて",
   "navigation_bar.keyboard_shortcuts": "ホットキー",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
@@ -252,7 +255,10 @@
   "navigation_bar.profile_directory": "ディレクトリ",
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.security": "セキュリティ",
-  "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
+  "navigation_bar.announcements": "運営からのお知らせ",
+  "navigation_bar.trends": "トレンド",
+  "navigation_bar.bookmarks": "ブックマーク",
+  "notification.favourite": "{name}さんがあなたのトゥートに╰( ^o^)╮-=ﾆ=一＝三★しました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.mention": "{name}さんがあなたに返信しました",
   "notification.poll": "アンケートが終了しました",
@@ -293,6 +299,7 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
+  "qr_modal.description": "QRコードを読み取って簡単にプロフィールにアクセスしましょう。",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
   "relative_time.days": "{number}日前",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8de72d72e..a7cbca4b5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -657,10 +657,29 @@
     justify-content: flex-end;
     min-width: 0;
     flex: 0 0 auto;
-
+    padding-top: 10px;
+    
     .compose-form__publish-button-wrapper {
       overflow: hidden;
-      padding-top: 10px;
+
+      button {
+        display: inline-block;
+        width: auto;
+
+        margin-right: 0.5em;
+      }
+
+      button:last-child {
+        margin-right: auto;
+      }
+    }
+  }
+
+  .compose-form__utilBtns {
+    padding-top: 10px;
+
+    * {
+      margin-bottom: 1em;
     }
   }
 }
@@ -2212,6 +2231,7 @@ a.account__display-name {
   }
 
   .getting-started__wrapper,
+  .getting-started__trends,
   .search {
     margin-bottom: 10px;
   }
@@ -2318,24 +2338,13 @@ a.account__display-name {
   margin-bottom: 10px;
   height: calc(100% - 20px);
   overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-
-  & > a {
-    flex: 0 0 auto;
-  }
 
   hr {
-    flex: 0 0 auto;
     border: 0;
     background: transparent;
     border-top: 1px solid lighten($ui-base-color, 4%);
     margin: 10px 0;
   }
-
-  .flex-spacer {
-    background: transparent;
-  }
 }
 
 .drawer__pager {
@@ -2727,10 +2736,8 @@ a.account__display-name {
   }
 
   &__trends {
+    background: $ui-base-color;
     flex: 0 1 auto;
-    opacity: 1;
-    animation: fade 150ms linear;
-    margin-top: 10px;
 
     @media screen and (max-height: 810px) {
       .trends__item:nth-child(3) {
@@ -2747,15 +2754,11 @@ a.account__display-name {
     @media screen and (max-height: 670px) {
       display: none;
     }
+  }
 
-    .trends__item {
-      border-bottom: 0;
-      padding: 10px;
-
-      &__current {
-        color: $darker-text-color;
-      }
-    }
+  &__scrollable {
+    max-height: 100%;
+    overflow-y: auto;
   }
 }
 
@@ -5520,6 +5523,12 @@ noscript {
   }
 }
 
+.embed-modal__qrcode {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .account__moved-note {
   padding: 14px 10px;
   padding-bottom: 16px;
@@ -5984,8 +5993,7 @@ noscript {
       font-size: 24px;
       line-height: 36px;
       font-weight: 500;
-      text-align: right;
-      padding-right: 15px;
+      text-align: center;
       color: $secondary-text-color;
     }
 
@@ -5993,12 +6001,7 @@ noscript {
       flex: 0 0 auto;
       width: 50px;
 
-      path:first-child {
-        fill: rgba($highlight-text-color, 0.25) !important;
-        fill-opacity: 1 !important;
-      }
-
-      path:last-child {
+      path {
         stroke: lighten($highlight-text-color, 6%) !important;
       }
     }

From 4a2269092ac81ef8ed2684d0ea8e8443d4747704 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 12 Aug 2019 11:38:13 +0000
Subject: [PATCH 008/200] =?UTF-8?q?Admin=E3=81=8B=E3=82=89=E3=81=AE?=
 =?UTF-8?q?=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E6=AC=84=E3=81=AE=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mastodon/features/getting_started/index.js  | 17 ++++++++++-------
 .../features/ui/components/navigation_panel.js  |  1 +
 app/javascript/mastodon/locales/ja.json         |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 9a2e0fa9c..3c6dc7194 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -18,6 +18,7 @@ import TrendsContainer from './containers/trends_container';
 const messages = defineMessages({
   home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+  admin_notifications: { id: 'tabs_bar.admin_notifications', defaultMessage: 'Admin Notifications' },
   public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
   community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
@@ -100,7 +101,7 @@ class GettingStarted extends ImmutablePureComponent {
     if (multiColumn) {
       navItems.push(
         <ColumnSubheading key={i++} text={intl.formatMessage(messages.discover)} />,
-        <ColumnLink key={i++} icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
+	<ColumnLink key={i++} icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
         <ColumnLink key={i++} icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />,
       );
 
@@ -108,23 +109,25 @@ class GettingStarted extends ImmutablePureComponent {
 
       if (profile_directory) {
         navItems.push(
-          <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />
-        );
+          <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />,
+          <ColumnLink key={i++} icon='bullhorn' text={intl.formatMessage(messages.admin_notifications)} to='/timelines/tag/Yづinfo' />,
+	);
 
-        height += 48;
+        height += 48*2;
       }
 
       navItems.push(
-        <ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} />
+        <ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} />,
       );
 
       height += 34;
     } else if (profile_directory) {
       navItems.push(
-        <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />
+        <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />,
+        <ColumnLink key={i++} icon='bullhorn' text={intl.formatMessage(messages.admin_notifications)} to='/timelines/tag/Yづinfo' />,
       );
 
-      height += 48;
+      height += 48*2;
     }
 
     navItems.push(
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 907dbc665..05e823c92 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -16,6 +16,7 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/timelines/tag/Yづinfo'><Icon className='colmun-link__icon' id='bullhorn' fixedWidth /><FormattedMessage id='tabs_bar.admin_notifications' defaultMessage='Admin Notification' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='colmun-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmark' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 95bd39465..c8f88c39d 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -367,6 +367,7 @@
   "status.unpin": "プロフィールへの固定を解除",
   "suggestions.dismiss": "隠す",
   "suggestions.header": "興味あるかもしれません…",
+  "tabs_bar.admin_notifications": "Adminからのお知らせ",
   "tabs_bar.federated_timeline": "連合",
   "tabs_bar.home": "ホーム",
   "tabs_bar.local_timeline": "ローカル",

From 09b4c05ce19d5ec824b4b382b9b8eb58baba2da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9C=A7=E5=B3=B6=E3=81=B2=E3=81=AA=E3=81=9F?=
 <naaba6z7y@gmail.com>
Date: Mon, 20 Aug 2018 23:41:39 +0900
Subject: [PATCH 009/200] SecurityUpdate

---
 Gemfile                       |   2 +
 Gemfile.lock                  |   2 +
 app/lib/formatter.rb          |  17 +-
 app/lib/formatter_markdown.rb | 340 ++++++++++++++++++++++++++++++++++
 4 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 app/lib/formatter_markdown.rb

diff --git a/Gemfile b/Gemfile
index 263be0ac3..cbf00459c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,6 +96,8 @@ gem 'json-ld', git: 'https://github.com/ruby-rdf/json-ld.git', ref: '345b7a57333
 gem 'json-ld-preloaded', '~> 3.0'
 gem 'rdf-normalize', '~> 0.3'
 
+gem 'redcarpet', "~> 3.4.0" 
+
 group :development, :test do
   gem 'fabrication', '~> 2.20'
   gem 'fuubar', '~> 2.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index f185f3fa5..eb5e5445a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -496,6 +496,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.3.3)
       rdf (>= 2.2, < 4.0)
+    redcarpet (3.4.0)
     redis (4.1.2)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
@@ -755,6 +756,7 @@ DEPENDENCIES
   rails-i18n (~> 5.1)
   rails-settings-cached (~> 0.6)
   rdf-normalize (~> 0.3)
+  redcarpet (~> 3.4.0)
   redis (~> 4.1)
   redis-namespace (~> 1.5)
   redis-rails (~> 5.0)
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index b5f42305f..c1ad9c701 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require_relative './formatter_markdown'
 require_relative './sanitize_config'
 
 class Formatter
@@ -35,12 +36,21 @@ class Formatter
     linkable_accounts << status.account
 
     html = raw_content
+
+    mdFormatter = Formatter_Markdown.new(html)
+    html = mdFormatter.formatted
+
     html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
     html = encode_and_link_urls(html, linkable_accounts)
     html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
     html = html.delete("\n")
 
+    mdLinkDecoder = MDLinkDecoder.new(html)
+    html = mdLinkDecoder.decode
+
+    html.gsub!(/(&amp;)/){"&"}
+
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
@@ -111,13 +121,18 @@ class Formatter
   def encode_and_link_urls(html, accounts = nil, options = {})
     entities = utf8_friendly_extractor(html, extract_url_without_protocol: false)
 
+    mdExtractor = MDExtractor.new(html)
+    entities.concat(mdExtractor.extractEntities)
+
     if accounts.is_a?(Hash)
       options  = accounts
       accounts = nil
     end
 
     rewrite(html.dup, entities) do |entity|
-      if entity[:url]
+      if entity[:markdown]
+        html[entity[:indices][0]...entity[:indices][1]]
+      elsif entity[:url]
         link_to_url(entity, options)
       elsif entity[:hashtag]
         link_to_hashtag(entity)
diff --git a/app/lib/formatter_markdown.rb b/app/lib/formatter_markdown.rb
new file mode 100644
index 000000000..30a08d558
--- /dev/null
+++ b/app/lib/formatter_markdown.rb
@@ -0,0 +1,340 @@
+require 'uri'
+require 'redcarpet'
+require 'redcarpet/render_strip'
+
+class Formatter_Markdown
+    def initialize(html)
+        @html = html.dup
+    end
+
+    def formatted
+        mdRenderer = CustomMDRenderer.new(
+            strikethrough: true,
+            hard_wrap: true,
+            autolink: false,
+            superscript:false,
+            fenced_link: true,
+            fenced_image: true,
+            no_intra_emphasis: true,
+            no_links: true,
+            no_styles: true,
+            no_images: true,
+            filter_html: true,
+            escape_html: true,
+            safe_links_only: true,
+            with_toc_data: true,
+            xhtml: false,
+            prettify: true,
+            link_attributes: true
+        )
+
+        md = Redcarpet::Markdown.new(
+            mdRenderer,
+            strikethrough: true,
+            hard_wrap: true,
+            superscript:false,
+            autolink: false,
+            space_after_headers: true,
+            no_intra_emphasis: true,
+            no_links: true,
+            no_styles: true,
+            no_images: true,
+            filter_html: true,
+            escape_html: true,
+            safe_links_only: true,
+            with_toc_data: true,
+            xhtml: false,
+            prettify: true,
+            link_attributes: true
+        )
+        s = @html
+        s.gsub!(/\n[\n]+/) {"\n　\n"}# 改行周りの問題を修正
+        s.gsub!(/`[ ]+`/) {"｀ ｀"}# code内が半角スペースのみだとHTMLが壊れるのでそれの回避
+
+        renderedMD = md.render(s)
+
+        result = renderedMD
+        result.gsub!(/(<\w+)([^>]*>)/) { "#{$1} data-md='true' #{$2}" }# ToDo data-md="true" を認識して他鯖の人にmarkdownの使用を伝える機能の実装
+        result.gsub!(/(https?:\/\/[^<>"\[\] 　]+)/){"#{$1} "}#URLの後ろにスペースをねじ込む奴 mastodonのURL認識がゆるいのをmarkdownで対処
+
+        result
+
+    end
+
+    class CustomMDRenderer < Redcarpet::Render::HTML
+
+        #基本的な実装の流れ
+        #URLの削除(mastodonの機能上URLとして認識されると十中八九HTMLが壊れるので)
+        #markdownコンテンツ内でのmarkdownコンテンツの禁止(意図しないHTMLタグの生成によってHTMLの不正出力を防ぐ目的)
+        #最後にHTMLに出力される際にHTML的にヤバイ子たちのエスケープ
+
+        def paragraph(text)
+            %(#{text.strip})
+        end
+
+        def linebreak()
+            %(<br>)
+        end
+
+        def block_quote(quote)
+            urlRemoved = "#{remove_url(quote)}"
+            escapedContents = "#{blockquote_markdown_escape(urlRemoved)}"
+            %(<blockquote>#{escapedContents.strip}</blockquote>)
+        end
+
+        def header(text, header_level)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<h#{header_level}>#{encode(mdContentsRemoved)}</h#{header_level}>\n)
+        end
+
+        def codespan(code)
+            urlRemoved = "#{remove_url(code)}"
+            escapedCode = "#{escape_bbcode(urlRemoved)}"
+            %(<code>#{encode(escapedCode)}</code>)
+        end
+
+        def list(contents, list_type)
+            if list_type == :unordered
+                %(<ul>#{contents.strip}</ul>)
+            elsif list_type == :ordered
+                %(<ol>#{contents.strip}</ol>)
+            else
+                %(<#{list_type}>#{contents.strip}</#{list_type}>)
+            end
+        end
+
+        def list_item(text, list_type)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<li>#{encode(mdContentsRemoved)}</li>)
+        end
+
+        def emphasis(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<sup>#{encode(mdContentsRemoved)}</sup>)
+        end
+
+        def double_emphasis(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<sub>#{encode(mdContentsRemoved)}</sub>)
+        end
+
+        def triple_emphasis(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<small>#{encode(mdContentsRemoved)}</small>)
+        end
+
+        def strikethrough(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<s>#{encode(mdContentsRemoved)}</s>)
+        end
+
+        def superscript(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<sup>#{encode(mdContentsRemoved)}</sup>)
+        end
+
+        def underline(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<u>#{encode(mdContentsRemoved)}</u>)
+        end
+
+        def highlight(text)
+            urlRemoved = "#{remove_url(text)}"
+            mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
+            %(<mark>#{encode(mdContentsRemoved)}</mark>)
+        end
+
+        #オートリンクはmastodonとの相性が悪いので基本的には使わない
+
+        def autolink(link, link_type)
+            %(<a herf="#{link}">リンク</a>)
+        end
+
+        #https以外の物がURLとして記入された時にTextをHTML的に考えて安全に表示するように変更
+
+        def image(link, title, alt_text)
+
+            if alt_text =~ /[<>"\[\] 　]+/
+                alt_text = "設定なし"
+            end
+
+            imgcheck = "#{link}"
+            if imgcheck !~ /\Ahttps:\/\/[^<>"\[\] 　]+\z/
+                %(#{encode(alt_text)})
+            else
+                %(<img src="#{URI.encode_www_form_component(link)}">)
+            end
+        end
+
+        def link(link, title, content)
+
+            if content =~ /([<>"\[\] 　]+|https?:\/\/|#|@)/
+                content = "リンク"
+            elsif content !~ /.+/
+                content = "リンク"
+            end
+
+            linkcheck = "#{link}"
+            if linkcheck !~ /\Ahttps:\/\/[^<>"\[\] 　]+\z/
+                %(#{encode(content)})
+            else
+                %(<a href="#{URI.encode_www_form_component(link)}">#{encode(content)}</a>)
+            end
+        end
+
+        #ここから下はいろいろエスケープするための奴
+
+        #HTML的に考えてよろしくない子たちをエスケープする奴
+        def encode(html)
+            HTMLEntities.new.encode(html)
+        end
+
+        #markdownコンテンツないでURLが生成されるのを防ぐためのエスケープする奴
+        def remove_url(string)
+            url = string.gsub(/https?:\/\//){ "URL:" }
+            reply = url.gsub(/@/){ "＠" }
+            hashTag = reply.gsub(/#/){ "＃" }
+        end
+
+        #前々から要望があったcode内でBBCodeを無効化するための奴
+        def escape_bbcode(string)
+            string.gsub(/\[/){ "［" }
+        end
+
+        #markdownの中でmarkdownを展開させないためのエスケープする奴
+
+        #blockquote以外は下のが使える
+        def markdown_escape(string)
+            string.gsub(/<[^>]+>/) { "" }
+        end
+
+        #blockquoteコンテンツ内でblockquoteタグだけを許可するためのエスケープ
+        def blockquote_markdown_escape(string)
+            string.gsub(/<([\/]?a[^>]*|[\/]?img[^>]*|[\/]?code[^>]*|[\/]?h[1-6][^>]*|[\/]?sup[^>]*|[\/]?sub[^>]*|[\/]?small[^>]*|[\/]?ul[^>]*|[\/]?ol[^>]*|[\/]?li[^>]*|[\/]?hr[^>]*|[\/]?s[^>]*|[\/]?u[^>]*|[\/]?mark[^>]*)>/) { "" }
+        end
+
+        #テストで書きなぐった奴
+        def html_escape(string)
+            string.gsub(/['&\"<>\/]/, {
+              '&' => '&amp;',
+              '<' => '&lt;',
+              '>' => '&gt;',
+              '"' => '&quot;',
+              "'" => '&#x27;',
+              "/" => '&#x2F;',
+            })
+        end
+
+    end
+
+end
+
+#URLとかいう人類には早すぎたやばい子たちを大人しくするために必要な機構
+
+class MDLinkDecoder
+    def initialize(html)
+        @html = html.dup
+    end
+
+    def decode
+        imageDecoded = @html.gsub(/<img data-md='true'\s+src="([^"]+)"([^>]*)>/) { "<a href=\"" + URI.decode_www_form_component($1) + "\"" + $2 + "><img data-md='true' src=\"" + URI.decode_www_form_component($1) + "\"" + $2 + "></a>" }
+
+        imageDecoded.gsub(/<a data-md='true'\s+href="([^"]+)"([^>]*)>/) { "<a data-md='true' href=\"" + URI.decode_www_form_component($1) + "\"" + $2 + ">" }
+    end
+end
+
+#エスケープを回避するHTMLタグの設定とかその他
+
+class MDExtractor
+    def initialize(html)
+        @html = html.dup
+    end
+
+    def extractEntities
+        [
+            extractByHTMLTagName("h1"),
+            extractByHTMLTagName("h2"),
+            extractByHTMLTagName("h3"),
+            extractByHTMLTagName("h4"),
+            extractByHTMLTagName("h5"),
+            extractByHTMLTagName("h6"),
+            extractByHTMLTagName("em"),
+            extractByHTMLTagName("sup"),
+            extractByHTMLTagName("sub"),
+            extractByHTMLTagName("small"),
+            extractByHTMLTagName("u"),
+            extractByHTMLTagName("strong"),
+            extractByHTMLTagName("ul", false, false, "li"),
+            extractByHTMLTagName("ol", false, false, "li"),
+            extractByHTMLTagName("code"),
+            extractByHTMLTagName("blockquote", false),
+            extractByHTMLTagName("hr", false, true),
+            extractByHTMLTagName("br", false, true),
+            extractByHTMLTagName("a"),
+            extractByHTMLTagName("img", false, true),
+            extractByHTMLTagName("s")
+        ].flatten.compact
+    end
+
+    def extractByHTMLTagName(tagName, isNoNest = true, isSingle = false, itemTagName = nil)
+        entities = []
+
+        @html.to_s.scan(htmlTagPatternByCond(tagName, isNoNest, isSingle, itemTagName)) do
+            match = $~
+
+            beginPos = match.char_begin(0)
+            endPos = match.char_end(0)
+            #puts "MDExtractor extracted with:\n" + @html + "\nbeginPos: " + beginPos.to_s + ", endPos: " + endPos.to_s + ", length: " + @html.length.to_s
+
+            entity = {
+                :markdown => true,
+                :indices => [beginPos, endPos]
+            }
+
+            entities.push(entity)
+        end
+
+        entities
+    end
+
+    def htmlTagPatternByCond(tagName, isNoNest, isSingle, itemTagName)
+        if isSingle
+            htmlTagPatternSingle(tagName)
+        elsif isNoNest
+            htmlTagPatternNoNest(tagName)
+        elsif itemTagName && itemTagName.length > 0
+            htmlTagPatternOuterMostWithItem(tagName, itemTagName)
+        else
+            htmlTagPatternOuterMost(tagName)
+        end
+    end
+
+    def htmlTagPattern(tagName)
+        Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<]|<#{tagName} data-md=[^>]*>|<\\/#{tagName}>)*(?:<\\/#{tagName}>)*")
+    end
+
+    def htmlTagPatternNoNest(tagName)
+        Regexp.compile("<#{tagName} data-md=[^>]*>(?:.|\n)*?<\\/#{tagName}>")
+    end
+
+    def htmlTagPatternSingle(tagName)
+        Regexp.compile("<#{tagName} data-md=[^>]*>")
+    end
+
+    # https://stackoverflow.com/questions/546433/regular-expression-to-match-outer-brackets
+    def htmlTagPatternOuterMost(tagName)
+        Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<>]|(\\g<0>))*<\/#{tagName}>")
+    end
+
+    def htmlTagPatternOuterMostWithItem(tagName, itemTagName)
+        Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<>]|<#{itemTagName} data-md=[^>]*>|<\\/#{itemTagName}>|(\\g<0>))*<\/#{tagName}>")
+    end
+end
\ No newline at end of file

From 0542d92c40d5e651b47f5552ab93ec8eb04292a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9C=A7=E5=B3=B6=E3=81=B2=E3=81=AA=E3=81=9F?=
 <naaba6z7y@gmail.com>
Date: Mon, 20 Aug 2018 23:42:23 +0900
Subject: [PATCH 010/200] add Markdown front-end
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Markdownのフロントエンドの追加です
---
 app/javascript/styles/application.scss    |   2 +
 app/javascript/styles/contrast.scss       |   2 +
 app/javascript/styles/markdown.scss       | 196 ++++++++++++++++++++++
 app/javascript/styles/mastodon-light.scss |   2 +
 4 files changed, 202 insertions(+)
 create mode 100644 app/javascript/styles/markdown.scss

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 8ebc45b62..cf32a70b0 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -26,3 +26,5 @@
 @import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
+
+@import 'markdown';
diff --git a/app/javascript/styles/contrast.scss b/app/javascript/styles/contrast.scss
index 5b43aecbe..31805363c 100644
--- a/app/javascript/styles/contrast.scss
+++ b/app/javascript/styles/contrast.scss
@@ -1,3 +1,5 @@
 @import 'contrast/variables';
 @import 'application';
 @import 'contrast/diff';
+
+@import 'markdown';
diff --git a/app/javascript/styles/markdown.scss b/app/javascript/styles/markdown.scss
new file mode 100644
index 000000000..d1c1adb9c
--- /dev/null
+++ b/app/javascript/styles/markdown.scss
@@ -0,0 +1,196 @@
+.status__content { 
+ 
+    font-family: inherit; 
+    max-height: 210px; 
+    overflow-x: hidden; 
+    overflow-y: auto; 
+   
+    h1{ 
+      font-size: 195%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    h2{ 
+      font-size: 180%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    h3{ 
+      font-size: 165%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    h4{ 
+      font-size: 150%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    h5{ 
+      font-size: 135%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    h6{ 
+      font-size: 120%; 
+      border-bottom: 2px solid #ff3333; 
+    } 
+   
+    em{ 
+      font-style: italic; 
+    } 
+   
+    strong{ 
+      font-weight: bold; 
+    } 
+   
+    code{ 
+      display: block; 
+      border-left: 2px solid; 
+      border-color: #079903; 
+      color: $white; 
+      padding-left: 10px; 
+      margin-top: 5px; 
+      margin-bottom: 5px; 
+      margin-left: 5px; 
+      background-color: #000000; 
+    } 
+   
+    pre{ 
+      display: inline-block; 
+      font-family: 'Noto Sans Japanese', sans-serif; 
+      font-weight: 400; 
+    } 
+   
+    p ~ blockquote { 
+      margin-top: -8px; 
+    } 
+   
+    blockquote{ 
+        padding-left: 8px; 
+        margin-top: 0.5em; 
+        margin-bottom: 0.5em; 
+        color: $white; 
+        background-color: $ui-base-color; 
+        display: block; 
+        border-left: 4px solid $classic-highlight-color; 
+    } 
+   
+    ul{ 
+      list-style: inside; 
+      br{ 
+        display: none; 
+      } 
+    } 
+   
+    ul>ul{ 
+      br{ 
+        display: none; 
+      } 
+    } 
+   
+    ul>li>ul{ 
+      padding-left: 1em; 
+      list-style: inside circle; 
+    } 
+   
+    ul>li{ 
+      padding-left: 1em; 
+      list-style: inside circle; 
+    } 
+   
+    ul>br>li{ 
+      padding-left: 1em; 
+      list-style: inside circle; 
+    } 
+   
+    ul>ul>li{ 
+      padding-left: 2em; 
+      list-style: inside circle; 
+    } 
+   
+    ul>br>ul>br>li{ 
+      padding-left: 2em; 
+      list-style: inside circle; 
+    } 
+   
+    ol{ 
+      list-style: inside decimal; 
+    } 
+   
+    ol>li>ol{ 
+      padding-left: 1em; 
+    } 
+   
+    p>a>img{ 
+      width: 100%; 
+      height: 100%; 
+      object-fit: contain; 
+    } 
+   
+    a>img{ 
+      width: 100%; 
+      height: 100%; 
+      object-fit: contain; 
+    } 
+   
+    p>a{ 
+      color: #1FBFF9; 
+    } 
+   
+    a{ 
+      color: #1FBFF9; 
+    } 
+   
+    sup{ 
+      font-size: 75.5%; 
+      vertical-align: top; 
+      position: relative; 
+      top: -0.5em; 
+    } 
+   
+    sub{ 
+      font-size: 75.5%; 
+      vertical-align: bottom; 
+      position: relative; 
+      top: 0.5em; 
+    } 
+   
+    small{ 
+      font-size: 50.0%; 
+      vertical-align: bottom; 
+      position: relative; 
+    } 
+   
+    table { 
+      margin-top: 0.5em; 
+      margin-bottom: 0.5em; 
+      color: $classic-highlight-color; 
+      display: block; 
+      width: 100%; 
+      overflow: auto; 
+      border-spacing: 0; 
+      border-collapse: collapse; 
+    } 
+   
+    table tr{ 
+      background-color: #000000; 
+    } 
+   
+    table th, table td{ 
+      padding: 6px 13px; 
+      border: 1px solid $classic-highlight-color; 
+    } 
+   
+    table th{ 
+      font-weight: 600; 
+    } 
+   
+    table thead tr{ 
+      background-color: $black; 
+    } 
+   
+    td, th{ 
+      padding: 0; 
+    } 
+   
+  } 
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-light.scss b/app/javascript/styles/mastodon-light.scss
index 756a12d86..c99938bfa 100644
--- a/app/javascript/styles/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-light.scss
@@ -1,3 +1,5 @@
 @import 'mastodon-light/variables';
 @import 'application';
 @import 'mastodon-light/diff';
+
+@import 'markdown';

From 4d4f8b5f5217dc47b144767905f5b55c1865df30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9C=A7=E5=B3=B6=E3=81=B2=E3=81=AA=E3=81=9F?=
 <naaba6z7y@gmail.com>
Date: Wed, 28 Nov 2018 20:02:48 +0900
Subject: [PATCH 011/200] UPDATE Markdown
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

アスタルテで動いてる最新のMarkdownに追従する更新です。
一応テストしてから実装してください。
今回のアップデートで
+ 見出しのレイアウト変更
+ リストのレイアウトの変更
+ 罫線のレイアウトの変更
+ より詳細なclass分け
+ codeのハイライト
+ 外部サーバー向け画像添付メッセージの表示
+ 1件のセキュリティー的な問題の修正
などが変更になっています
---
 app/javascript/styles/markdown.scss | 462 ++++++++++++++++------------
 app/lib/formatter_markdown.rb       |  43 ++-
 2 files changed, 301 insertions(+), 204 deletions(-)

diff --git a/app/javascript/styles/markdown.scss b/app/javascript/styles/markdown.scss
index d1c1adb9c..be08de0cd 100644
--- a/app/javascript/styles/markdown.scss
+++ b/app/javascript/styles/markdown.scss
@@ -1,196 +1,266 @@
-.status__content { 
- 
-    font-family: inherit; 
-    max-height: 210px; 
-    overflow-x: hidden; 
-    overflow-y: auto; 
-   
-    h1{ 
-      font-size: 195%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    h2{ 
-      font-size: 180%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    h3{ 
-      font-size: 165%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    h4{ 
-      font-size: 150%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    h5{ 
-      font-size: 135%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    h6{ 
-      font-size: 120%; 
-      border-bottom: 2px solid #ff3333; 
-    } 
-   
-    em{ 
-      font-style: italic; 
-    } 
-   
-    strong{ 
-      font-weight: bold; 
-    } 
-   
-    code{ 
-      display: block; 
-      border-left: 2px solid; 
-      border-color: #079903; 
-      color: $white; 
-      padding-left: 10px; 
-      margin-top: 5px; 
-      margin-bottom: 5px; 
-      margin-left: 5px; 
-      background-color: #000000; 
-    } 
-   
-    pre{ 
-      display: inline-block; 
-      font-family: 'Noto Sans Japanese', sans-serif; 
-      font-weight: 400; 
-    } 
-   
-    p ~ blockquote { 
-      margin-top: -8px; 
-    } 
-   
-    blockquote{ 
-        padding-left: 8px; 
-        margin-top: 0.5em; 
-        margin-bottom: 0.5em; 
-        color: $white; 
-        background-color: $ui-base-color; 
-        display: block; 
-        border-left: 4px solid $classic-highlight-color; 
-    } 
-   
-    ul{ 
-      list-style: inside; 
-      br{ 
-        display: none; 
-      } 
-    } 
-   
-    ul>ul{ 
-      br{ 
-        display: none; 
-      } 
-    } 
-   
-    ul>li>ul{ 
-      padding-left: 1em; 
-      list-style: inside circle; 
-    } 
-   
-    ul>li{ 
-      padding-left: 1em; 
-      list-style: inside circle; 
-    } 
-   
-    ul>br>li{ 
-      padding-left: 1em; 
-      list-style: inside circle; 
-    } 
-   
-    ul>ul>li{ 
-      padding-left: 2em; 
-      list-style: inside circle; 
-    } 
-   
-    ul>br>ul>br>li{ 
-      padding-left: 2em; 
-      list-style: inside circle; 
-    } 
-   
-    ol{ 
-      list-style: inside decimal; 
-    } 
-   
-    ol>li>ol{ 
-      padding-left: 1em; 
-    } 
-   
-    p>a>img{ 
-      width: 100%; 
-      height: 100%; 
-      object-fit: contain; 
-    } 
-   
-    a>img{ 
-      width: 100%; 
-      height: 100%; 
-      object-fit: contain; 
-    } 
-   
-    p>a{ 
-      color: #1FBFF9; 
-    } 
-   
-    a{ 
-      color: #1FBFF9; 
-    } 
-   
-    sup{ 
-      font-size: 75.5%; 
-      vertical-align: top; 
-      position: relative; 
-      top: -0.5em; 
-    } 
-   
-    sub{ 
-      font-size: 75.5%; 
-      vertical-align: bottom; 
-      position: relative; 
-      top: 0.5em; 
-    } 
-   
-    small{ 
-      font-size: 50.0%; 
-      vertical-align: bottom; 
-      position: relative; 
-    } 
-   
-    table { 
-      margin-top: 0.5em; 
-      margin-bottom: 0.5em; 
-      color: $classic-highlight-color; 
-      display: block; 
-      width: 100%; 
-      overflow: auto; 
-      border-spacing: 0; 
-      border-collapse: collapse; 
-    } 
-   
-    table tr{ 
-      background-color: #000000; 
-    } 
-   
-    table th, table td{ 
-      padding: 6px 13px; 
-      border: 1px solid $classic-highlight-color; 
-    } 
-   
-    table th{ 
-      font-weight: 600; 
-    } 
-   
-    table thead tr{ 
-      background-color: $black; 
-    } 
-   
-    td, th{ 
-      padding: 0; 
-    } 
-   
-  } 
\ No newline at end of file
+.status__content {
+
+  font-family: inherit;
+
+  h1{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.6em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #ff0000;
+  }
+
+  h2{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.5em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #fffb00;
+  }
+
+  h3{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.4em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #2bff00;
+  }
+
+  h4{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.3em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #00ffea;
+  }
+
+  h5{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.2em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #0004ff;
+  }
+
+  h6{
+    color: #ec840d;
+    font-weight: bold;
+    font-size: 1.1em;
+    padding: 0.5em;
+    display: inline-block;
+    line-height: 1.3;
+    background: #dbebf8;
+    vertical-align: middle;
+    border-radius: 25px 25px 25px 25px;
+    text-align: center;
+    border-bottom: solid 3px #7700ff;
+  }
+
+  em{
+    font-style: italic;
+  }
+
+  strong{
+    font-weight: bold;
+  }
+
+  code{
+    display: block;
+    border-left: 2px solid;
+    border-color: #079903;
+    color: $white;
+    padding-left: 10px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-left: 5px;
+    background-color: #000000;
+
+    .positive{
+      color: #5bda57;
+    }
+
+    .negative{
+      color: #ff4949;
+    }
+
+    .rust-fanc{
+      color: #ba7eff;
+    }
+
+    .ruby-func{
+      color: #24a8e6;
+    }
+
+    .rust-macro{
+      color: #d2ff6a;
+    }
+
+    .contents{
+      color: #ff9925;
+    }
+  }
+
+  pre{
+    display: inline-block;
+    font-family: 'Noto Sans Japanese', sans-serif;
+    font-weight: 400;
+  }
+
+  p ~ blockquote {
+    margin-top: -8px;
+  }
+
+  blockquote{
+      padding-left: 8px;
+      margin-top: 0.5em;
+      margin-bottom: 0.5em;
+      color: $primary-text-color;
+      background-color: $ui-base-color;
+      display: block;
+      border-left: 4px solid $classic-highlight-color;
+  }
+
+  ul.md-contents {
+    border: double 4px #21b384;
+    padding: 0.5em 1em 0.5em 2.3em;
+    position: relative;
+  }
+  ul li.md-contents {
+    line-height: 1.5;
+    padding: 0.2em 0;
+    list-style-type: none!important;
+  }
+  ul li.md-contents:before {
+    font-family: FontAwesome;
+    content: "\f0a4";
+    position: absolute;
+    left : 1em;
+    color: #21b384;
+  }
+
+  ol.md-contents {
+    border: double 4px #ff954f;
+    padding: 0.5em 1em 0.5em 1em;
+    position: relative;
+    list-style: inside decimal;
+  }
+
+  ol li.md-contents {
+    line-height: 1.5;
+    padding: 0.2em 0;
+  }
+
+  hr {
+    border-width: 2px 0px 0px 0px;
+    border-style: dashed;
+    border-color: #ff7676;
+    height: 1px;
+    }
+
+  p>a>img{
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
+
+  a>img{
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
+
+  p>a{
+    color: #1FBFF9;
+  }
+
+  a{
+    color: #1FBFF9;
+  }
+
+  sup{
+    font-size: 75.5%;
+    vertical-align: top;
+    position: relative;
+    top: -0.5em;
+  }
+
+  sub{
+    font-size: 75.5%;
+    vertical-align: bottom;
+    position: relative;
+    top: 0.5em;
+  }
+
+  small{
+    font-size: 50.0%;
+    vertical-align: bottom;
+    position: relative;
+  }
+
+  table {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    color: $classic-highlight-color;
+    display: block;
+    width: 100%;
+    overflow: auto;
+    border-spacing: 0;
+    border-collapse: collapse;
+  }
+
+  table tr{
+    background-color: #000000;
+  }
+
+  table th, table td{
+    padding: 6px 13px;
+    border: 1px solid $classic-highlight-color;
+  }
+
+  table th{
+    font-weight: 600;
+  }
+
+  table thead tr{
+    background-color: $black;
+  }
+
+  td, th{
+    padding: 0;
+  }
+
+  span.img_FTL {
+    display: none;
+  }
+
+}
\ No newline at end of file
diff --git a/app/lib/formatter_markdown.rb b/app/lib/formatter_markdown.rb
index 30a08d558..0ee01b972 100644
--- a/app/lib/formatter_markdown.rb
+++ b/app/lib/formatter_markdown.rb
@@ -88,26 +88,31 @@ class Formatter_Markdown
             %(<h#{header_level}>#{encode(mdContentsRemoved)}</h#{header_level}>\n)
         end
 
+        def block_code(code, language)
+            %(<br>#{code.strip})
+        end
+
         def codespan(code)
             urlRemoved = "#{remove_url(code)}"
             escapedCode = "#{escape_bbcode(urlRemoved)}"
-            %(<code>#{encode(escapedCode)}</code>)
+            encoded = "#{encode(escapedCode)}"
+            %(<code>#{code_contents(encoded)}</code>)
         end
 
         def list(contents, list_type)
             if list_type == :unordered
-                %(<ul>#{contents.strip}</ul>)
+                %(<ul class='md-contents'>#{contents.strip}</ul>)
             elsif list_type == :ordered
-                %(<ol>#{contents.strip}</ol>)
+                %(<ol class='md-contents'>#{contents.strip}</ol>)
             else
-                %(<#{list_type}>#{contents.strip}</#{list_type}>)
+                %(<#{list_type} class='md-contents'>#{contents.strip}</#{list_type}>)
             end
         end
 
         def list_item(text, list_type)
             urlRemoved = "#{remove_url(text)}"
             mdContentsRemoved = "#{markdown_escape(urlRemoved)}"
-            %(<li>#{encode(mdContentsRemoved)}</li>)
+            %(<li class='md-contents'>#{encode(mdContentsRemoved)}</li>)
         end
 
         def emphasis(text)
@@ -170,7 +175,7 @@ class Formatter_Markdown
             if imgcheck !~ /\Ahttps:\/\/[^<>"\[\] 　]+\z/
                 %(#{encode(alt_text)})
             else
-                %(<img src="#{URI.encode_www_form_component(link)}">)
+                %(<span class="img_FTL">画像が添付されています。</span><img src="#{URI.encode_www_form_component(link)}">)
             end
         end
 
@@ -206,7 +211,7 @@ class Formatter_Markdown
 
         #前々から要望があったcode内でBBCodeを無効化するための奴
         def escape_bbcode(string)
-            string.gsub(/\[/){ "［" }
+            string.gsub(/\[/){ "&#091;" }
         end
 
         #markdownの中でmarkdownを展開させないためのエスケープする奴
@@ -221,6 +226,27 @@ class Formatter_Markdown
             string.gsub(/<([\/]?a[^>]*|[\/]?img[^>]*|[\/]?code[^>]*|[\/]?h[1-6][^>]*|[\/]?sup[^>]*|[\/]?sub[^>]*|[\/]?small[^>]*|[\/]?ul[^>]*|[\/]?ol[^>]*|[\/]?li[^>]*|[\/]?hr[^>]*|[\/]?s[^>]*|[\/]?u[^>]*|[\/]?mark[^>]*)>/) { "" }
         end
 
+        #code内の一部を色分けするための変更
+        def code_contents(string)
+            simple = string.gsub(/(true|error|false|failed|def|puts|end|fn|let|mut|use|String|println!)/ ,
+                "true" => "<span class='positive'>#{:true}</span>",
+                "error" => "<span class='negative'>#{:error}</span>",
+                "false" => "<span class='negative'>#{:false}</span>",
+                "failed" => "<span class='negative'>#{:failed}</span>",
+                "def" => "<span class='ruby-func'>#{:def}</span>",
+                "puts" => "<span class='ruby-func'>#{:puts}</span>",
+                "end" => "<span class='ruby-func'>#{:end}</span>",
+                "fn" => "<span class='rust-fanc'>#{:fn}</span>",
+                "let" => "<span class='rust-fanc'>#{:let}</span>",
+                "mut" => "<span class='rust-fanc'>#{:mut}</span>",
+                "use" => "<span class='rust-fanc'>#{:use}</span>",
+                "String" => "<span class='rust-macro'>#{:String}</span>",
+                "println!" => "<span class='rust-macro'>#{:println!}</span>",
+            )
+            simple.gsub(/(&quot;[a-zA-Z0-9_ ,]+&quot;)/){ "<span class='contents'>#{$1}</span>" }
+#                "" => "<span class=''>#{:}</span>",
+        end
+
         #テストで書きなぐった奴
         def html_escape(string)
             string.gsub(/['&\"<>\/]/, {
@@ -280,7 +306,8 @@ class MDExtractor
             extractByHTMLTagName("br", false, true),
             extractByHTMLTagName("a"),
             extractByHTMLTagName("img", false, true),
-            extractByHTMLTagName("s")
+            extractByHTMLTagName("s"),
+            extractByHTMLTagName("span")
         ].flatten.compact
     end
 

From 8c9d3e4c2d5b02359f18de76c10685044995d741 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 12 Aug 2019 17:07:21 +0000
Subject: [PATCH 012/200] =?UTF-8?q?Markdown=E3=81=AE=E5=86=8D=E5=AE=9F?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/announcement_icon_button.js    |  90 +++++++++++++
 .../compose/components/announcements.js       | 127 ++++++++++++++++++
 .../containers/announcements_container.js     |  11 ++
 .../mastodon/features/compose/index.js        |   2 +
 app/javascript/styles/application.scss        |   1 +
 app/javascript/styles/astarte.scss            |  59 ++++++++
 app/lib/formatter_markdown.rb                 |   2 +-
 7 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/mastodon/components/announcement_icon_button.js
 create mode 100644 app/javascript/mastodon/features/compose/components/announcements.js
 create mode 100644 app/javascript/mastodon/features/compose/containers/announcements_container.js
 create mode 100644 app/javascript/styles/astarte.scss

diff --git a/app/javascript/mastodon/components/announcement_icon_button.js b/app/javascript/mastodon/components/announcement_icon_button.js
new file mode 100644
index 000000000..0de58c6f7
--- /dev/null
+++ b/app/javascript/mastodon/components/announcement_icon_button.js
@@ -0,0 +1,90 @@
+import React from 'react';
+import Motion from 'react-motion/lib/Motion';
+import spring from 'react-motion/lib/spring';
+import PropTypes from 'prop-types';
+
+class IconButton extends React.PureComponent {
+
+  static propTypes = {
+    className: PropTypes.string,
+    title: PropTypes.string.isRequired,
+    icon: PropTypes.string.isRequired,
+    onClick: PropTypes.func,
+    size: PropTypes.number,
+    active: PropTypes.bool,
+    style: PropTypes.object,
+    activeStyle: PropTypes.object,
+    disabled: PropTypes.bool,
+    inverted: PropTypes.bool,
+    animate: PropTypes.bool,
+    overlay: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    size: 18,
+    active: false,
+    disabled: false,
+    animate: false,
+    overlay: false,
+  };
+
+  handleClick = (e) =>  {
+    e.preventDefault();
+
+    if (!this.props.disabled) {
+      this.props.onClick(e);
+    }
+  }
+
+  render () {
+    const style = {
+      fontSize: `${this.props.size}px`,
+      width: `${this.props.size * 1.28571429}px`,
+      height: `${this.props.size * 1.28571429}px`,
+      lineHeight: `${this.props.size}px`,
+      ...this.props.style,
+      ...(this.props.active ? this.props.activeStyle : {}),
+    };
+
+    const classes = ['icon-button'];
+
+    if (this.props.active) {
+      classes.push('active');
+    }
+
+    if (this.props.disabled) {
+      classes.push('disabled');
+    }
+
+    if (this.props.inverted) {
+      classes.push('inverted');
+    }
+
+    if (this.props.overlay) {
+      classes.push('overlayed');
+    }
+
+    if (this.props.className) {
+      classes.push(this.props.className);
+    }
+
+    return (
+      <Motion defaultStyle={{ rotate: this.props.active ? 180 : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? 0 : 180) : 0 }}>
+        {({ rotate }) =>
+          <button
+            aria-label={this.props.title}
+            title={this.props.title}
+            className={classes.join(' ')}
+            onClick={this.handleClick}
+            style={style}
+          >
+            <i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${this.props.icon}`} aria-hidden='true' />
+          </button>
+        }
+      </Motion>
+    );
+  }
+
+}
+
+export default IconButton;
diff --git a/app/javascript/mastodon/features/compose/components/announcements.js b/app/javascript/mastodon/features/compose/components/announcements.js
new file mode 100644
index 000000000..ad7043e89
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/announcements.js
@@ -0,0 +1,127 @@
+import React from 'react';
+import Immutable from 'immutable';
+import PropTypes from 'prop-types';
+import Link from 'react-router-dom/Link';
+import { defineMessages, injectIntl } from 'react-intl';
+import IconButton from '../../../components/announcement_icon_button';
+import Motion from 'react-motion/lib/Motion';
+import spring from 'react-motion/lib/spring';
+
+const Collapsable = ({ fullHeight, minHeight, isVisible, children }) => (
+  <Motion defaultStyle={{ height: isVisible ? fullHeight : minHeight }} style={{ height: spring(!isVisible ? minHeight : fullHeight) }}>
+    {({ height }) =>
+      <div style={{ height: `${height}px`, overflow: 'hidden' }}>
+        {children}
+      </div>
+    }
+  </Motion>
+);
+
+Collapsable.propTypes = {
+  fullHeight: PropTypes.number.isRequired,
+  minHeight: PropTypes.number.isRequired,
+  isVisible: PropTypes.bool.isRequired,
+  children: PropTypes.node.isRequired,
+};
+
+const messages = defineMessages({
+  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
+  welcome: { id: 'welcome.message', defaultMessage: '{domain}へようこそ!' },
+  markdown: { id: 'markdown.list', defaultMessage: 'markdown一覧' },
+});
+
+const hashtags = Immutable.fromJS([
+  '神崎ドン自己紹介',
+]);
+
+class Announcements extends React.PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    homeSize: PropTypes.number,
+    isLoading: PropTypes.bool,
+  };
+
+  state = {
+    showId: null,
+    isLoaded: false,
+  };
+
+  onClick = (announcementId, currentState) => {
+    this.setState({ showId: currentState.showId === announcementId ? null : announcementId });
+  }
+  nl2br (text) {
+    return text.split(/(\n)/g).map((line, i) => {
+      if (line.match(/(\n)/g)) {
+        return React.createElement('br', { key: i });
+      }
+      return line;
+    });
+  }
+
+  render () {
+    const { intl } = this.props;
+
+    return (
+      <ul className='announcements'>
+        <li>
+          <Collapsable isVisible={this.state.showId === 'markdown'} fullHeight={1240} minHeight={20} >
+            <div className='announcements__body'>
+              <p>{ this.nl2br(intl.formatMessage(messages.markdown, { domain: document.title }))}<br />
+              <br />
+                (半角)は半角スペースを入力する必要がある場所です。(半角)だけの列は半角スペースのみが入力された列が必要であるを指します。<br /><br />
+                〜〜〜〜〜〜見出し〜〜〜〜〜〜<br /><br />
+                #(半角)見出しテキスト<br /><br />
+                #は1〜6個重ねることができます。<br /><br />
+                〜〜〜〜コードブロック〜〜〜〜<br /><br />
+                `コード`<br /><br />
+                〜〜〜〜〜〜引用〜〜〜〜〜〜<br /><br />
+                >引用文<br />
+                (半角)<br />
+                ここから先は引用が切れます<br />
+                引用は複数回重ねることが可能です。<br /><br />
+                〜〜〜〜〜〜リスト〜〜〜〜〜〜<br /><br />
+                (半角)<br />
+                +(半角)内容1<br />
+                +(半角)内容2<br />
+                (半角)<br /><br />
+                内容の数に制限はありません。<br />
+                投稿トップにリストを持ってくる場合に限り1行目の(半角)は必要ありません。<br />
+                +(半角)を1.(半角)に置き換えることで数字付きリストになります。<br /><br />
+                〜〜〜〜〜上付き文字〜〜〜〜〜<br /><br />
+                _上付き文字_<br /><br />
+                〜〜〜〜〜下付き文字〜〜〜〜〜<br /><br />
+                __下付き文字__<br /><br />
+                〜〜〜〜〜小さい文字〜〜〜〜〜<br /><br />
+                ___小さい文字___<br /><br />
+                〜〜〜〜〜取り消し線〜〜〜〜〜<br /><br />
+                ~~取り消したい文字列~~<br /><br />
+                〜〜〜〜〜〜横罫線〜〜〜〜〜〜<br /><br />
+                ___<br /><br />
+                〜〜〜〜〜〜リンク〜〜〜〜〜〜<br /><br />
+                [リンク文章](https://・・・)<br /><br />
+                〜〜〜〜〜〜画像〜〜〜〜〜〜<br /><br />
+                ![画像説明](https://・・・)<br /><br />
+                リンク、画像ともにURLにはhttps://から始まる物のみご利用可能です。
+      			  </p>
+            </div>
+          </Collapsable>
+          <div className='announcements__icon'>
+            <IconButton title={intl.formatMessage(messages.toggle_visible)} icon='caret-up' onClick={() => this.onClick('markdown', this.state)} size={20} animate active={this.state.showId === 'markdown'} />
+          </div>
+        </li>
+      </ul>
+    );
+  }
+
+  componentWillReceiveProps (nextProps) {
+    if (!this.state.isLoaded) {
+      if (!nextProps.isLoading && (nextProps.homeSize === 0 || this.props.homeSize !== nextProps.homeSize)) {
+        this.setState({ isLoaded: true });
+      }
+    }
+  }
+
+}
+
+export default injectIntl(Announcements);
diff --git a/app/javascript/mastodon/features/compose/containers/announcements_container.js b/app/javascript/mastodon/features/compose/containers/announcements_container.js
new file mode 100644
index 000000000..e1dbb29b9
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/announcements_container.js
@@ -0,0 +1,11 @@
+import { connect } from 'react-redux';
+import Announcements from '../components/announcements';
+
+const mapStateToProps = state => {
+  return {
+    homeSize: state.getIn(['timelines', 'home', 'items']).size,
+    isLoading: state.getIn(['timelines', 'home', 'isLoading']),
+  };
+};
+
+export default connect(mapStateToProps)(Announcements);
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 0731abcf4..b19b1b2e4 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -15,6 +15,7 @@ import { changeComposing } from '../../actions/compose';
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
 import { mascot } from '../../initial_state';
 import Icon from 'mastodon/components/icon';
+import AnnouncementsContainer from './containers/announcements_container';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -108,6 +109,7 @@ class Compose extends React.PureComponent {
             <NavigationContainer onClose={this.onBlur} />
 
             <ComposeFormContainer />
+            <AnnouncementsContainer />
 
             <div className='drawer__inner__mastodon'>
               <img alt='' draggable='false' src={mascot || elephantUIPlane} />
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index cf32a70b0..4a4975a21 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -28,3 +28,4 @@
 @import 'mastodon/accessibility';
 
 @import 'markdown';
+@import 'astarte';
diff --git a/app/javascript/styles/astarte.scss b/app/javascript/styles/astarte.scss
new file mode 100644
index 000000000..66507b944
--- /dev/null
+++ b/app/javascript/styles/astarte.scss
@@ -0,0 +1,59 @@
+
+  .announcements {
+    padding: 0 10px;
+  
+    li {
+      display: flex;
+      padding: 10px;
+      color: #282c37;
+      background: darken($white, 10%);
+      border-radius: 4px;
+  
+      & + li {
+        margin-top: 10px;
+      }
+    }
+  }
+  
+  .announcements__admin {
+    width: 100%;
+    position: relative;
+  
+    p {
+      padding: 0 5px;
+      font-size: 14px;
+    }
+  }
+  
+  .announcements__icon {
+    display: inline-block;
+    position: absolute;
+    margin: -5px 5px;
+    right: 10px;
+  }
+  
+  .announcements__body {
+    width: 100%;
+    position: relative;
+  
+    p {
+      padding: 0 5px;
+      font-size: 14px;
+    }
+  
+    a {
+      display: inline-block;
+      float: right;
+      clear: both;
+      color: #282c37;
+      background: darken($white, 5%);
+      text-decoration: none;
+      padding: 1px 10px 0;
+      border: solid 1px #282c37;
+      font-size: 10px;
+      font-weight: 600;
+      border-radius: 4px;
+      margin-top: 5px;
+    }
+  }
+  
diff --git a/app/lib/formatter_markdown.rb b/app/lib/formatter_markdown.rb
index 0ee01b972..13399069a 100644
--- a/app/lib/formatter_markdown.rb
+++ b/app/lib/formatter_markdown.rb
@@ -364,4 +364,4 @@ class MDExtractor
     def htmlTagPatternOuterMostWithItem(tagName, itemTagName)
         Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<>]|<#{itemTagName} data-md=[^>]*>|<\\/#{itemTagName}>|(\\g<0>))*<\/#{tagName}>")
     end
-end
\ No newline at end of file
+end

From 46f017ead6b9854a711d224ff7c1de533f1b1883 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Tue, 13 Aug 2019 22:29:46 +0900
Subject: [PATCH 013/200] =?UTF-8?q?G+=E3=83=86=E3=83=BC=E3=83=9E=E3=81=AE?=
 =?UTF-8?q?=E5=B0=8E=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dark-gplus-theme-for-mastodon-dev.scss    |  24 ++
 .../_functions.scss                           |  15 +
 .../_mixins.scss                              |  13 +
 .../_variables.scss                           |  98 +++++++
 .../about.scss                                | 138 +++++++++
 .../accounts.scss                             | 191 +++++++++++++
 .../basics.scss                               |  47 ++++
 .../columns.scss                              | 263 ++++++++++++++++++
 .../components-button.scss                    |  39 +++
 .../components-card.scss                      |  38 +++
 .../components-dropdown.scss                  |  69 +++++
 .../components-status-card.scss               |  12 +
 .../components.scss                           |   6 +
 .../emoji-picker.scss                         |  68 +++++
 .../explore.scss                              |  47 ++++
 .../icons.scss                                | 179 ++++++++++++
 .../keyboard_shortcuts.scss                   |  21 ++
 .../lists.scss                                |  55 ++++
 .../notifications.scss                        |  27 ++
 .../profile.scss                              | 232 +++++++++++++++
 .../searches.scss                             |  41 +++
 .../settings-account.scss                     |  54 ++++
 .../settings-dashboard.scss                   |  30 ++
 .../settings-directory_tag.scss               |  21 ++
 .../settings-log.scss                         |  30 ++
 .../settings-report.scss                      |  75 +++++
 .../settings.scss                             | 244 ++++++++++++++++
 .../statuses.scss                             | 121 ++++++++
 .../tables.scss                               |  29 ++
 .../styles/gplus-theme-for-mastodon-dev.scss  |  24 ++
 .../_functions.scss                           |  15 +
 .../gplus-theme-for-mastodon-dev/_mixins.scss |  13 +
 .../_variables.scss                           |  98 +++++++
 .../gplus-theme-for-mastodon-dev/about.scss   | 138 +++++++++
 .../accounts.scss                             | 191 +++++++++++++
 .../gplus-theme-for-mastodon-dev/basics.scss  |  47 ++++
 .../gplus-theme-for-mastodon-dev/columns.scss | 263 ++++++++++++++++++
 .../components-button.scss                    |  39 +++
 .../components-card.scss                      |  38 +++
 .../components-dropdown.scss                  |  69 +++++
 .../components-status-card.scss               |  12 +
 .../components.scss                           |   6 +
 .../emoji-picker.scss                         |  68 +++++
 .../gplus-theme-for-mastodon-dev/explore.scss |  47 ++++
 .../gplus-theme-for-mastodon-dev/icons.scss   | 179 ++++++++++++
 .../keyboard_shortcuts.scss                   |  21 ++
 .../gplus-theme-for-mastodon-dev/lists.scss   |  55 ++++
 .../notifications.scss                        |  27 ++
 .../gplus-theme-for-mastodon-dev/profile.scss | 232 +++++++++++++++
 .../searches.scss                             |  41 +++
 .../settings-account.scss                     |  54 ++++
 .../settings-dashboard.scss                   |  30 ++
 .../settings-directory_tag.scss               |  21 ++
 .../settings-log.scss                         |  30 ++
 .../settings-report.scss                      |  75 +++++
 .../settings.scss                             | 244 ++++++++++++++++
 .../statuses.scss                             | 121 ++++++++
 .../gplus-theme-for-mastodon-dev/tables.scss  |  29 ++
 .../styles/gplus-theme-for-mastodon.scss      |  22 ++
 .../gplus-theme-for-mastodon/_mixins.scss     |  11 +
 .../gplus-theme-for-mastodon/_variables.scss  |  81 ++++++
 .../gplus-theme-for-mastodon/about.scss       | 138 +++++++++
 .../gplus-theme-for-mastodon/accounts.scss    | 109 ++++++++
 .../gplus-theme-for-mastodon/basics.scss      |  47 ++++
 .../gplus-theme-for-mastodon/columns.scss     | 197 +++++++++++++
 .../components-button.scss                    |  11 +
 .../components-card.scss                      |  37 +++
 .../components-dropdown.scss                  |  42 +++
 .../gplus-theme-for-mastodon/components.scss  |   5 +
 .../gplus-theme-for-mastodon/explore.scss     |  38 +++
 .../gplus-theme-for-mastodon/icons.scss       |  97 +++++++
 .../gplus-theme-for-mastodon/lists.scss       |  34 +++
 .../notifications.scss                        |  27 ++
 .../gplus-theme-for-mastodon/profile.scss     | 231 +++++++++++++++
 .../gplus-theme-for-mastodon/searches.scss    |  41 +++
 .../settings-account.scss                     |  44 +++
 .../settings-dashboard.scss                   |  28 ++
 .../settings-report.scss                      |  63 +++++
 .../gplus-theme-for-mastodon/settings.scss    | 208 ++++++++++++++
 .../gplus-theme-for-mastodon/statuses.scss    | 107 +++++++
 .../gplus-theme-for-mastodon/tables.scss      |  29 ++
 .../initializers/content_security_policy.rb   |   4 +-
 config/locales/en.yml                         |   4 +
 config/locales/ja.yml                         |   3 +
 config/themes.yml                             |   3 +
 85 files changed, 6114 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
 create mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/about.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/basics.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/columns.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/explore.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/icons.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/lists.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/profile.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/searches.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
 create mode 100644 app/javascript/styles/gplus-theme-for-mastodon/tables.scss

diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
new file mode 100644
index 000000000..8c2471deb
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
@@ -0,0 +1,24 @@
+/**
+ * Google+ Theme for Mastodon v1.1
+ * Copyright (C) 2018-2019 Genbu Project
+ */
+
+@charset "UTF-8";
+
+// @import 'application';
+@import 'application';
+@import 'dark-gplus-theme-for-mastodon-dev/basics';
+@import 'dark-gplus-theme-for-mastodon-dev/components';
+@import 'dark-gplus-theme-for-mastodon-dev/emoji-picker';
+@import 'dark-gplus-theme-for-mastodon-dev/tables';
+@import 'dark-gplus-theme-for-mastodon-dev/columns';
+@import 'dark-gplus-theme-for-mastodon-dev/lists';
+@import 'dark-gplus-theme-for-mastodon-dev/accounts';
+@import 'dark-gplus-theme-for-mastodon-dev/statuses';
+@import 'dark-gplus-theme-for-mastodon-dev/notifications';
+@import 'dark-gplus-theme-for-mastodon-dev/searches';
+@import 'dark-gplus-theme-for-mastodon-dev/settings';
+@import 'dark-gplus-theme-for-mastodon-dev/icons';
+@import 'dark-gplus-theme-for-mastodon-dev/profile';
+@import 'dark-gplus-theme-for-mastodon-dev/about';
+@import 'dark-gplus-theme-for-mastodon-dev/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
new file mode 100644
index 000000000..e5aea0e4e
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
@@ -0,0 +1,15 @@
+@charset "UTF-8";
+
+
+
+@function adjust-lightness ($color, $lightness) {
+	@if (lightness($color) - $lightness <= 0 and lightness($color) + $lightness < 100) {
+		@return lighten($color, $lightness);
+	}
+
+	@if (0 < lightness($color) - $lightness and 100 <= lightness($color) + $lightness) {
+		@return darken($color, $lightness);
+	}
+
+	@return change-color($color, $lightness: $lightness);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
new file mode 100644
index 000000000..400a1ac90
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
@@ -0,0 +1,13 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
+@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
+@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
+@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
+@mixin material-border { border-radius: 4px }
+@mixin material-card-radius { border-radius: 2px }
+@mixin material-icon-large { font-size: 20px }
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
new file mode 100644
index 000000000..9f5098b22
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
@@ -0,0 +1,98 @@
+@charset "UTF-8";
+
+
+
+// Base colors
+$active-color: #db4437;
+$accent-color: #fbbc04;
+$valid-color: #4285f4;
+$error-color: #d50000;
+$checked-color: #4285f4;
+$verified-color: #4caf50;
+
+
+// Text colors
+$primary-text-color: #ffffff;
+$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
+$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
+$secondary-text-color: #2196F3; // ex: リンク
+$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
+$light-text-color: #000000;
+$light-darker1-text-color: darken($light-text-color, 15%);
+$active-text-color: $active-color;
+$error-text-color: $error-color;
+
+
+// Icon colors
+$icon-color: #BDBDBD;
+$icon-active-color: $active-color;
+
+
+// Background colors
+$base-color: #212121;
+$base-lighter1-color: #2d2d2d;
+$base-darker1-color: #000000;
+
+$column-header-color: $base-lighter1-color;
+$column-header-hover-color: change-color($color: $column-header-color, $lightness: 10%);
+
+$status-color: $base-lighter1-color;
+$status-direct-color: darken($status-color, 5%);
+$status-actionbar-color: darken($status-color, 2%);
+
+$account-color: $base-lighter1-color;
+$account-foreground-color: $base-darker1-color;
+
+$card-color: $base-lighter1-color;
+$card-hover-color: $column-header-hover-color;
+$card-image-color: $base-color;
+
+$form-color: rgba(0, 0, 0, 0.1);
+$form-focused-color: lighten($form-color, 20%);
+$trend-color: $base-lighter1-color;
+
+$setting-base-color: $base-color;
+$setting-lists-selected-color: darken($base-color, 2%);
+$setting-lists-hover-color: darken($base-color, 5%);
+$setting-content-base-color: $base-lighter1-color;
+
+$setting-toggle-color: #b9b9b9;
+$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
+$setting-toggle-thumb-color: #fafafa;
+$setting-toggle-thumb-checked-color: $checked-color;
+
+$setting-emphasis-color: $verified-color;
+
+$dashboard-counters-base-color: $base-color;
+$dashboard-counters-hover-color: lighten($base-color, 2%);
+
+$log-entry-color: $base-lighter1-color;
+$log-entry-extra-color: $base-color;
+$log-entry-extra--neutral-color: $valid-color;
+$log-entry-extra--old-color: $active-color;
+$log-entry-extra--new-color: $verified-color;
+
+$explore-header-color: lighten($accent-color, 16%);
+$explore-directory-color: $base-lighter1-color;
+
+$active-button-color: $valid-color; //文字入りボタン
+$non-active-button-color: lighten($base-color, 20%);
+
+$floating-acton-button-hover-color: lighten($active-color, 10%);
+
+
+// Shadow colors
+$column-header-shadow-color: rgba(0, 0, 0, 0.3);
+$status-shadow-color: rgba(0, 0, 0, 0.14);
+$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
+$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
+$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
+$button-shadow-color: rgba(0, 0, 0, 0.4);
+
+
+// Separation colors
+$base-separation-color: rgba(0, 0, 0, 0.14);
+
+
+//Border colors
+$non-elevated-card-boader : #e0e0e0;
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
new file mode 100644
index 000000000..de48883a8
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
@@ -0,0 +1,138 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+// from mastodon/about.scss
+$column-breakpoint: 700px;
+
+
+
+.landing-page {
+	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
+	p { color: $primary-lighter1-text-color }
+	em { color: $primary-text-color }
+
+	.column-0 { background: $base-darker1-color }
+	.column-2 {
+		.landing-page {
+			&__information { padding: 0 }
+
+			&__short-description {
+				& > .row:first-child {
+					background: $base-darker1-color;
+					padding: 10px 20px;
+				}
+
+				& > * {
+					padding-left: 40px; padding-right: 40px;
+					&:last-child { padding-bottom: 45px }
+
+					@media screen and (max-width: $column-breakpoint) {
+						padding-left: 20px; padding-right: 20px;
+						&:last-child { padding-bottom: 25px }
+					}
+				}
+			}
+		}
+	}
+
+	&__forms,
+	&__information,
+	&__call-to-action {
+		@include status-shadow;
+		background: $column-header-color;
+	}
+
+	&__forms {
+		padding: 0;
+
+		& > *:first-child { margin: inherit }
+		& > * { margin-left: 20px; margin-right: 20px; }
+
+		.brand { background: $base-darker1-color }
+
+		form {
+			& > .input input {
+				background: $form-color;
+
+				&:focus { background: $form-focused-color }
+			}
+		}
+
+		.separator-or {
+			margin-left: 20px; margin-right: 20px;
+			
+			span {
+				color: $primary-lighter1-text-color;
+				background: $column-header-color;
+			}
+		}
+
+		@media screen and (max-width: $column-breakpoint) {
+			background: inherit;
+			box-shadow: none;
+
+			.separator-or span { background: $base-color }
+		}
+	}
+
+	&__information {
+		color: $primary-lighter1-text-color;
+
+		&.contact-widget {
+			@include status-shadow;
+			background: $column-header-color;
+
+			.contact-widget {
+				&__mail {
+					a { color: $primary-text-color }
+				}
+			}
+		}
+
+		strong { color: inherit }
+
+		.row:first-child {
+			h1 small {
+				color: $light-darker1-text-color;
+
+				span { color: $light-text-color }
+			}
+		}
+	}
+
+	&__call-to-action {
+		.row__information-board {
+			.information-board__section {
+				color: $primary-lighter2-text-color;
+
+				& > span:last-child { color: $primary-lighter1-text-color }
+			}
+		}
+	}
+
+	&__features {
+		.features-list {
+			.features-list__row {
+				.text { color: $primary-lighter1-text-color }
+				.visual .fa { color: $icon-color }
+			}
+		}
+	}
+
+	&__footer { color: $primary-lighter1-text-color }
+
+	#mastodon-timeline {
+		color: $primary-text-color;
+		background: transparent;
+
+		p {
+			color: $primary-text-color;
+
+			a { color: $secondary-text-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
new file mode 100644
index 000000000..984a8c9ae
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
@@ -0,0 +1,191 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.account {
+	background: $account-color;
+	border-color: $base-separation-color;
+
+	.account {
+		&__display-name {
+			color: $secondary-text-color;
+			strong { color: $primary-text-color }
+		}
+	}
+
+	&-role {
+		color: $primary-lighter2-text-color;
+		background-color: rgba($base-separation-color, 0.1);
+		border-color: rgba($base-separation-color, 0.5);
+	}
+}
+
+.column {
+	> .column-back-button {
+		@include column-shadow;
+		background: $column-header-color;
+	}
+}
+
+.account-timeline__header {
+	.account__header {
+		background-color: $account-foreground-color;
+
+		> div { background-color: inherit } // -> v2.7.4
+
+		.account__header {
+			&__username { color: $secondary-lighter1-text-color }
+			&__fields { @extend .account__header__fields; }
+
+			&__image { // v2.8.0 ->
+				&::after {
+					content: "";
+
+					position: absolute;
+					top: auto;
+					left: 0;
+					bottom: 0;
+	
+					width: 100%;
+					height: 30%;
+					background: $account-header-image-shadow-color;
+					box-shadow: none;
+				}
+
+				> img:not([src]),
+				> img[src$="/headers/original/missing.png"] {
+					content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+				}
+			}
+
+			&__bar { // v2.8.0 ->
+				background-color: $base-lighter1-color;
+
+				.account__header {
+					&__tabs {
+						.avatar {
+							.account__avatar {
+								border-color: $base-lighter1-color;
+								border-radius: 50%;
+							}
+						}
+
+						&__buttons {
+							.icon-button { border: 0 }
+						}
+
+						&__name {
+							h1 { color: $primary-text-color }
+							small { color: $secondary-text-color }
+						}
+					}
+
+					&__bio {
+						.account__header {
+							&__content { color: $primary-text-color }
+							&__fields { border-color: $base-separation-color }
+						}
+					}
+
+					&__extra {
+						&__links {
+							&, a { color: $primary-lighter1-text-color }
+							strong { color: $primary-lighter2-text-color }
+						}
+					}
+				}
+			}
+		}
+
+		.account--action-button {
+			.icon-button:not(.active) {
+				color: darken($light-text-color, 7%);
+
+				&:active,
+				&:focus,
+				&:hover {
+					color: $light-text-color;
+				}
+			}
+		}
+	}
+
+	.account {
+		&__disclaimer,
+		&__action-bar,
+		&__section-headline {
+			background: $base-lighter1-color;
+			border-color: $base-separation-color;
+		}
+
+		&__action-bar {
+			&__tab {
+				border-color: $base-separation-color;
+				&.active { border-bottom-color: $active-color }
+	
+				> span { color: $primary-lighter1-text-color }
+			}
+		}
+	
+		&__section-headline {
+			a {
+				color: $primary-text-color;
+	
+				&.active {
+					color: $active-color;
+	
+					&::before { border-color: transparent transparent $base-separation-color }
+					&::after { border-color: transparent transparent $status-color }
+				}
+			}
+		}
+	}
+}
+
+.account-authorize__wrapper {
+	@include status-shadow;
+	background: $base-lighter1-color;
+
+	&:focus { @include status-focus-shadow; }
+
+	.account {
+		&__header__content {
+			color: $primary-lighter2-text-color;
+		}
+	
+		&--panel {
+			background: $account-color;
+			border-color: $base-separation-color;
+		}
+	}
+}
+
+.account__header__fields {
+	dl {
+		border-color: $base-separation-color;
+		
+		dt,
+		dd {
+			color: $primary-text-color;
+			background: $base-lighter1-color;
+		}
+
+		dd {
+			&.verified {
+				border-color: transparentize($valid-color, 0.5);
+				background: transparentize($valid-color, 0.75);
+
+				a { color: lighten($verified-color, 20%) }
+			}
+		}
+	}
+
+	a { color: $secondary-text-color }
+}
+
+.account__action-bar__tab {
+	strong { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
new file mode 100644
index 000000000..a141ecd13
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
@@ -0,0 +1,47 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+body {
+	&,
+	.ui {
+		color: $primary-text-color;
+		background: $base-color;
+	}
+}
+
+.focusable {
+	&:focus {
+		background: inherit;
+
+		.status {
+			@include status-focus-shadow;
+
+			&.status-direct { background: $status-direct-color }
+		}
+
+		.detailed-status {
+			& { background: $status-color }
+			&__action-bar { background: $status-actionbar-color }
+		}
+	}
+}
+
+::-webkit-scrollbar-thumb {
+	background: darken($base-lighter1-color, 12%);
+
+	&:hover { background: darken($base-lighter1-color, 16%) }
+	&:active { background: darken($base-lighter1-color, 12%) }
+}
+
+::-webkit-scrollbar-track {
+	background: $base-color;
+
+	&:hover,
+	&:active {
+		background: darken($base-lighter1-color, 8%);
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
new file mode 100644
index 000000000..9e5cd2621
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
@@ -0,0 +1,263 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.tabs-bar {
+	@include column-shadow;
+	margin: 0;
+	background: $column-header-color;
+
+	.tabs-bar {
+		&__link {
+			color: $icon-color;
+			border-bottom: 4px solid $column-header-color;
+			padding: 15px 10px 11px 10px;
+			
+			&.active {
+				border-bottom: 4px solid $active-color;
+			}
+
+			.fa {
+				@include material-icon-large;
+				vertical-align: top;
+			}
+		}
+	}
+}
+
+.drawer {
+	.drawer {
+		&__header {
+			@include column-shadow;
+			background: $column-header-color;
+	
+			.drawer__tab {
+				@include material-icon-large;
+				color: $icon-color;
+			}
+	
+			a {
+				&:hover { background: $column-header-hover-color }
+			}
+		}
+	
+		&__pager {
+			@include status-shadow;
+			@include material-card-radius;
+			
+			.drawer__inner {
+				background: $column-header-color;
+		
+				&__mastodon { display: none }
+			}
+		}
+	}
+}
+
+.navigation-bar {
+	color: $secondary-text-color;
+	background: $column-header-color;
+
+	.navigation-bar {
+		&__profile {
+			strong { color: $primary-text-color }
+			&-edit { color: $secondary-text-color }
+		}
+	}
+}
+
+
+.compose-form {
+	.compose-form {
+		&__buttons-wrapper {
+			background: $column-header-color;
+
+			&.character-counter__wrapper {
+				.character-counter { color: $primary-lighter1-text-color }
+			}
+		}
+
+		&__publish { border-top: 1px solid $base-separation-color }
+		&__publish-button-wrapper { @include button-shadow }
+		&__modifiers { background-color: $base-lighter1-color }
+	}
+
+	.autosuggest-textarea__textarea {
+		background-color: $base-lighter1-color;
+		color: $primary-text-color;
+	}
+
+	.character-counter {
+		color: $icon-color
+	}
+}
+
+.column {
+	.column-header {
+		@include column-shadow;
+		background: $column-header-color;
+
+		&.active {
+			.column-header__icon {
+				color: $icon-active-color;
+				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
+			}
+		}
+
+		* { background: inherit }
+
+		&__icon {
+			@include material-icon-large;
+			color: $icon-color;
+			vertical-align: bottom;
+			margin-right: 10px;
+		}
+
+		&__buttons {
+			height: 50px;
+
+			.column-header {
+				&__back-button {
+					.column-back-button__icon { vertical-align: unset }
+				}
+	
+				&__button {
+					&.active {
+						color: $icon-active-color;
+						background: inherit;
+					}
+		
+					.fa { vertical-align: unset }
+				}
+			}
+		}
+
+		&__button {
+			color: $icon-color;
+			padding: 0 16px;
+		}
+
+		&__collapsible {
+			color: $secondary-text-color;
+			border-bottom: 1px solid $base-separation-color;
+	
+			&-inner { background: $column-header-color }
+		}
+	}
+
+	.column-back-button {
+		&__icon {
+			@include material-icon-large;
+			vertical-align: bottom;
+			margin-right: 8px;
+		}
+	}
+
+	.column {
+		&-subheading,
+		&-link__badge { background: $base-color }
+	
+		&-link {
+			color: $primary-text-color;
+			background: $base-color;
+	
+			&__icon {
+				@include material-icon-large;
+				color: $icon-color;
+				vertical-align: bottom;
+				margin-right: 8px;
+			}
+		}
+	}
+
+	.scrollable {
+		background: transparent;
+
+		*[role="feed"] {
+			article {
+				margin: 1em 0;
+				&:first-of-type { margin: 0 }
+
+				&:focus { outline: none }
+			}
+		}
+
+		div[tabindex="-1"] { margin-bottom: 1em }
+	}
+
+	.notification__filter-bar {
+		background: $column-header-color;
+		border-bottom-color: $base-separation-color;
+
+		button {
+			color: $icon-color;
+			background: $column-header-color;
+
+			&.active {
+				color: $icon-active-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $column-header-color }
+			}
+		}
+	}
+
+	.empty-column-indicator {
+		flex-direction: column;
+		background: $base-color;
+
+		&::before {
+			content: "";
+			display: block;
+
+			width: 100px;
+			height: 100px;
+			margin-bottom: 1em;
+
+			background: none center / contain no-repeat;
+			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
+		}
+	}
+}
+
+.getting-started {
+	&__wrapper,
+	& {
+		background: $base-color;
+	}
+
+	& {
+		border-top: 1px solid $base-separation-color;
+
+		a { color: $primary-text-color }
+	}
+}
+
+.load {
+	&-more,
+	&-gap {
+		background: transparent;
+
+		&:hover { background: darken($column-header-color, 10%) }
+	}
+
+	&-gap { border: 0 }
+}
+
+.confirmation-modal {
+	@include material-card-radius;
+	color: $primary-text-color;
+	background-color: $base-lighter1-color;
+
+	&__action-bar {
+		background-color: $base-lighter1-color;
+	}
+
+	&__cancel-button {
+		color: $primary-lighter1-text-color;
+		box-shadow: 0 2px 5px 0 transparent;
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
new file mode 100644
index 000000000..42d4f8db8
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
@@ -0,0 +1,39 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.floating-action-button {
+	font-size: 24px;
+	background-color: $active-color;
+	width: 3.6rem;
+	height: 3.6rem;
+
+	&:active {
+		background-color: $active-color;
+	}
+
+	&:hover {
+		background-color: $floating-acton-button-hover-color;
+	}
+}
+
+.button {
+	@include button-shadow;
+	@include material-card-radius;
+	background-color: $active-button-color;
+
+	.text-icon-button { color: $primary-lighter1-text-color }
+}
+
+.modal-root {
+	&__modal {
+		.media-modal {
+			&__close.icon-button {
+				font-size: 40px !important;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
new file mode 100644
index 000000000..dc72775a1
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.card {
+	//border: 1px solid $base-separation-color;
+	//不要(?)
+
+	> a {
+		@include status-shadow;
+
+		&:hover,
+		&:focus,
+		&:active {
+			.card__bar {
+				background: initial;
+
+				.display-name strong { color: $secondary-text-color }
+			}
+		}
+
+		.card__img { background: $card-image-color }
+		.card__bar {
+			background: $card-color;
+	
+			.avatar {
+				img { background: transparent }
+			}
+	
+			.display-name {
+				strong { color: $primary-text-color }
+				span { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
new file mode 100644
index 000000000..a9c6dc5ef
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+.dropdown-menu {
+	background-color: $column-header-color;
+}
+
+.dropdown-menu,
+.actions-modal {
+	@include material-card-radius;
+
+	& > ul {
+		background: $base-lighter1-color;
+
+		.dropdown-menu {
+			&__arrow {
+				&.top { border-top-color: $column-header-color }
+				&.bottom { border-bottom-color: $column-header-color }
+			}
+
+			&__item {
+				a {
+					color: $primary-lighter2-text-color;
+
+					padding: 16px 16px;
+					background: $column-header-color;
+
+					&:active,
+					&:focus,
+					&:hover {
+						color: $primary-text-color;
+						background: $column-header-hover-color;
+					}
+				}
+			}
+
+			&__separator { border-bottom-color: $base-separation-color }
+		}
+
+		& > li:not(:empty) {
+			@extend .dropdown-menu__item;
+
+			a {
+				padding: 12px 16px;
+				color: $primary-text-color;
+
+				&:hover {
+					color: $primary-text-color;
+					background-color: $column-header-hover-color;
+				}
+			}
+		}
+	}
+
+	.status {
+		background-color: $base-lighter1-color;
+		padding-top: 16px;
+		padding-bottom: 16px;
+		padding-right: 16px;
+		padding-left: 74px;
+
+		&__avatar {
+			top: 16px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
new file mode 100644
index 000000000..9b64572f9
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.status-card {
+	color: $primary-lighter1-text-color;
+	&__title, &__description { color: $primary-lighter2-text-color }
+
+	&__image { background: transparent }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
new file mode 100644
index 000000000..e735b108d
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
@@ -0,0 +1,6 @@
+@charset "UTF-8";
+
+@import 'components-button';
+@import 'components-card';
+@import 'components-dropdown';
+@import 'components-status-card';
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
new file mode 100644
index 000000000..0937158bf
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
@@ -0,0 +1,68 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.emoji-mart {
+    &-bar {
+        border: 0 solid $base-separation-color;
+
+        &:first-child {
+            border-top-left-radius: 2px;
+            border-top-right-radius: 2px;
+            background-color: $base-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-color;
+    }
+    &-anchor {
+        &-selected {
+            color: $icon-active-color;
+
+            &:hover {
+                color: $icon-active-color;
+            }
+        }
+
+        &-bar {
+            background-color: $icon-active-color;
+        }
+    }
+
+    &-search {
+        background-color: $base-lighter1-color;
+    }
+    &-search input {
+        color: $primary-text-color;
+        background-color: $form-color;
+        border: 0px solid #ffffff00;
+    }
+
+    &-category-label span {
+        color: $primary-text-color;
+        background-color: $base-lighter1-color;
+    }
+
+    &-scroll {
+        background-color: $base-lighter1-color;
+    }
+}
+
+.emoji-picker-dropdown {
+    &__modifiers {
+        &__menu {
+            @include status-shadow;
+            @include material-card-radius;
+            background-color: $base-lighter1-color;
+        }
+    }
+
+    &__menu {
+        @include column-shadow;
+        background-color: $base-lighter1-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
new file mode 100644
index 000000000..ae80b3884
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
@@ -0,0 +1,47 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.public-layout {
+	.page-header {
+		background: $explore-header-color;
+
+		h1 { color: $primary-text-color }
+		p { color: $primary-lighter2-text-color }
+	}
+
+	.directory,
+	.notice-widget { @include column-shadow; }
+
+	.directory {
+		background: $explore-directory-color;
+
+		.accounts-table {
+			&__count {
+				color: $primary-lighter2-text-color;
+				small { color: $primary-lighter1-text-color }
+			}
+		}
+
+		&__tag {
+			& > a {
+				@include status-shadow;
+				background: $explore-directory-color;
+			}
+
+			h4 { color: $primary-lighter2-text-color }
+			.fa, small { color: $primary-lighter1-text-color }
+			.trends__item__current { color: $primary-text-color }
+		}
+	}
+
+	.notice-widget {
+		color: $primary-lighter1-text-color;
+		background: $explore-directory-color;
+
+		a { color: $secondary-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
new file mode 100644
index 000000000..825d18dac
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
@@ -0,0 +1,179 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@function hex-color($color) {
+	@if type-of($color) == 'color' {
+		$color: str-slice(ie-hex-str($color), 4);
+	}
+
+	@return '%23' + unquote($color)
+};
+
+
+
+@font-face {
+	font-family: "Material Icons Extended";
+	src:
+		local("Material Icons Extended"),
+		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
+		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
+}
+
+.icon-button {
+	color: $icon-color;
+
+	&:active,
+	&:focus,
+	&:hover {
+		color: lighten($icon-color, 7%);
+	}
+
+	&.star-icon {
+		&.active {
+			color: $light-text-color;
+			background: $icon-active-color;
+			border-radius: 50%;
+		}
+
+		.fa.fa-star { vertical-align: top }
+	}
+
+	&.inverted {
+		color: $icon-color;
+	}
+
+	&.disabled {
+		color: lighten($icon-color, 13%);
+
+		.fa.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+		}
+	}
+
+	.fa {
+		@include material-icon-large;
+		vertical-align: middle;
+
+		&.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			
+			&:active,
+			&:hover,
+			&:focus {
+				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			}
+		}
+	}
+}
+
+.fa {
+	&.fa-users,
+	&.fa-globe,
+	&.fa-cog,
+	&.fa-cogs,
+	&.fa-gears,
+	&.fa-sign-out,
+	&.fa-star,
+	&.fa-reply,
+	&.fa-reply-all,
+	&.fa-mail-reply,
+	&.fa-mail-reply-all,
+	&.fa-envelope,
+	&.fa-bookmark,
+	&.fa-home,
+	&.fa-bell,
+	&.fa-eraser,
+	&.fa-ellipsis-h,
+	&.fa-ellipsis-v,
+	&.fa-address-book,
+	&.fa-thumb-tack,
+	&.fa-lock,
+	&.fa-pencil,
+	&.fa-chevron-left,
+	&.fa-chevron-right,
+	&.fa-camera,
+	&.fa-tasks,
+	&.fa-sliders,
+	&.fa-fire,
+	&.fa-list-ul,
+	&.fa-search,
+	&.fa-close,
+	&.fa-remove,
+	&.fa-times,
+	&.fa-user,
+	&.fa-mobile-phone,
+	&.fa-mobile,
+	&.fa-filter,
+	&.fa-user-plus,
+	&.fa-cloud-upload,
+	&.fa-cloud-download,
+	&.fa-eye,
+	&.fa-eye-slash,
+	&.fa-share-alt,
+	&.fa-chevron-down,
+	&.fa-bars,
+	&.fa-navicon,
+	&.fa-reorder {
+		font-family: "Material Icons Extended";
+	}
+
+	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
+	&.fa-globe::before { content: "public" } // 地球マーク(.drawer__header > .drawer__tab:3)
+	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
+	&.fa-cogs::before { content: "settings" } //歯車マーク(モバイル)
+	&.fa-gears::before { content: "settings" } //歯車マーク(モバイル)
+	&.fa-sign-out::before { content: "exit_to_app" } //サインアウト
+	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
+	&.fa-reply::before { content: "reply" } //返信ボタン
+	&.fa-reply-all::before { content: "reply_all" } //全員に返信ボタン
+	&.fa-mail-reply::before { content: "reply" } //返信ボタン
+	&.fa-mail-reply-all::before { content: "reply_all" } //全員に返信ボタン
+	&.fa-envelope::before { content: "mail" } //ダイレクトメッセージボタン
+	&.fa-bookmark::before { content: "bookmark" } //ブックマークボタン
+	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
+	&.fa-bell::before { content: "notifications" } // ベルマーク(通知)
+	&.fa-eraser::before { content: "clear_all" } // 通知を消去のマーク
+	&.fa-ellipsis-h::before { content: "more_horiz" } // 三点リーダー(横)
+	&.fa-ellipsis-v::before { content: "more_vert" } // 三点リーダー(縦)
+	&.fa-address-book::before { content: "explore" } // discoverマーク(explore遷移タブ)
+	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
+	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
+	&.fa-pencil::before { content: "create" } // 鉛筆マーク(モバイル用フローティングボタン)
+	&.fa-chevron-left::before { content: "arrow_back" } //戻るボタン
+	&.fa-chevron-right::before { content: "arrow_forward" } //進むボタン
+	&.fa-camera::before { content: "camera_alt" } //メディアを追加ボタン
+	&.fa-tasks::before { content: "poll" } //投票を追加ボタン
+	&.fa-sliders::before { content: "tune" } //設定を表示ボタン
+	&.fa-fire::before { content: "whatshot" } //トレンドマーク
+	&.fa-list-ul::before { content: "list" } //リストマーク
+	&.fa-search::before { content: "search" } //検索アイコン(モバイル、トップバー内)
+	&.fa-close::before { content: "close" } //閉じるボタン
+	&.fa-remove::before { content: "close" } //閉じるボタン
+	&.fa-times::before { content: "close" } //閉じるボタン(メディア)
+	&.fa-user::before { content: "account_circle" } //ユーザーアイコン
+	&.fa-mobile-phone::before { content: "smartphone" } //モバイルアイコン
+	&.fa-mobile::before { content: "smartphone" } //モバイルアイコン
+	&.fa-filter::before { content: "filter_list" } //フィルターアイコン
+	&.fa-user-plus::before { content: "person_add" } //ユーザーの追加アイコン
+	&.fa-cloud-upload::before { content: "cloud_upload" } //インポートアイコン
+	&.fa-cloud-download::before { content: "cloud_download" } //エクスポートアイコン
+	&.fa-eye::before { content: "visibility" } //目のアイコン
+	&.fa-eye-slash::before { content : "visibility_off" } //閉じた目のアイコン
+	&.fa-share-alt::before { content: "share" } //モバイル共有ボタン
+	&.fa-chevron-down::before { content: "keyboard_arrow_down" } //メニューボタン
+	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
+	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
+	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
+}
+
+.fa {
+	&.fa-chevron-left,
+	&.fa-chevron-right,
+	&.fa.fa-times {
+		@include material-icon-large;
+		vertical-align: bottom;
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
new file mode 100644
index 000000000..6c664b32f
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.keyboard-shortcuts {
+	kbd {
+		@include status-shadow;
+
+		color: $primary-text-color;
+		background-color: $base-lighter1-color;
+		border-color: $base-darker1-color;
+
+		margin: 0 0.25em;
+
+		&:first-child { margin-left: 0 }
+		&:last-child { margin-right: 0 }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
new file mode 100644
index 000000000..05c29a6df
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
@@ -0,0 +1,55 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.column {
+	.column-back-button { background: inherit }
+
+	.column-inline-form {
+		background: $column-header-color;
+
+		label input {
+			color: $secondary-text-color;
+			&:focus { color: $primary-text-color }
+		}
+	}
+
+	.column-inline-form ~ .scrollable {
+		article { margin: 0 }
+	}
+}
+
+.modal-root {
+	.column-inline-form {
+		background: $column-header-color;
+		
+		.setting-text {
+			color: $primary-text-color;
+			&:active, &:focus { color: $primary-lighter2-text-color }
+		}
+	}
+
+	.list-editor {
+		background: $base-color;
+		h4 { background: $column-header-color }
+
+		.drawer__pager {
+			.drawer__inner { background: $column-header-color }
+		}
+	}
+
+	.list-adder {
+		background: $base-color;
+
+		.column-inline-form { border-bottom: 1px solid $base-separation-color }
+
+		&__account,
+		&__lists { background: $column-header-color }
+
+		&__lists {
+			.list { border-color: $base-separation-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
new file mode 100644
index 000000000..bab098372
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
@@ -0,0 +1,27 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.notification {
+	&.notification-favourite {
+		.status {
+			&.status-direct { background: transparent }
+		}
+	}
+
+	> .notification__message {
+		color: $primary-lighter2-text-color;
+		font-size: 13px;
+		padding: 8px 0;
+
+		.notification__display-name {
+			&:hover { color: inherit }
+		}
+
+		.notification__favourite-icon-wrapper {
+			.star-icon { color: $icon-active-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
new file mode 100644
index 000000000..246d24b7d
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
@@ -0,0 +1,232 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.public-layout {
+	a.button {
+		@include button-shadow;
+
+		color: $primary-text-color;
+		background: $base-lighter1-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			background: darken($base-lighter1-color, 8%);
+		}
+	}
+
+	.logo-button {
+		svg path {
+			/* Only for Itabashi-don */
+			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+			&#Mastodon { fill: $base-lighter1-color !important }
+		}
+	}
+
+	.public-account-header {
+		@include status-shadow;
+
+		&__image {
+			background: $base-lighter1-color;
+
+			@media screen and (min-width: 600px) { height: 500px }
+
+			&::after {
+				content: "";
+				
+				position: absolute;
+				top: auto;
+				left: 0;
+				bottom: 0;
+
+				width: 100%;
+				height: 30%;
+				background: $account-header-image-shadow-color;
+				box-shadow: none;
+			}
+
+			> img:not([src]),
+			> img[src="/headers/original/missing.png"] {
+				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+			}
+		}
+
+		&__bar {
+			@media screen and (max-width: 600px) {
+				flex-direction: column;
+				background: $base-color;
+			}
+			
+			@media screen and (min-width: 600px) { margin-top: -140px }
+
+			&::before { background: $base-lighter1-color }
+
+			.avatar {
+				@media screen and (max-width: 600px) {
+					position: relative;
+					bottom: 30px;
+
+					display: initial;
+					width: 60px;
+					height: 60px;
+					margin: 0 auto;
+					padding: 0;
+				}
+
+				img {
+					border: 2px solid $base-lighter1-color;
+					border-radius: 50%;
+					background: transparent;
+				}
+			}
+		}
+
+		&__tabs {
+			@media screen and (max-width: 600px) {
+				flex-wrap: wrap;
+				margin-left: 0;
+
+				&__name {
+					width: 100%;
+					text-align: center;
+
+					h1 {
+						color: $primary-text-color;
+
+						small { color: $primary-lighter1-text-color }
+					}
+				}
+
+				&__tabs {
+					justify-content: center;
+					flex: auto;
+
+					.spacer { display: none }
+
+					a.button.logo-button {
+						color: $light-text-color;
+						background: $secondary-text-color;
+
+						svg path {
+							/* Only for Itabashi-don */
+							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
+							&#Mastodon { fill: $secondary-text-color !important }
+						}
+					}
+				}
+			}
+
+			.details-counters {
+				.counter {
+					color: $light-text-color;
+					border-right: 0;
+
+					&::after { border-bottom-color: $base-color }
+
+					&.active {
+						&::after { border-bottom-color: $active-color }
+					}
+				}
+			}
+		}
+
+		&__extra {
+			.public-account-bio {
+				.account__header__content { text-align: center }
+			}
+
+			&__links {
+				color: $primary-text-color;
+
+				a {
+					&, strong { color: $primary-text-color }
+				}
+			}
+		}
+	}
+
+	.public-account-bio,
+	.endorsements-widget,
+	.hero-widget { @include status-shadow; }
+
+	.public-account-bio {
+		background: $base-lighter1-color;
+		
+		.account__header__content { color: $primary-text-color }
+		&__extra { color: $primary-lighter1-text-color }
+	}
+
+	.endorsements-widget {
+		padding-bottom: 0;
+		border-radius: 4px;
+
+		h4 {
+			color: $primary-lighter1-text-color;
+			background: $base-lighter1-color;
+		}
+	}
+
+	.hero-widget {
+		&__img { background: $base-color }
+		&__text {
+			background: $base-lighter1-color;
+
+			&, em { color: $primary-lighter2-text-color }
+			a { color: $secondary-text-color }
+		}
+	}
+
+	.account__section-headline {
+		background: $base-lighter1-color;
+		border-bottom-color: $base-separation-color;
+
+		a {
+			color: $primary-lighter1-text-color;
+
+			&.active {
+				color: $primary-lighter2-text-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $status-color }
+			}
+		}
+	}
+
+	.activity-stream {
+		box-shadow: none;
+
+		.entry {
+			margin: 1em 0;
+			background: transparent;
+
+			&:first-of-type { margin: 0 }
+		}
+	}
+
+	.nothing-here {
+		@include status-shadow;
+
+		color: $primary-lighter1-text-color;
+		background: $base-lighter1-color;
+	}
+
+	.footer {
+		h4 { color: $primary-lighter1-text-color }
+
+		ul {
+			a { color: $primary-lighter2-text-color }
+		}
+
+		.brand {
+			svg path {
+				/* Only for Itabashi-don */
+				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+				&#Mastodon { fill: $base-lighter1-color !important }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
new file mode 100644
index 000000000..b4478b91b
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
@@ -0,0 +1,41 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.search {
+	.search {
+		&__input {
+			@include material-border;
+
+			color: $primary-text-color;
+			background: $form-color;
+	
+			&:focus { background: $form-focused-color }
+		}
+	
+		&__icon {
+			.fa { color: $icon-color }
+		}
+	}
+
+	&-results {
+		> .search-results {
+			&__header { background: $base-color }
+			&__section {
+				> h5 { background: darken($base-color, 10%) }
+			}
+		}
+	}
+}
+
+.trends__item {
+	background: $trend-color;
+
+	.trends__item {
+		&__name a { color: $secondary-text-color }
+		&__current { color: lighten($secondary-text-color, 10%) }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
new file mode 100644
index 000000000..02fb9eac4
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
@@ -0,0 +1,54 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.edit_account {
+	@media screen and (min-width: 415px) {
+		.card {
+			> a {
+				position: relative;
+
+				.card__img {
+					border-bottom: 1px solid $base-separation-color;
+
+					> img:not([src]),
+					> img[src="/headers/original/missing.png"] {
+						content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+					}
+				}
+				
+				.card__bar {
+					position: static;
+					padding-top: 30%;
+			
+					.avatar {
+						position: absolute;
+						left: 0;
+						bottom: 0;
+
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 100%;
+						height: 100%;
+
+						img {
+							width: 128px;
+							height: 128px;
+
+							border-radius: 50%;
+						}
+					}
+			
+					.display-name {
+						flex: auto;
+						margin-left: 0;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
new file mode 100644
index 000000000..b4303249b
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.dashboard {
+	&__counters {
+		& > div {
+			& > div, & > a { background: $dashboard-counters-base-color }
+			
+			& > a {
+				&:hover,
+				&:focus,
+				&:active {
+					background: $dashboard-counters-hover-color;
+				}
+			}
+		}
+
+		&__text,
+		&__num { color: $primary-text-color }
+		
+		&__label { color: $primary-lighter1-text-color }
+	}
+
+	&__widgets {
+		a:not(.name-tag) { color: $primary-lighter2-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
new file mode 100644
index 000000000..9f75646ac
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.admin-wrapper {
+	.content {
+		.directory__tag {
+			& > a,
+			& > div { background: $setting-base-color }
+
+			h4 {
+				& { color: $primary-lighter2-text-color }
+				.fa, small { color: $primary-lighter1-text-color }
+			}
+
+			.trends__item__current { color: $primary-text-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
new file mode 100644
index 000000000..672a77c06
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.log-entry {
+	.log-entry {
+		&__header {
+			color: $primary-lighter2-text-color;
+			background: $log-entry-color;
+
+			.username,
+			.target,
+			a { color: $secondary-text-color }
+		}
+
+		&__timestamp { color: $primary-lighter1-text-color }
+		&__icon { color: $icon-color }
+
+		&__extras {
+			color: $primary-text-color;
+			background: $log-entry-extra-color;
+
+			.diff-neutral { color: $log-entry-extra--neutral-color }
+			.diff-old { color: $log-entry-extra--old-color }
+			.diff-new { color: $log-entry-extra--new-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
new file mode 100644
index 000000000..2e198f338
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
@@ -0,0 +1,75 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.report-card {
+	background: $setting-content-base-color;
+
+	&__profile__stats {
+		color: $primary-lighter2-text-color;
+
+		a {
+			&:focus,
+			&:hover,
+			&:active {
+				color: lighten($primary-lighter2-text-color, 8%);
+			}
+		}
+	}
+
+	&__summary {
+		&__item {
+			border-top-color: $base-separation-color;
+
+			&:hover { background: $column-header-hover-color }
+
+			&__reported-by,
+			&__assigned {
+				color: $primary-lighter2-text-color;
+			}
+
+			&__content {
+				&__icon { color: $icon-color }
+				a { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
+
+.batch-table {
+	&__toolbar {
+		background: $base-lighter1-color;
+		border-color: $base-separation-color;
+	}
+
+	&__row {
+		&, &:nth-child(2n) { background: $base-lighter1-color }
+		&:hover, &:nth-child(2n):hover { background: $column-header-hover-color }
+
+		border-color: $base-separation-color;
+
+		&__content {
+			.status__content { color: $primary-text-color }
+			.detailed-status__meta { color: $primary-lighter1-text-color }
+
+
+			.accounts-table { // v2.8.0 ->
+				.accounts-table {
+					&__count {
+						& {color: $primary-text-color }
+						small { color: $primary-lighter1-text-color }
+					}
+				}
+
+				td .account { background: inherit }
+			}
+		}
+	}
+}
+
+.speech-bubble {
+	&__bubble { color: $primary-text-color }
+	a { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
new file mode 100644
index 000000000..308c7e6a0
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
@@ -0,0 +1,244 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+@import 'settings-account';
+@import 'settings-report';
+@import 'settings-log';
+@import 'settings-dashboard';
+@import 'settings-directory_tag';
+
+
+
+body.admin {
+	color: $primary-text-color;
+	background: $setting-base-color;
+	
+	.sidebar {
+		&-wrapper { background: inherit }
+
+		ul {
+			border-radius: 0;
+
+			a {
+				color: $primary-lighter2-text-color;
+				border-radius: 0;
+
+				&:hover {
+					color: $primary-text-color;
+					background: $setting-lists-hover-color;
+				}
+
+				&.selected {
+					color: $primary-text-color;
+					background: $setting-lists-selected-color;
+				}
+
+				i.fa {
+					@include material-icon-large;
+					margin-right: 8px;
+					vertical-align: bottom;
+				}
+			}
+
+			ul { background: darken($setting-base-color, 4%) }
+
+			.simple-navigation-active-leaf a {
+				color: $icon-active-color;
+				background: initial;
+
+				&:hover { background: $setting-lists-hover-color }
+			}
+		}
+	}
+
+	.content {
+		@include column-shadow;
+		background: $setting-content-base-color;
+
+		h2, h3, h4, h6 { color: $primary-text-color }
+
+		p {
+			color: $primary-text-color;
+			strong { color: $primary-text-color }
+		}
+
+		h2, h4, hr { border-bottom-color: $base-separation-color }
+		.muted-hint { color: $primary-lighter1-text-color }
+	}
+}
+
+.simple_form {
+	.input {
+		&.boolean,
+		&.with_label,
+		&.with_floating_label {
+			.label_input > label { color: $primary-text-color }
+		}
+
+		&.with_block_label {
+			& > label { color: $primary-text-color }
+		}
+
+		&.radio_buttons{
+			.radio label { color: $primary-text-color }
+		}
+
+		&-copy {
+			background: $base-color;
+			border-color: $base-separation-color;
+		}
+	}
+
+	.check_boxes {
+		.checkbox {
+			label { color: $primary-text-color }
+		}
+	}
+
+	input[type=text],
+	input[type=number],
+	input[type=email],
+	input[type=password],
+	textarea {
+		color: $primary-text-color;
+		background: $setting-content-base-color;
+		border-color: $base-separation-color;
+
+		&:hover {
+			border-color: $base-separation-color;
+		}
+
+		&:active,
+		&:focus {
+			background: darken($setting-content-base-color, 8%);
+		}
+	}
+
+	select {
+		color: $primary-text-color;
+		background-color: $setting-content-base-color;
+		border-color: $base-separation-color;
+	}
+
+	.input.field_with_errors {
+		label,
+		.error {
+			color: $error-text-color;
+		}
+	}
+
+	.hint, p.hint {
+		color: $primary-lighter1-text-color !important;
+
+		code {
+			color: $light-text-color;
+			background: $setting-emphasis-color;
+		}
+	}
+
+	.recommended {
+		color: $verified-color;
+		background-color: transparentize($verified-color, 0.75);
+		border-color: $verified-color;
+	}
+
+	.label_input {
+		&__append { color: $primary-lighter1-text-color }
+	}
+
+	button {
+		@include button-shadow;
+	}
+}
+
+.simple_form,
+.table-form {
+	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
+}
+
+.quick-nav {
+	a {
+		color: $secondary-text-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			color: lighten($secondary-text-color, 8%);
+		}
+	}
+}
+
+.pagination {
+	.page,
+	a {
+		color: $primary-text-color;
+	}
+
+	.page {
+		&.current {
+			background: $icon-active-color;
+			color: $light-text-color;
+		}
+	}
+}
+
+.filters {
+	.filter-subset {
+		strong { color: $primary-text-color }
+
+		a {
+			color: $primary-lighter2-text-color;
+
+			&:hover { color: $primary-text-color }
+
+			&.selected {
+				color: $active-text-color;
+				border-bottom-color: $active-text-color;
+			}
+		}
+	}
+}
+
+.new_form_two_factor_confirmation {
+	.qr-wrapper {
+		.qr-code { box-shadow: none }
+		.qr-alternative { color: $secondary-lighter1-text-color }
+	}
+}
+
+label,
+select#user_setting_default_privacy {
+	&[for=user_setting_default_privacy_public],
+	&[for=user_setting_default_privacy_unlisted],
+	option[value="public"],
+	option[value="unlisted"] { color: $active-text-color !important }
+}
+
+.column-header__collapsible__extra {
+	.column-settings__section { color: $primary-text-color }
+
+	.setting-toggle {
+		.react-toggle {
+			&.react-toggle--checked {
+				> .react-toggle-track { background: $setting-toggle-checked-color }
+
+				> .react-toggle-thumb {
+					border-color: $setting-toggle-checked-color;
+					background-color: $setting-toggle-thumb-checked-color;
+				}
+			}
+
+			> .react-toggle-track { background: $setting-toggle-color }
+
+			> .react-toggle-thumb {
+				border-color: $setting-toggle-color;
+				background-color: $setting-toggle-thumb-color;
+			}
+		}
+
+		.setting-toggle__label { color: $primary-text-color }
+	}
+
+	.setting-meta__label { color: $primary-lighter1-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
new file mode 100644
index 000000000..6746032b4
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
@@ -0,0 +1,121 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.status {
+	@include status-shadow;
+	@include material-card-radius;
+	border-bottom: 0;
+
+	transition: box-shadow 0.1s 0s ease-out;
+
+	&.light {
+		.status {
+			&__relative-time { color: $primary-lighter1-text-color }
+			&__display-name {
+				color: $primary-text-color;
+
+				.display-name__account { color: $primary-lighter1-text-color }
+			}
+
+			&__content { color: $primary-text-color }
+		}
+	}
+
+	&.status-direct {
+		background: $status-direct-color;
+
+		&:not(.read) {
+			background: inherit;
+			border-bottom-color: initial;
+		}
+	}
+
+	&.muted {
+		.status__content {
+			p { color: lighten($primary-text-color, 20%) }
+		}
+	}
+
+	.status {
+		&__info {
+			.status__display-name {
+				color: $primary-lighter1-text-color;
+	
+				strong { color: $primary-text-color }
+			}
+	
+			.status__relative-time { color: $primary-lighter1-text-color }
+		}
+	}
+
+	&__action-bar__counter__label { color: $primary-lighter1-text-color }
+}
+
+.detailed-status {
+	&__display-name {
+		color: $secondary-text-color;
+
+		strong { color: $primary-text-color }
+	}
+
+	&__meta {
+		.detailed-status__datetime { color: $primary-lighter1-text-color }
+
+		.detailed-status__link {
+			.fa.fa-star { vertical-align: middle }
+		}
+	}
+	
+	&__wrapper {
+		@include status-shadow;
+		
+		.detailed-status { @extend .detailed-status; }
+		.detailed-status__action-bar {
+			background: $status-actionbar-color;
+			border-color: $base-separation-color;
+		}
+	}
+}
+
+.status,
+.detailed-status {
+	background: $status-color;
+
+	.status__content {
+		color: $primary-text-color;
+
+		a { color: $secondary-text-color }
+
+		.status__content__spoiler-link {
+			color: $primary-text-color;
+			background: $base-color;
+		}
+	}
+}
+
+a.status-card,
+a.status-card.compact {
+	&:hover { background: initial }
+}
+
+.status-card,
+.status-card.compact {
+	border-color: $non-elevated-card-boader;
+
+	&__title {
+		color : $primary-text-color;
+	}
+
+	&__host {
+		color: $primary-lighter1-text-color;
+	}
+}
+
+.name-tag,
+a.name-tag {
+	color: $secondary-text-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
new file mode 100644
index 000000000..e71ce7a38
--- /dev/null
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.table {
+	thead th { border-bottom-color: $base-separation-color }
+	
+	th,
+	td {
+		color: $primary-text-color;
+		background-color: $base-color;
+		border-top: 0;
+	}
+
+	& > tbody > tr:nth-child(odd) {
+		& > td, & > th { background: darken($base-color, 4%) }
+	}
+
+	a { color: $secondary-text-color }
+}
+
+a.table-action-link,
+button.table-action-link {
+	color: $secondary-text-color;
+
+	&:hover { color: darken($secondary-text-color, 8%) }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev.scss
new file mode 100644
index 000000000..1c8df2bab
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev.scss
@@ -0,0 +1,24 @@
+/**
+ * Google+ Theme for Mastodon v1.1
+ * Copyright (C) 2018-2019 Genbu Project
+ */
+
+ @charset "UTF-8";
+
+ // @import 'application';
+ @import 'application';
+ @import 'gplus-theme-for-mastodon-dev/basics';
+ @import 'gplus-theme-for-mastodon-dev/components';
+ @import 'gplus-theme-for-mastodon-dev/emoji-picker';
+ @import 'gplus-theme-for-mastodon-dev/tables';
+ @import 'gplus-theme-for-mastodon-dev/columns';
+ @import 'gplus-theme-for-mastodon-dev/lists';
+ @import 'gplus-theme-for-mastodon-dev/accounts';
+ @import 'gplus-theme-for-mastodon-dev/statuses';
+ @import 'gplus-theme-for-mastodon-dev/notifications';
+ @import 'gplus-theme-for-mastodon-dev/searches';
+ @import 'gplus-theme-for-mastodon-dev/settings';
+ @import 'gplus-theme-for-mastodon-dev/icons';
+ @import 'gplus-theme-for-mastodon-dev/profile';
+ @import 'gplus-theme-for-mastodon-dev/about';
+ @import 'gplus-theme-for-mastodon-dev/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
new file mode 100644
index 000000000..e5aea0e4e
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
@@ -0,0 +1,15 @@
+@charset "UTF-8";
+
+
+
+@function adjust-lightness ($color, $lightness) {
+	@if (lightness($color) - $lightness <= 0 and lightness($color) + $lightness < 100) {
+		@return lighten($color, $lightness);
+	}
+
+	@if (0 < lightness($color) - $lightness and 100 <= lightness($color) + $lightness) {
+		@return darken($color, $lightness);
+	}
+
+	@return change-color($color, $lightness: $lightness);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
new file mode 100644
index 000000000..400a1ac90
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
@@ -0,0 +1,13 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
+@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
+@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
+@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
+@mixin material-border { border-radius: 4px }
+@mixin material-card-radius { border-radius: 2px }
+@mixin material-icon-large { font-size: 20px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
new file mode 100644
index 000000000..77a68f3b8
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
@@ -0,0 +1,98 @@
+@charset "UTF-8";
+
+
+
+// Base colors
+$active-color: #db4437;
+$accent-color: #fbbc04;
+$valid-color: #4285f4;
+$error-color: #d50000;
+$checked-color: #4285f4;
+$verified-color: #4caf50;
+
+
+// Text colors
+$primary-text-color: rgba(0, 0, 0, 0.87);
+$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
+$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
+$secondary-text-color: #2962ff; // ex: リンク
+$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
+$light-text-color: #ffffff;
+$light-darker1-text-color: darken($light-text-color, 15%);
+$active-text-color: $active-color;
+$error-text-color: $error-color;
+
+
+// Icon colors
+$icon-color: #757575;
+$icon-active-color: $active-color;
+
+
+// Background colors
+$base-color: #f1f1f1;
+$base-lighter1-color: #ffffff;
+$base-darker1-color: rgba(0, 0, 0, 0.4);
+
+$column-header-color: $base-lighter1-color;
+$column-header-hover-color: darken($column-header-color, 10%);
+
+$status-color: $base-lighter1-color;
+$status-direct-color: darken($status-color, 5%);
+$status-actionbar-color: darken($status-color, 2%);
+
+$account-color: $base-lighter1-color;
+$account-foreground-color: $base-darker1-color;
+
+$card-color: $base-lighter1-color;
+$card-hover-color: $column-header-hover-color;
+$card-image-color: $base-color;
+
+$form-color: rgba(0, 0, 0, 0.1);
+$form-focused-color: lighten($form-color, 20%);
+$trend-color: $base-lighter1-color;
+
+$setting-base-color: $base-color;
+$setting-lists-selected-color: darken($base-color, 2%);
+$setting-lists-hover-color: darken($base-color, 5%);
+$setting-content-base-color: $base-lighter1-color;
+
+$setting-toggle-color: #b9b9b9;
+$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
+$setting-toggle-thumb-color: #fafafa;
+$setting-toggle-thumb-checked-color: $checked-color;
+
+$setting-emphasis-color: $verified-color;
+
+$dashboard-counters-base-color: $base-color;
+$dashboard-counters-hover-color: lighten($base-color, 2%);
+
+$log-entry-color: $base-lighter1-color;
+$log-entry-extra-color: $base-color;
+$log-entry-extra--neutral-color: $valid-color;
+$log-entry-extra--old-color: $active-color;
+$log-entry-extra--new-color: $verified-color;
+
+$explore-header-color: lighten($accent-color, 16%);
+$explore-directory-color: $base-lighter1-color;
+
+$active-button-color: $valid-color; //文字入りボタン
+$non-active-button-color: lighten($base-color, 20%);
+
+$floating-acton-button-hover-color: lighten($active-color, 10%);
+
+
+// Shadow colors
+$column-header-shadow-color: rgba(0, 0, 0, 0.3);
+$status-shadow-color: rgba(0, 0, 0, 0.14);
+$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
+$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
+$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
+$button-shadow-color: rgba(0, 0, 0, 0.4);
+
+
+// Separation colors
+$base-separation-color: rgba(0, 0, 0, 0.14);
+
+
+//Border colors
+$non-elevated-card-boader : #e0e0e0;
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
new file mode 100644
index 000000000..de48883a8
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
@@ -0,0 +1,138 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+// from mastodon/about.scss
+$column-breakpoint: 700px;
+
+
+
+.landing-page {
+	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
+	p { color: $primary-lighter1-text-color }
+	em { color: $primary-text-color }
+
+	.column-0 { background: $base-darker1-color }
+	.column-2 {
+		.landing-page {
+			&__information { padding: 0 }
+
+			&__short-description {
+				& > .row:first-child {
+					background: $base-darker1-color;
+					padding: 10px 20px;
+				}
+
+				& > * {
+					padding-left: 40px; padding-right: 40px;
+					&:last-child { padding-bottom: 45px }
+
+					@media screen and (max-width: $column-breakpoint) {
+						padding-left: 20px; padding-right: 20px;
+						&:last-child { padding-bottom: 25px }
+					}
+				}
+			}
+		}
+	}
+
+	&__forms,
+	&__information,
+	&__call-to-action {
+		@include status-shadow;
+		background: $column-header-color;
+	}
+
+	&__forms {
+		padding: 0;
+
+		& > *:first-child { margin: inherit }
+		& > * { margin-left: 20px; margin-right: 20px; }
+
+		.brand { background: $base-darker1-color }
+
+		form {
+			& > .input input {
+				background: $form-color;
+
+				&:focus { background: $form-focused-color }
+			}
+		}
+
+		.separator-or {
+			margin-left: 20px; margin-right: 20px;
+			
+			span {
+				color: $primary-lighter1-text-color;
+				background: $column-header-color;
+			}
+		}
+
+		@media screen and (max-width: $column-breakpoint) {
+			background: inherit;
+			box-shadow: none;
+
+			.separator-or span { background: $base-color }
+		}
+	}
+
+	&__information {
+		color: $primary-lighter1-text-color;
+
+		&.contact-widget {
+			@include status-shadow;
+			background: $column-header-color;
+
+			.contact-widget {
+				&__mail {
+					a { color: $primary-text-color }
+				}
+			}
+		}
+
+		strong { color: inherit }
+
+		.row:first-child {
+			h1 small {
+				color: $light-darker1-text-color;
+
+				span { color: $light-text-color }
+			}
+		}
+	}
+
+	&__call-to-action {
+		.row__information-board {
+			.information-board__section {
+				color: $primary-lighter2-text-color;
+
+				& > span:last-child { color: $primary-lighter1-text-color }
+			}
+		}
+	}
+
+	&__features {
+		.features-list {
+			.features-list__row {
+				.text { color: $primary-lighter1-text-color }
+				.visual .fa { color: $icon-color }
+			}
+		}
+	}
+
+	&__footer { color: $primary-lighter1-text-color }
+
+	#mastodon-timeline {
+		color: $primary-text-color;
+		background: transparent;
+
+		p {
+			color: $primary-text-color;
+
+			a { color: $secondary-text-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
new file mode 100644
index 000000000..984a8c9ae
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
@@ -0,0 +1,191 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.account {
+	background: $account-color;
+	border-color: $base-separation-color;
+
+	.account {
+		&__display-name {
+			color: $secondary-text-color;
+			strong { color: $primary-text-color }
+		}
+	}
+
+	&-role {
+		color: $primary-lighter2-text-color;
+		background-color: rgba($base-separation-color, 0.1);
+		border-color: rgba($base-separation-color, 0.5);
+	}
+}
+
+.column {
+	> .column-back-button {
+		@include column-shadow;
+		background: $column-header-color;
+	}
+}
+
+.account-timeline__header {
+	.account__header {
+		background-color: $account-foreground-color;
+
+		> div { background-color: inherit } // -> v2.7.4
+
+		.account__header {
+			&__username { color: $secondary-lighter1-text-color }
+			&__fields { @extend .account__header__fields; }
+
+			&__image { // v2.8.0 ->
+				&::after {
+					content: "";
+
+					position: absolute;
+					top: auto;
+					left: 0;
+					bottom: 0;
+	
+					width: 100%;
+					height: 30%;
+					background: $account-header-image-shadow-color;
+					box-shadow: none;
+				}
+
+				> img:not([src]),
+				> img[src$="/headers/original/missing.png"] {
+					content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+				}
+			}
+
+			&__bar { // v2.8.0 ->
+				background-color: $base-lighter1-color;
+
+				.account__header {
+					&__tabs {
+						.avatar {
+							.account__avatar {
+								border-color: $base-lighter1-color;
+								border-radius: 50%;
+							}
+						}
+
+						&__buttons {
+							.icon-button { border: 0 }
+						}
+
+						&__name {
+							h1 { color: $primary-text-color }
+							small { color: $secondary-text-color }
+						}
+					}
+
+					&__bio {
+						.account__header {
+							&__content { color: $primary-text-color }
+							&__fields { border-color: $base-separation-color }
+						}
+					}
+
+					&__extra {
+						&__links {
+							&, a { color: $primary-lighter1-text-color }
+							strong { color: $primary-lighter2-text-color }
+						}
+					}
+				}
+			}
+		}
+
+		.account--action-button {
+			.icon-button:not(.active) {
+				color: darken($light-text-color, 7%);
+
+				&:active,
+				&:focus,
+				&:hover {
+					color: $light-text-color;
+				}
+			}
+		}
+	}
+
+	.account {
+		&__disclaimer,
+		&__action-bar,
+		&__section-headline {
+			background: $base-lighter1-color;
+			border-color: $base-separation-color;
+		}
+
+		&__action-bar {
+			&__tab {
+				border-color: $base-separation-color;
+				&.active { border-bottom-color: $active-color }
+	
+				> span { color: $primary-lighter1-text-color }
+			}
+		}
+	
+		&__section-headline {
+			a {
+				color: $primary-text-color;
+	
+				&.active {
+					color: $active-color;
+	
+					&::before { border-color: transparent transparent $base-separation-color }
+					&::after { border-color: transparent transparent $status-color }
+				}
+			}
+		}
+	}
+}
+
+.account-authorize__wrapper {
+	@include status-shadow;
+	background: $base-lighter1-color;
+
+	&:focus { @include status-focus-shadow; }
+
+	.account {
+		&__header__content {
+			color: $primary-lighter2-text-color;
+		}
+	
+		&--panel {
+			background: $account-color;
+			border-color: $base-separation-color;
+		}
+	}
+}
+
+.account__header__fields {
+	dl {
+		border-color: $base-separation-color;
+		
+		dt,
+		dd {
+			color: $primary-text-color;
+			background: $base-lighter1-color;
+		}
+
+		dd {
+			&.verified {
+				border-color: transparentize($valid-color, 0.5);
+				background: transparentize($valid-color, 0.75);
+
+				a { color: lighten($verified-color, 20%) }
+			}
+		}
+	}
+
+	a { color: $secondary-text-color }
+}
+
+.account__action-bar__tab {
+	strong { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
new file mode 100644
index 000000000..a141ecd13
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
@@ -0,0 +1,47 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+body {
+	&,
+	.ui {
+		color: $primary-text-color;
+		background: $base-color;
+	}
+}
+
+.focusable {
+	&:focus {
+		background: inherit;
+
+		.status {
+			@include status-focus-shadow;
+
+			&.status-direct { background: $status-direct-color }
+		}
+
+		.detailed-status {
+			& { background: $status-color }
+			&__action-bar { background: $status-actionbar-color }
+		}
+	}
+}
+
+::-webkit-scrollbar-thumb {
+	background: darken($base-lighter1-color, 12%);
+
+	&:hover { background: darken($base-lighter1-color, 16%) }
+	&:active { background: darken($base-lighter1-color, 12%) }
+}
+
+::-webkit-scrollbar-track {
+	background: $base-color;
+
+	&:hover,
+	&:active {
+		background: darken($base-lighter1-color, 8%);
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
new file mode 100644
index 000000000..6a0239562
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
@@ -0,0 +1,263 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.tabs-bar {
+	@include column-shadow;
+	margin: 0;
+	background: $column-header-color;
+
+	.tabs-bar {
+		&__link {
+			color: $icon-color;
+			border-bottom: 4px solid $column-header-color;
+			padding: 15px 10px 11px 10px;
+			
+			&.active {
+				border-bottom: 4px solid $active-color;
+			}
+
+			.fa {
+				@include material-icon-large;
+				vertical-align: top;
+			}
+		}
+	}
+}
+
+.drawer {
+	.drawer {
+		&__header {
+			@include column-shadow;
+			background: $column-header-color;
+	
+			.drawer__tab {
+				@include material-icon-large;
+				color: $icon-color;
+			}
+	
+			a {
+				&:hover { background: $column-header-hover-color }
+			}
+		}
+	
+		&__pager {
+			@include status-shadow;
+			@include material-card-radius;
+			
+			.drawer__inner {
+				background: $column-header-color;
+		
+				&__mastodon { display: none }
+			}
+		}
+	}
+}
+
+.navigation-bar {
+	color: $secondary-text-color;
+	background: $column-header-color;
+
+	.navigation-bar {
+		&__profile {
+			strong { color: $primary-text-color }
+			&-edit { color: $secondary-text-color }
+		}
+	}
+}
+
+
+.compose-form {
+	.compose-form {
+		&__buttons-wrapper {
+			background: $column-header-color;
+
+			&.character-counter__wrapper {
+				.character-counter { color: $primary-lighter1-text-color }
+			}
+		}
+
+		&__publish { border-top: 1px solid $base-separation-color }
+		&__publish-button-wrapper { @include button-shadow }
+		&__modifiers { background-color: $base-lighter1-color }
+	}
+
+	.autosuggest-textarea__textarea {
+		background-color: $base-lighter1-color;
+		color: $primary-text-color;
+	}
+
+	.character-counter {
+		color: $icon-color
+	}
+}
+
+.column {
+	.column-header {
+		@include column-shadow;
+		background: $column-header-color;
+
+		&.active {
+			.column-header__icon {
+				color: $icon-active-color;
+				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
+			}
+		}
+
+		* { background: inherit }
+
+		&__icon {
+			@include material-icon-large;
+			color: $icon-color;
+			vertical-align: bottom;
+			margin-right: 10px;
+		}
+
+		&__buttons {
+			height: 50px;
+
+			.column-header {
+				&__back-button {
+					.column-back-button__icon { vertical-align: unset }
+				}
+	
+				&__button {
+					&.active {
+						color: $icon-active-color;
+						background: inherit;
+					}
+		
+					.fa { vertical-align: unset }
+				}
+			}
+		}
+
+		&__button {
+			color: $icon-color;
+			padding: 0 16px;
+		}
+
+		&__collapsible {
+			color: $secondary-text-color;
+			border-bottom: 1px solid $base-separation-color;
+	
+			&-inner { background: $column-header-color }
+		}
+	}
+
+	.column-back-button {
+		&__icon {
+			@include material-icon-large;
+			vertical-align: bottom;
+			margin-right: 8px;
+		}
+	}
+
+	.column {
+		&-subheading,
+		&-link__badge { background: darken($base-color, 10%) }
+	
+		&-link {
+			color: $primary-text-color;
+			background: $base-color;
+	
+			&__icon {
+				@include material-icon-large;
+				color: $icon-color;
+				vertical-align: bottom;
+				margin-right: 8px;
+			}
+		}
+	}
+
+	.scrollable {
+		background: transparent;
+
+		*[role="feed"] {
+			article {
+				margin: 1em 0;
+				&:first-of-type { margin: 0 }
+
+				&:focus { outline: none }
+			}
+		}
+
+		div[tabindex="-1"] { margin-bottom: 1em }
+	}
+
+	.notification__filter-bar {
+		background: $column-header-color;
+		border-bottom-color: $base-separation-color;
+
+		button {
+			color: $icon-color;
+			background: $column-header-color;
+
+			&.active {
+				color: $icon-active-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $column-header-color }
+			}
+		}
+	}
+
+	.empty-column-indicator {
+		flex-direction: column;
+		background: $base-color;
+
+		&::before {
+			content: "";
+			display: block;
+
+			width: 100px;
+			height: 100px;
+			margin-bottom: 1em;
+
+			background: none center / contain no-repeat;
+			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
+		}
+	}
+}
+
+.getting-started {
+	&__wrapper,
+	& {
+		background: $base-color;
+	}
+
+	& {
+		border-top: 1px solid $base-separation-color;
+
+		a { color: $primary-text-color }
+	}
+}
+
+.load {
+	&-more,
+	&-gap {
+		background: transparent;
+
+		&:hover { background: darken($column-header-color, 10%) }
+	}
+
+	&-gap { border: 0 }
+}
+
+.confirmation-modal {
+	@include material-card-radius;
+	color: $primary-text-color;
+	background-color: $base-lighter1-color;
+
+	&__action-bar {
+		background-color: $base-lighter1-color;
+	}
+
+	&__cancel-button {
+		color: $primary-lighter1-text-color;
+		box-shadow: 0 2px 5px 0 transparent;
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
new file mode 100644
index 000000000..42d4f8db8
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
@@ -0,0 +1,39 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.floating-action-button {
+	font-size: 24px;
+	background-color: $active-color;
+	width: 3.6rem;
+	height: 3.6rem;
+
+	&:active {
+		background-color: $active-color;
+	}
+
+	&:hover {
+		background-color: $floating-acton-button-hover-color;
+	}
+}
+
+.button {
+	@include button-shadow;
+	@include material-card-radius;
+	background-color: $active-button-color;
+
+	.text-icon-button { color: $primary-lighter1-text-color }
+}
+
+.modal-root {
+	&__modal {
+		.media-modal {
+			&__close.icon-button {
+				font-size: 40px !important;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
new file mode 100644
index 000000000..dc72775a1
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.card {
+	//border: 1px solid $base-separation-color;
+	//不要(?)
+
+	> a {
+		@include status-shadow;
+
+		&:hover,
+		&:focus,
+		&:active {
+			.card__bar {
+				background: initial;
+
+				.display-name strong { color: $secondary-text-color }
+			}
+		}
+
+		.card__img { background: $card-image-color }
+		.card__bar {
+			background: $card-color;
+	
+			.avatar {
+				img { background: transparent }
+			}
+	
+			.display-name {
+				strong { color: $primary-text-color }
+				span { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
new file mode 100644
index 000000000..a9c6dc5ef
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+.dropdown-menu {
+	background-color: $column-header-color;
+}
+
+.dropdown-menu,
+.actions-modal {
+	@include material-card-radius;
+
+	& > ul {
+		background: $base-lighter1-color;
+
+		.dropdown-menu {
+			&__arrow {
+				&.top { border-top-color: $column-header-color }
+				&.bottom { border-bottom-color: $column-header-color }
+			}
+
+			&__item {
+				a {
+					color: $primary-lighter2-text-color;
+
+					padding: 16px 16px;
+					background: $column-header-color;
+
+					&:active,
+					&:focus,
+					&:hover {
+						color: $primary-text-color;
+						background: $column-header-hover-color;
+					}
+				}
+			}
+
+			&__separator { border-bottom-color: $base-separation-color }
+		}
+
+		& > li:not(:empty) {
+			@extend .dropdown-menu__item;
+
+			a {
+				padding: 12px 16px;
+				color: $primary-text-color;
+
+				&:hover {
+					color: $primary-text-color;
+					background-color: $column-header-hover-color;
+				}
+			}
+		}
+	}
+
+	.status {
+		background-color: $base-lighter1-color;
+		padding-top: 16px;
+		padding-bottom: 16px;
+		padding-right: 16px;
+		padding-left: 74px;
+
+		&__avatar {
+			top: 16px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
new file mode 100644
index 000000000..9b64572f9
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.status-card {
+	color: $primary-lighter1-text-color;
+	&__title, &__description { color: $primary-lighter2-text-color }
+
+	&__image { background: transparent }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
new file mode 100644
index 000000000..e735b108d
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
@@ -0,0 +1,6 @@
+@charset "UTF-8";
+
+@import 'components-button';
+@import 'components-card';
+@import 'components-dropdown';
+@import 'components-status-card';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
new file mode 100644
index 000000000..0937158bf
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
@@ -0,0 +1,68 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.emoji-mart {
+    &-bar {
+        border: 0 solid $base-separation-color;
+
+        &:first-child {
+            border-top-left-radius: 2px;
+            border-top-right-radius: 2px;
+            background-color: $base-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-color;
+    }
+    &-anchor {
+        &-selected {
+            color: $icon-active-color;
+
+            &:hover {
+                color: $icon-active-color;
+            }
+        }
+
+        &-bar {
+            background-color: $icon-active-color;
+        }
+    }
+
+    &-search {
+        background-color: $base-lighter1-color;
+    }
+    &-search input {
+        color: $primary-text-color;
+        background-color: $form-color;
+        border: 0px solid #ffffff00;
+    }
+
+    &-category-label span {
+        color: $primary-text-color;
+        background-color: $base-lighter1-color;
+    }
+
+    &-scroll {
+        background-color: $base-lighter1-color;
+    }
+}
+
+.emoji-picker-dropdown {
+    &__modifiers {
+        &__menu {
+            @include status-shadow;
+            @include material-card-radius;
+            background-color: $base-lighter1-color;
+        }
+    }
+
+    &__menu {
+        @include column-shadow;
+        background-color: $base-lighter1-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
new file mode 100644
index 000000000..ae80b3884
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
@@ -0,0 +1,47 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.public-layout {
+	.page-header {
+		background: $explore-header-color;
+
+		h1 { color: $primary-text-color }
+		p { color: $primary-lighter2-text-color }
+	}
+
+	.directory,
+	.notice-widget { @include column-shadow; }
+
+	.directory {
+		background: $explore-directory-color;
+
+		.accounts-table {
+			&__count {
+				color: $primary-lighter2-text-color;
+				small { color: $primary-lighter1-text-color }
+			}
+		}
+
+		&__tag {
+			& > a {
+				@include status-shadow;
+				background: $explore-directory-color;
+			}
+
+			h4 { color: $primary-lighter2-text-color }
+			.fa, small { color: $primary-lighter1-text-color }
+			.trends__item__current { color: $primary-text-color }
+		}
+	}
+
+	.notice-widget {
+		color: $primary-lighter1-text-color;
+		background: $explore-directory-color;
+
+		a { color: $secondary-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
new file mode 100644
index 000000000..825d18dac
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
@@ -0,0 +1,179 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@function hex-color($color) {
+	@if type-of($color) == 'color' {
+		$color: str-slice(ie-hex-str($color), 4);
+	}
+
+	@return '%23' + unquote($color)
+};
+
+
+
+@font-face {
+	font-family: "Material Icons Extended";
+	src:
+		local("Material Icons Extended"),
+		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
+		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
+}
+
+.icon-button {
+	color: $icon-color;
+
+	&:active,
+	&:focus,
+	&:hover {
+		color: lighten($icon-color, 7%);
+	}
+
+	&.star-icon {
+		&.active {
+			color: $light-text-color;
+			background: $icon-active-color;
+			border-radius: 50%;
+		}
+
+		.fa.fa-star { vertical-align: top }
+	}
+
+	&.inverted {
+		color: $icon-color;
+	}
+
+	&.disabled {
+		color: lighten($icon-color, 13%);
+
+		.fa.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+		}
+	}
+
+	.fa {
+		@include material-icon-large;
+		vertical-align: middle;
+
+		&.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			
+			&:active,
+			&:hover,
+			&:focus {
+				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			}
+		}
+	}
+}
+
+.fa {
+	&.fa-users,
+	&.fa-globe,
+	&.fa-cog,
+	&.fa-cogs,
+	&.fa-gears,
+	&.fa-sign-out,
+	&.fa-star,
+	&.fa-reply,
+	&.fa-reply-all,
+	&.fa-mail-reply,
+	&.fa-mail-reply-all,
+	&.fa-envelope,
+	&.fa-bookmark,
+	&.fa-home,
+	&.fa-bell,
+	&.fa-eraser,
+	&.fa-ellipsis-h,
+	&.fa-ellipsis-v,
+	&.fa-address-book,
+	&.fa-thumb-tack,
+	&.fa-lock,
+	&.fa-pencil,
+	&.fa-chevron-left,
+	&.fa-chevron-right,
+	&.fa-camera,
+	&.fa-tasks,
+	&.fa-sliders,
+	&.fa-fire,
+	&.fa-list-ul,
+	&.fa-search,
+	&.fa-close,
+	&.fa-remove,
+	&.fa-times,
+	&.fa-user,
+	&.fa-mobile-phone,
+	&.fa-mobile,
+	&.fa-filter,
+	&.fa-user-plus,
+	&.fa-cloud-upload,
+	&.fa-cloud-download,
+	&.fa-eye,
+	&.fa-eye-slash,
+	&.fa-share-alt,
+	&.fa-chevron-down,
+	&.fa-bars,
+	&.fa-navicon,
+	&.fa-reorder {
+		font-family: "Material Icons Extended";
+	}
+
+	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
+	&.fa-globe::before { content: "public" } // 地球マーク(.drawer__header > .drawer__tab:3)
+	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
+	&.fa-cogs::before { content: "settings" } //歯車マーク(モバイル)
+	&.fa-gears::before { content: "settings" } //歯車マーク(モバイル)
+	&.fa-sign-out::before { content: "exit_to_app" } //サインアウト
+	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
+	&.fa-reply::before { content: "reply" } //返信ボタン
+	&.fa-reply-all::before { content: "reply_all" } //全員に返信ボタン
+	&.fa-mail-reply::before { content: "reply" } //返信ボタン
+	&.fa-mail-reply-all::before { content: "reply_all" } //全員に返信ボタン
+	&.fa-envelope::before { content: "mail" } //ダイレクトメッセージボタン
+	&.fa-bookmark::before { content: "bookmark" } //ブックマークボタン
+	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
+	&.fa-bell::before { content: "notifications" } // ベルマーク(通知)
+	&.fa-eraser::before { content: "clear_all" } // 通知を消去のマーク
+	&.fa-ellipsis-h::before { content: "more_horiz" } // 三点リーダー(横)
+	&.fa-ellipsis-v::before { content: "more_vert" } // 三点リーダー(縦)
+	&.fa-address-book::before { content: "explore" } // discoverマーク(explore遷移タブ)
+	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
+	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
+	&.fa-pencil::before { content: "create" } // 鉛筆マーク(モバイル用フローティングボタン)
+	&.fa-chevron-left::before { content: "arrow_back" } //戻るボタン
+	&.fa-chevron-right::before { content: "arrow_forward" } //進むボタン
+	&.fa-camera::before { content: "camera_alt" } //メディアを追加ボタン
+	&.fa-tasks::before { content: "poll" } //投票を追加ボタン
+	&.fa-sliders::before { content: "tune" } //設定を表示ボタン
+	&.fa-fire::before { content: "whatshot" } //トレンドマーク
+	&.fa-list-ul::before { content: "list" } //リストマーク
+	&.fa-search::before { content: "search" } //検索アイコン(モバイル、トップバー内)
+	&.fa-close::before { content: "close" } //閉じるボタン
+	&.fa-remove::before { content: "close" } //閉じるボタン
+	&.fa-times::before { content: "close" } //閉じるボタン(メディア)
+	&.fa-user::before { content: "account_circle" } //ユーザーアイコン
+	&.fa-mobile-phone::before { content: "smartphone" } //モバイルアイコン
+	&.fa-mobile::before { content: "smartphone" } //モバイルアイコン
+	&.fa-filter::before { content: "filter_list" } //フィルターアイコン
+	&.fa-user-plus::before { content: "person_add" } //ユーザーの追加アイコン
+	&.fa-cloud-upload::before { content: "cloud_upload" } //インポートアイコン
+	&.fa-cloud-download::before { content: "cloud_download" } //エクスポートアイコン
+	&.fa-eye::before { content: "visibility" } //目のアイコン
+	&.fa-eye-slash::before { content : "visibility_off" } //閉じた目のアイコン
+	&.fa-share-alt::before { content: "share" } //モバイル共有ボタン
+	&.fa-chevron-down::before { content: "keyboard_arrow_down" } //メニューボタン
+	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
+	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
+	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
+}
+
+.fa {
+	&.fa-chevron-left,
+	&.fa-chevron-right,
+	&.fa.fa-times {
+		@include material-icon-large;
+		vertical-align: bottom;
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
new file mode 100644
index 000000000..6c664b32f
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.keyboard-shortcuts {
+	kbd {
+		@include status-shadow;
+
+		color: $primary-text-color;
+		background-color: $base-lighter1-color;
+		border-color: $base-darker1-color;
+
+		margin: 0 0.25em;
+
+		&:first-child { margin-left: 0 }
+		&:last-child { margin-right: 0 }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
new file mode 100644
index 000000000..05c29a6df
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
@@ -0,0 +1,55 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.column {
+	.column-back-button { background: inherit }
+
+	.column-inline-form {
+		background: $column-header-color;
+
+		label input {
+			color: $secondary-text-color;
+			&:focus { color: $primary-text-color }
+		}
+	}
+
+	.column-inline-form ~ .scrollable {
+		article { margin: 0 }
+	}
+}
+
+.modal-root {
+	.column-inline-form {
+		background: $column-header-color;
+		
+		.setting-text {
+			color: $primary-text-color;
+			&:active, &:focus { color: $primary-lighter2-text-color }
+		}
+	}
+
+	.list-editor {
+		background: $base-color;
+		h4 { background: $column-header-color }
+
+		.drawer__pager {
+			.drawer__inner { background: $column-header-color }
+		}
+	}
+
+	.list-adder {
+		background: $base-color;
+
+		.column-inline-form { border-bottom: 1px solid $base-separation-color }
+
+		&__account,
+		&__lists { background: $column-header-color }
+
+		&__lists {
+			.list { border-color: $base-separation-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
new file mode 100644
index 000000000..bab098372
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
@@ -0,0 +1,27 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.notification {
+	&.notification-favourite {
+		.status {
+			&.status-direct { background: transparent }
+		}
+	}
+
+	> .notification__message {
+		color: $primary-lighter2-text-color;
+		font-size: 13px;
+		padding: 8px 0;
+
+		.notification__display-name {
+			&:hover { color: inherit }
+		}
+
+		.notification__favourite-icon-wrapper {
+			.star-icon { color: $icon-active-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
new file mode 100644
index 000000000..246d24b7d
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
@@ -0,0 +1,232 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.public-layout {
+	a.button {
+		@include button-shadow;
+
+		color: $primary-text-color;
+		background: $base-lighter1-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			background: darken($base-lighter1-color, 8%);
+		}
+	}
+
+	.logo-button {
+		svg path {
+			/* Only for Itabashi-don */
+			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+			&#Mastodon { fill: $base-lighter1-color !important }
+		}
+	}
+
+	.public-account-header {
+		@include status-shadow;
+
+		&__image {
+			background: $base-lighter1-color;
+
+			@media screen and (min-width: 600px) { height: 500px }
+
+			&::after {
+				content: "";
+				
+				position: absolute;
+				top: auto;
+				left: 0;
+				bottom: 0;
+
+				width: 100%;
+				height: 30%;
+				background: $account-header-image-shadow-color;
+				box-shadow: none;
+			}
+
+			> img:not([src]),
+			> img[src="/headers/original/missing.png"] {
+				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+			}
+		}
+
+		&__bar {
+			@media screen and (max-width: 600px) {
+				flex-direction: column;
+				background: $base-color;
+			}
+			
+			@media screen and (min-width: 600px) { margin-top: -140px }
+
+			&::before { background: $base-lighter1-color }
+
+			.avatar {
+				@media screen and (max-width: 600px) {
+					position: relative;
+					bottom: 30px;
+
+					display: initial;
+					width: 60px;
+					height: 60px;
+					margin: 0 auto;
+					padding: 0;
+				}
+
+				img {
+					border: 2px solid $base-lighter1-color;
+					border-radius: 50%;
+					background: transparent;
+				}
+			}
+		}
+
+		&__tabs {
+			@media screen and (max-width: 600px) {
+				flex-wrap: wrap;
+				margin-left: 0;
+
+				&__name {
+					width: 100%;
+					text-align: center;
+
+					h1 {
+						color: $primary-text-color;
+
+						small { color: $primary-lighter1-text-color }
+					}
+				}
+
+				&__tabs {
+					justify-content: center;
+					flex: auto;
+
+					.spacer { display: none }
+
+					a.button.logo-button {
+						color: $light-text-color;
+						background: $secondary-text-color;
+
+						svg path {
+							/* Only for Itabashi-don */
+							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
+							&#Mastodon { fill: $secondary-text-color !important }
+						}
+					}
+				}
+			}
+
+			.details-counters {
+				.counter {
+					color: $light-text-color;
+					border-right: 0;
+
+					&::after { border-bottom-color: $base-color }
+
+					&.active {
+						&::after { border-bottom-color: $active-color }
+					}
+				}
+			}
+		}
+
+		&__extra {
+			.public-account-bio {
+				.account__header__content { text-align: center }
+			}
+
+			&__links {
+				color: $primary-text-color;
+
+				a {
+					&, strong { color: $primary-text-color }
+				}
+			}
+		}
+	}
+
+	.public-account-bio,
+	.endorsements-widget,
+	.hero-widget { @include status-shadow; }
+
+	.public-account-bio {
+		background: $base-lighter1-color;
+		
+		.account__header__content { color: $primary-text-color }
+		&__extra { color: $primary-lighter1-text-color }
+	}
+
+	.endorsements-widget {
+		padding-bottom: 0;
+		border-radius: 4px;
+
+		h4 {
+			color: $primary-lighter1-text-color;
+			background: $base-lighter1-color;
+		}
+	}
+
+	.hero-widget {
+		&__img { background: $base-color }
+		&__text {
+			background: $base-lighter1-color;
+
+			&, em { color: $primary-lighter2-text-color }
+			a { color: $secondary-text-color }
+		}
+	}
+
+	.account__section-headline {
+		background: $base-lighter1-color;
+		border-bottom-color: $base-separation-color;
+
+		a {
+			color: $primary-lighter1-text-color;
+
+			&.active {
+				color: $primary-lighter2-text-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $status-color }
+			}
+		}
+	}
+
+	.activity-stream {
+		box-shadow: none;
+
+		.entry {
+			margin: 1em 0;
+			background: transparent;
+
+			&:first-of-type { margin: 0 }
+		}
+	}
+
+	.nothing-here {
+		@include status-shadow;
+
+		color: $primary-lighter1-text-color;
+		background: $base-lighter1-color;
+	}
+
+	.footer {
+		h4 { color: $primary-lighter1-text-color }
+
+		ul {
+			a { color: $primary-lighter2-text-color }
+		}
+
+		.brand {
+			svg path {
+				/* Only for Itabashi-don */
+				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+				&#Mastodon { fill: $base-lighter1-color !important }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
new file mode 100644
index 000000000..b4478b91b
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
@@ -0,0 +1,41 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.search {
+	.search {
+		&__input {
+			@include material-border;
+
+			color: $primary-text-color;
+			background: $form-color;
+	
+			&:focus { background: $form-focused-color }
+		}
+	
+		&__icon {
+			.fa { color: $icon-color }
+		}
+	}
+
+	&-results {
+		> .search-results {
+			&__header { background: $base-color }
+			&__section {
+				> h5 { background: darken($base-color, 10%) }
+			}
+		}
+	}
+}
+
+.trends__item {
+	background: $trend-color;
+
+	.trends__item {
+		&__name a { color: $secondary-text-color }
+		&__current { color: lighten($secondary-text-color, 10%) }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
new file mode 100644
index 000000000..02fb9eac4
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
@@ -0,0 +1,54 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.edit_account {
+	@media screen and (min-width: 415px) {
+		.card {
+			> a {
+				position: relative;
+
+				.card__img {
+					border-bottom: 1px solid $base-separation-color;
+
+					> img:not([src]),
+					> img[src="/headers/original/missing.png"] {
+						content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+					}
+				}
+				
+				.card__bar {
+					position: static;
+					padding-top: 30%;
+			
+					.avatar {
+						position: absolute;
+						left: 0;
+						bottom: 0;
+
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 100%;
+						height: 100%;
+
+						img {
+							width: 128px;
+							height: 128px;
+
+							border-radius: 50%;
+						}
+					}
+			
+					.display-name {
+						flex: auto;
+						margin-left: 0;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
new file mode 100644
index 000000000..b4303249b
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.dashboard {
+	&__counters {
+		& > div {
+			& > div, & > a { background: $dashboard-counters-base-color }
+			
+			& > a {
+				&:hover,
+				&:focus,
+				&:active {
+					background: $dashboard-counters-hover-color;
+				}
+			}
+		}
+
+		&__text,
+		&__num { color: $primary-text-color }
+		
+		&__label { color: $primary-lighter1-text-color }
+	}
+
+	&__widgets {
+		a:not(.name-tag) { color: $primary-lighter2-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
new file mode 100644
index 000000000..9f75646ac
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.admin-wrapper {
+	.content {
+		.directory__tag {
+			& > a,
+			& > div { background: $setting-base-color }
+
+			h4 {
+				& { color: $primary-lighter2-text-color }
+				.fa, small { color: $primary-lighter1-text-color }
+			}
+
+			.trends__item__current { color: $primary-text-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
new file mode 100644
index 000000000..672a77c06
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.log-entry {
+	.log-entry {
+		&__header {
+			color: $primary-lighter2-text-color;
+			background: $log-entry-color;
+
+			.username,
+			.target,
+			a { color: $secondary-text-color }
+		}
+
+		&__timestamp { color: $primary-lighter1-text-color }
+		&__icon { color: $icon-color }
+
+		&__extras {
+			color: $primary-text-color;
+			background: $log-entry-extra-color;
+
+			.diff-neutral { color: $log-entry-extra--neutral-color }
+			.diff-old { color: $log-entry-extra--old-color }
+			.diff-new { color: $log-entry-extra--new-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
new file mode 100644
index 000000000..2e198f338
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
@@ -0,0 +1,75 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.report-card {
+	background: $setting-content-base-color;
+
+	&__profile__stats {
+		color: $primary-lighter2-text-color;
+
+		a {
+			&:focus,
+			&:hover,
+			&:active {
+				color: lighten($primary-lighter2-text-color, 8%);
+			}
+		}
+	}
+
+	&__summary {
+		&__item {
+			border-top-color: $base-separation-color;
+
+			&:hover { background: $column-header-hover-color }
+
+			&__reported-by,
+			&__assigned {
+				color: $primary-lighter2-text-color;
+			}
+
+			&__content {
+				&__icon { color: $icon-color }
+				a { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
+
+.batch-table {
+	&__toolbar {
+		background: $base-lighter1-color;
+		border-color: $base-separation-color;
+	}
+
+	&__row {
+		&, &:nth-child(2n) { background: $base-lighter1-color }
+		&:hover, &:nth-child(2n):hover { background: $column-header-hover-color }
+
+		border-color: $base-separation-color;
+
+		&__content {
+			.status__content { color: $primary-text-color }
+			.detailed-status__meta { color: $primary-lighter1-text-color }
+
+
+			.accounts-table { // v2.8.0 ->
+				.accounts-table {
+					&__count {
+						& {color: $primary-text-color }
+						small { color: $primary-lighter1-text-color }
+					}
+				}
+
+				td .account { background: inherit }
+			}
+		}
+	}
+}
+
+.speech-bubble {
+	&__bubble { color: $primary-text-color }
+	a { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
new file mode 100644
index 000000000..308c7e6a0
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
@@ -0,0 +1,244 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+@import 'settings-account';
+@import 'settings-report';
+@import 'settings-log';
+@import 'settings-dashboard';
+@import 'settings-directory_tag';
+
+
+
+body.admin {
+	color: $primary-text-color;
+	background: $setting-base-color;
+	
+	.sidebar {
+		&-wrapper { background: inherit }
+
+		ul {
+			border-radius: 0;
+
+			a {
+				color: $primary-lighter2-text-color;
+				border-radius: 0;
+
+				&:hover {
+					color: $primary-text-color;
+					background: $setting-lists-hover-color;
+				}
+
+				&.selected {
+					color: $primary-text-color;
+					background: $setting-lists-selected-color;
+				}
+
+				i.fa {
+					@include material-icon-large;
+					margin-right: 8px;
+					vertical-align: bottom;
+				}
+			}
+
+			ul { background: darken($setting-base-color, 4%) }
+
+			.simple-navigation-active-leaf a {
+				color: $icon-active-color;
+				background: initial;
+
+				&:hover { background: $setting-lists-hover-color }
+			}
+		}
+	}
+
+	.content {
+		@include column-shadow;
+		background: $setting-content-base-color;
+
+		h2, h3, h4, h6 { color: $primary-text-color }
+
+		p {
+			color: $primary-text-color;
+			strong { color: $primary-text-color }
+		}
+
+		h2, h4, hr { border-bottom-color: $base-separation-color }
+		.muted-hint { color: $primary-lighter1-text-color }
+	}
+}
+
+.simple_form {
+	.input {
+		&.boolean,
+		&.with_label,
+		&.with_floating_label {
+			.label_input > label { color: $primary-text-color }
+		}
+
+		&.with_block_label {
+			& > label { color: $primary-text-color }
+		}
+
+		&.radio_buttons{
+			.radio label { color: $primary-text-color }
+		}
+
+		&-copy {
+			background: $base-color;
+			border-color: $base-separation-color;
+		}
+	}
+
+	.check_boxes {
+		.checkbox {
+			label { color: $primary-text-color }
+		}
+	}
+
+	input[type=text],
+	input[type=number],
+	input[type=email],
+	input[type=password],
+	textarea {
+		color: $primary-text-color;
+		background: $setting-content-base-color;
+		border-color: $base-separation-color;
+
+		&:hover {
+			border-color: $base-separation-color;
+		}
+
+		&:active,
+		&:focus {
+			background: darken($setting-content-base-color, 8%);
+		}
+	}
+
+	select {
+		color: $primary-text-color;
+		background-color: $setting-content-base-color;
+		border-color: $base-separation-color;
+	}
+
+	.input.field_with_errors {
+		label,
+		.error {
+			color: $error-text-color;
+		}
+	}
+
+	.hint, p.hint {
+		color: $primary-lighter1-text-color !important;
+
+		code {
+			color: $light-text-color;
+			background: $setting-emphasis-color;
+		}
+	}
+
+	.recommended {
+		color: $verified-color;
+		background-color: transparentize($verified-color, 0.75);
+		border-color: $verified-color;
+	}
+
+	.label_input {
+		&__append { color: $primary-lighter1-text-color }
+	}
+
+	button {
+		@include button-shadow;
+	}
+}
+
+.simple_form,
+.table-form {
+	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
+}
+
+.quick-nav {
+	a {
+		color: $secondary-text-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			color: lighten($secondary-text-color, 8%);
+		}
+	}
+}
+
+.pagination {
+	.page,
+	a {
+		color: $primary-text-color;
+	}
+
+	.page {
+		&.current {
+			background: $icon-active-color;
+			color: $light-text-color;
+		}
+	}
+}
+
+.filters {
+	.filter-subset {
+		strong { color: $primary-text-color }
+
+		a {
+			color: $primary-lighter2-text-color;
+
+			&:hover { color: $primary-text-color }
+
+			&.selected {
+				color: $active-text-color;
+				border-bottom-color: $active-text-color;
+			}
+		}
+	}
+}
+
+.new_form_two_factor_confirmation {
+	.qr-wrapper {
+		.qr-code { box-shadow: none }
+		.qr-alternative { color: $secondary-lighter1-text-color }
+	}
+}
+
+label,
+select#user_setting_default_privacy {
+	&[for=user_setting_default_privacy_public],
+	&[for=user_setting_default_privacy_unlisted],
+	option[value="public"],
+	option[value="unlisted"] { color: $active-text-color !important }
+}
+
+.column-header__collapsible__extra {
+	.column-settings__section { color: $primary-text-color }
+
+	.setting-toggle {
+		.react-toggle {
+			&.react-toggle--checked {
+				> .react-toggle-track { background: $setting-toggle-checked-color }
+
+				> .react-toggle-thumb {
+					border-color: $setting-toggle-checked-color;
+					background-color: $setting-toggle-thumb-checked-color;
+				}
+			}
+
+			> .react-toggle-track { background: $setting-toggle-color }
+
+			> .react-toggle-thumb {
+				border-color: $setting-toggle-color;
+				background-color: $setting-toggle-thumb-color;
+			}
+		}
+
+		.setting-toggle__label { color: $primary-text-color }
+	}
+
+	.setting-meta__label { color: $primary-lighter1-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
new file mode 100644
index 000000000..6746032b4
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
@@ -0,0 +1,121 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.status {
+	@include status-shadow;
+	@include material-card-radius;
+	border-bottom: 0;
+
+	transition: box-shadow 0.1s 0s ease-out;
+
+	&.light {
+		.status {
+			&__relative-time { color: $primary-lighter1-text-color }
+			&__display-name {
+				color: $primary-text-color;
+
+				.display-name__account { color: $primary-lighter1-text-color }
+			}
+
+			&__content { color: $primary-text-color }
+		}
+	}
+
+	&.status-direct {
+		background: $status-direct-color;
+
+		&:not(.read) {
+			background: inherit;
+			border-bottom-color: initial;
+		}
+	}
+
+	&.muted {
+		.status__content {
+			p { color: lighten($primary-text-color, 20%) }
+		}
+	}
+
+	.status {
+		&__info {
+			.status__display-name {
+				color: $primary-lighter1-text-color;
+	
+				strong { color: $primary-text-color }
+			}
+	
+			.status__relative-time { color: $primary-lighter1-text-color }
+		}
+	}
+
+	&__action-bar__counter__label { color: $primary-lighter1-text-color }
+}
+
+.detailed-status {
+	&__display-name {
+		color: $secondary-text-color;
+
+		strong { color: $primary-text-color }
+	}
+
+	&__meta {
+		.detailed-status__datetime { color: $primary-lighter1-text-color }
+
+		.detailed-status__link {
+			.fa.fa-star { vertical-align: middle }
+		}
+	}
+	
+	&__wrapper {
+		@include status-shadow;
+		
+		.detailed-status { @extend .detailed-status; }
+		.detailed-status__action-bar {
+			background: $status-actionbar-color;
+			border-color: $base-separation-color;
+		}
+	}
+}
+
+.status,
+.detailed-status {
+	background: $status-color;
+
+	.status__content {
+		color: $primary-text-color;
+
+		a { color: $secondary-text-color }
+
+		.status__content__spoiler-link {
+			color: $primary-text-color;
+			background: $base-color;
+		}
+	}
+}
+
+a.status-card,
+a.status-card.compact {
+	&:hover { background: initial }
+}
+
+.status-card,
+.status-card.compact {
+	border-color: $non-elevated-card-boader;
+
+	&__title {
+		color : $primary-text-color;
+	}
+
+	&__host {
+		color: $primary-lighter1-text-color;
+	}
+}
+
+.name-tag,
+a.name-tag {
+	color: $secondary-text-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
new file mode 100644
index 000000000..e71ce7a38
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.table {
+	thead th { border-bottom-color: $base-separation-color }
+	
+	th,
+	td {
+		color: $primary-text-color;
+		background-color: $base-color;
+		border-top: 0;
+	}
+
+	& > tbody > tr:nth-child(odd) {
+		& > td, & > th { background: darken($base-color, 4%) }
+	}
+
+	a { color: $secondary-text-color }
+}
+
+a.table-action-link,
+button.table-action-link {
+	color: $secondary-text-color;
+
+	&:hover { color: darken($secondary-text-color, 8%) }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon.scss b/app/javascript/styles/gplus-theme-for-mastodon.scss
new file mode 100644
index 000000000..e233cfbea
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon.scss
@@ -0,0 +1,22 @@
+/**
+ * Google+ Theme for Mastodon v1.1
+ * Copyright (C) 2018-2019 Genbu Project
+ */
+
+@charset "UTF-8";
+
+@import 'application';
+@import 'gplus-theme-for-mastodon/basics';
+@import 'gplus-theme-for-mastodon/components';
+@import 'gplus-theme-for-mastodon/tables';
+@import 'gplus-theme-for-mastodon/columns';
+@import 'gplus-theme-for-mastodon/lists';
+@import 'gplus-theme-for-mastodon/accounts';
+@import 'gplus-theme-for-mastodon/statuses';
+@import 'gplus-theme-for-mastodon/notifications';
+@import 'gplus-theme-for-mastodon/searches';
+@import 'gplus-theme-for-mastodon/settings';
+@import 'gplus-theme-for-mastodon/icons';
+@import 'gplus-theme-for-mastodon/profile';
+@import 'gplus-theme-for-mastodon/about';
+@import 'gplus-theme-for-mastodon/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss b/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
new file mode 100644
index 000000000..196473f89
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
+@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
+@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
+@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
+@mixin material-border { border-radius: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss b/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
new file mode 100644
index 000000000..2160a8fc9
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
@@ -0,0 +1,81 @@
+@charset "UTF-8";
+
+
+
+// Base colors
+$active-color: #db4437;
+$accent-color: #fbbc04;
+$valid-color: #4285f4;
+$error-color: #d50000;
+$checked-color: #4285f4;
+$verified-color: #4caf50;
+
+
+// Text colors
+$primary-text-color: rgba(0, 0, 0, 0.87);
+$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
+$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
+$secondary-text-color: #2962ff;
+$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
+$light-text-color: #ffffff;
+$light-darker1-text-color: darken($light-text-color, 15%);
+$active-text-color: $active-color;
+$error-text-color: $error-color;
+
+
+// Icon colors
+$icon-color: #757575;
+$icon-active-color: $active-color;
+
+
+// Background colors
+$base-color: #f1f1f1;
+$base-lighter1-color: #ffffff;
+$base-darker1-color: rgba(0, 0, 0, 0.4);
+
+$column-header-color: $base-lighter1-color;
+$column-header-hover-color: change-color($color: $column-header-color, $lightness: 90%);
+
+$status-color: $base-lighter1-color;
+$status-direct-color: darken($status-color, 5%);
+$status-actionbar-color: change-color($color: $status-color, $lightness: 98%);
+
+$account-color: $base-lighter1-color;
+$account-foreground-color: $base-darker1-color;
+
+$card-color: $base-lighter1-color;
+$card-hover-color: $column-header-hover-color;
+$card-image-color: $base-color;
+
+$form-color: rgba(0, 0, 0, 0.1);
+$form-focused-color: lighten($form-color, 20%);
+$trend-color: $base-lighter1-color;
+
+$setting-base-color: $base-color;
+$setting-lists-selected-color: darken($base-color, 2%);
+$setting-lists-hover-color: darken($base-color, 5%);
+$setting-content-base-color: $base-lighter1-color;
+
+$setting-toggle-color: #b9b9b9;
+$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
+$setting-toggle-thumb-color: #fafafa;
+$setting-toggle-thumb-checked-color: $checked-color;
+
+$dashboard-counters-base-color: $base-color;
+$dashboard-counters-hover-color: lighten($base-color, 2%);
+
+$explore-header-color: lighten($accent-color, 16%);
+$explore-directory-color: $base-lighter1-color;
+
+
+// Shadow colors
+$column-header-shadow-color: rgba(0, 0, 0, 0.3);
+$status-shadow-color: rgba(0, 0, 0, 0.14);
+$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
+$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
+$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
+$button-shadow-color: rgba(0, 0, 0, 0.4);
+
+
+// Separation colors
+$base-separation-color: rgba(0, 0, 0, 0.14);
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/about.scss b/app/javascript/styles/gplus-theme-for-mastodon/about.scss
new file mode 100644
index 000000000..de48883a8
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/about.scss
@@ -0,0 +1,138 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+// from mastodon/about.scss
+$column-breakpoint: 700px;
+
+
+
+.landing-page {
+	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
+	p { color: $primary-lighter1-text-color }
+	em { color: $primary-text-color }
+
+	.column-0 { background: $base-darker1-color }
+	.column-2 {
+		.landing-page {
+			&__information { padding: 0 }
+
+			&__short-description {
+				& > .row:first-child {
+					background: $base-darker1-color;
+					padding: 10px 20px;
+				}
+
+				& > * {
+					padding-left: 40px; padding-right: 40px;
+					&:last-child { padding-bottom: 45px }
+
+					@media screen and (max-width: $column-breakpoint) {
+						padding-left: 20px; padding-right: 20px;
+						&:last-child { padding-bottom: 25px }
+					}
+				}
+			}
+		}
+	}
+
+	&__forms,
+	&__information,
+	&__call-to-action {
+		@include status-shadow;
+		background: $column-header-color;
+	}
+
+	&__forms {
+		padding: 0;
+
+		& > *:first-child { margin: inherit }
+		& > * { margin-left: 20px; margin-right: 20px; }
+
+		.brand { background: $base-darker1-color }
+
+		form {
+			& > .input input {
+				background: $form-color;
+
+				&:focus { background: $form-focused-color }
+			}
+		}
+
+		.separator-or {
+			margin-left: 20px; margin-right: 20px;
+			
+			span {
+				color: $primary-lighter1-text-color;
+				background: $column-header-color;
+			}
+		}
+
+		@media screen and (max-width: $column-breakpoint) {
+			background: inherit;
+			box-shadow: none;
+
+			.separator-or span { background: $base-color }
+		}
+	}
+
+	&__information {
+		color: $primary-lighter1-text-color;
+
+		&.contact-widget {
+			@include status-shadow;
+			background: $column-header-color;
+
+			.contact-widget {
+				&__mail {
+					a { color: $primary-text-color }
+				}
+			}
+		}
+
+		strong { color: inherit }
+
+		.row:first-child {
+			h1 small {
+				color: $light-darker1-text-color;
+
+				span { color: $light-text-color }
+			}
+		}
+	}
+
+	&__call-to-action {
+		.row__information-board {
+			.information-board__section {
+				color: $primary-lighter2-text-color;
+
+				& > span:last-child { color: $primary-lighter1-text-color }
+			}
+		}
+	}
+
+	&__features {
+		.features-list {
+			.features-list__row {
+				.text { color: $primary-lighter1-text-color }
+				.visual .fa { color: $icon-color }
+			}
+		}
+	}
+
+	&__footer { color: $primary-lighter1-text-color }
+
+	#mastodon-timeline {
+		color: $primary-text-color;
+		background: transparent;
+
+		p {
+			color: $primary-text-color;
+
+			a { color: $secondary-text-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss b/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
new file mode 100644
index 000000000..16bff9ee6
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
@@ -0,0 +1,109 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.account {
+	background: $account-color;
+	border-color: $base-separation-color;
+
+	.account {
+		&__display-name {
+			color: $secondary-text-color;
+	
+			strong { color: $primary-text-color }
+		}
+	}
+}
+
+.column {
+	> .column-back-button {
+		@include column-shadow;
+		background: $column-header-color;
+	}
+}
+
+.account-timeline__header {
+	.account__header {
+		background-color: $account-foreground-color;
+
+		> div { background-color: inherit }
+
+		.account__header {
+			&__username { color: $secondary-lighter1-text-color }
+			&__fields { @extend .account__header__fields; }
+		}
+
+		.account--action-button {
+			.icon-button:not(.active) {
+				color: darken($light-text-color, 7%);
+
+				&:active,
+				&:focus,
+				&:hover {
+					color: $light-text-color;
+				}
+			}
+		}
+	}
+
+	.account {
+		&__disclaimer,
+		&__action-bar,
+		&__section-headline {
+			background: $column-header-color;
+			border-color: $base-separation-color;
+		}
+
+		&__action-bar {
+			&__tab {
+				border-color: $base-separation-color;
+				&.active { border-bottom-color: $active-color }
+	
+				> span { color: $primary-lighter1-text-color }
+			}
+		}
+	
+		&__section-headline {
+			a {
+				color: $primary-text-color;
+	
+				&.active {
+					color: $primary-lighter1-text-color;
+	
+					&::before { border-color: transparent transparent $base-separation-color }
+					&::after { border-color: transparent transparent $status-color }
+				}
+			}
+		}
+	}
+}
+
+.account__header__fields {
+	dl {
+		border-color: $base-separation-color;
+		
+		dt,
+		dd {
+			color: $primary-text-color;
+			background: $column-header-color;
+		}
+
+		dd {
+			&.verified {
+				border-color: transparentize($valid-color, 0.5);
+				background: transparentize($valid-color, 0.75);
+
+				a { color: lighten($verified-color, 20%) }
+			}
+		}
+	}
+
+	a { color: $secondary-text-color }
+}
+
+.account__action-bar__tab {
+	strong { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/basics.scss b/app/javascript/styles/gplus-theme-for-mastodon/basics.scss
new file mode 100644
index 000000000..a141ecd13
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/basics.scss
@@ -0,0 +1,47 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+body {
+	&,
+	.ui {
+		color: $primary-text-color;
+		background: $base-color;
+	}
+}
+
+.focusable {
+	&:focus {
+		background: inherit;
+
+		.status {
+			@include status-focus-shadow;
+
+			&.status-direct { background: $status-direct-color }
+		}
+
+		.detailed-status {
+			& { background: $status-color }
+			&__action-bar { background: $status-actionbar-color }
+		}
+	}
+}
+
+::-webkit-scrollbar-thumb {
+	background: darken($base-lighter1-color, 12%);
+
+	&:hover { background: darken($base-lighter1-color, 16%) }
+	&:active { background: darken($base-lighter1-color, 12%) }
+}
+
+::-webkit-scrollbar-track {
+	background: $base-color;
+
+	&:hover,
+	&:active {
+		background: darken($base-lighter1-color, 8%);
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon/columns.scss
new file mode 100644
index 000000000..9086e30bc
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/columns.scss
@@ -0,0 +1,197 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.tabs-bar {
+	margin: 0;
+	background: $column-header-color;
+
+	.tabs-bar {
+		&__link {
+			color: $icon-color;
+			
+			.fa { vertical-align: top }
+		}
+	}
+}
+
+.drawer {
+	.drawer {
+		&__header {
+			@include column-shadow;
+			background: $column-header-color;
+	
+			.drawer__tab { color: $icon-color }
+	
+			a {
+				&:hover { background: $column-header-hover-color }
+			}
+		}
+	
+		&__pager {
+			@include status-shadow;
+			
+			.drawer__inner {
+				background: $column-header-color;
+		
+				&__mastodon { display: none }
+			}
+		}
+	}
+}
+
+.navigation-bar {
+	color: $secondary-text-color;
+	background: $column-header-color;
+
+	.navigation-bar {
+		&__profile {
+			strong { color: $primary-text-color }
+			&-edit { color: $secondary-text-color }
+		}
+	}
+}
+
+.compose-form {
+	.compose-form {
+		&__buttons-wrapper { background: $column-header-color }
+		&__publish { border-top: 1px solid $base-separation-color }
+	}
+}
+
+.column {
+	.column-header {
+		@include column-shadow;
+		background: $column-header-color;
+
+		&.active {
+			.column-header__icon {
+				color: $icon-active-color;
+				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
+			}
+		}
+
+		* { background: inherit }
+
+		&__icon {
+			color: $icon-color;
+			vertical-align: top;
+		}
+
+		&__buttons {
+			.column-header {
+				&__back-button {
+					.column-back-button__icon { vertical-align: unset }
+				}
+	
+				&__button {
+					&.active {
+						color: $icon-active-color;
+						background: inherit;
+					}
+		
+					.fa { vertical-align: unset }
+				}
+			}
+		}
+
+		&__collapsible {
+			color: $secondary-text-color;
+			border-bottom: 1px solid $base-separation-color;
+	
+			&-inner { background: $column-header-color }
+		}
+	}
+
+	.column-back-button {
+		&__icon { vertical-align: unset }
+	}
+
+	.column {
+		&-subheading { background: darken($base-color, 10%) }
+	
+		&-link {
+			color: $primary-text-color;
+			background: $base-color;
+	
+			&__icon {
+				color: $icon-color;
+				vertical-align: top;
+			}
+		}
+	}
+
+	.scrollable {
+		background: transparent;
+
+		*[role="feed"] {
+			article {
+				margin: 1em 0;
+				&:first-of-type { margin: 0 }
+			}
+		}
+
+		div[tabindex="-1"] { margin-bottom: 1em }
+	}
+
+	.notification__filter-bar {
+		background: $column-header-color;
+		border-bottom-color: $base-separation-color;
+
+		button {
+			color: $icon-color;
+			background: $column-header-color;
+
+			&.active {
+				color: $icon-active-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $column-header-color }
+			}
+		}
+	}
+
+	.empty-column-indicator {
+		flex-direction: column;
+		background: $base-color;
+
+		&::before {
+			content: "";
+			display: block;
+
+			width: 100px;
+			height: 100px;
+			margin-bottom: 1em;
+
+			background: none center / contain no-repeat;
+			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
+		}
+	}
+}
+
+.getting-started {
+	&__wrapper,
+	& {
+		background: $base-color;
+	}
+
+	& {
+		border-top: 1px solid $base-separation-color;
+
+		a { color: $primary-text-color }
+	}
+}
+
+.load {
+	&-more,
+	&-gap {
+		background: transparent;
+
+		&:hover { background: darken($column-header-color, 10%) }
+	}
+
+	&-gap { border: 0 }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
new file mode 100644
index 000000000..ef50ce863
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.floating-action-button {
+	font-size: 24px;
+	background: $active-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
new file mode 100644
index 000000000..cc6bf2808
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.card {
+	border: 1px solid $base-separation-color;
+
+	> a {
+		@include status-shadow;
+
+		&:hover,
+		&:focus,
+		&:active {
+			.card__bar {
+				background: initial;
+
+				.display-name strong { color: $secondary-text-color }
+			}
+		}
+
+		.card__img { background: $card-image-color }
+		.card__bar {
+			background: $card-color;
+	
+			.avatar {
+				img { background: transparent }
+			}
+	
+			.display-name {
+				strong { color: $primary-text-color }
+				span { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
new file mode 100644
index 000000000..afc55f95f
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
@@ -0,0 +1,42 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.dropdown-menu,
+.actions-modal > ul {
+	@include material-border;
+	background: $base-lighter1-color;
+
+	.dropdown-menu {
+		&__arrow {
+			&.top { border-top-color: $column-header-color }
+			&.bottom { border-bottom-color: $column-header-color }
+		}
+
+		&__item {
+			a {
+				color: $primary-lighter2-text-color;
+
+				padding: 8px 16px;
+				background: $column-header-color;
+
+				&:active,
+				&:focus,
+				&:hover {
+					background: $column-header-hover-color;
+				}
+			}
+		}
+
+		&__separator { border-bottom-color: $base-separation-color }
+	}
+
+	& > li:not(:empty) {
+		@extend .dropdown-menu__item;
+
+		a { padding: 12px 16px }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components.scss b/app/javascript/styles/gplus-theme-for-mastodon/components.scss
new file mode 100644
index 000000000..2b0e8a816
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/components.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+@import 'components-button';
+@import 'components-card';
+@import 'components-dropdown';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/explore.scss b/app/javascript/styles/gplus-theme-for-mastodon/explore.scss
new file mode 100644
index 000000000..7d4726790
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/explore.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.public-layout {
+	.page-header {
+		background: $explore-header-color;
+
+		h1 { color: $primary-text-color }
+		p { color: $primary-lighter2-text-color }
+	}
+
+	.directory {
+		background: $explore-directory-color;
+
+		.accounts-table {
+			&__count {
+				color: $primary-lighter2-text-color;
+				small { color: $primary-lighter1-text-color }
+			}
+		}
+
+		&__tag {
+			a { background: $explore-directory-color }
+			h4 { color: $primary-text-color }
+			.fa, small { color: $primary-lighter1-text-color }
+		}
+	}
+
+	.notice-widget {
+		color: $primary-lighter1-text-color;
+		background: $explore-directory-color;
+
+		a { color: $secondary-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon/icons.scss
new file mode 100644
index 000000000..0125172ad
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/icons.scss
@@ -0,0 +1,97 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+@function hex-color($color) {
+	@if type-of($color) == 'color' {
+		$color: str-slice(ie-hex-str($color), 4);
+	}
+
+	@return '%23' + unquote($color)
+};
+
+
+
+@font-face {
+	font-family: "Material Icons Extended";
+	src:
+		local("Material Icons Extended"),
+		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
+		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
+}
+
+.icon-button {
+	color: $icon-color;
+
+	&:active,
+	&:focus,
+	&:hover {
+		color: lighten($icon-color, 7%);
+	}
+
+	&.star-icon {
+		&.active {
+			color: $light-text-color;
+			background: $icon-active-color;
+			border-radius: 50%;
+		}
+
+		.fa.fa-star { vertical-align: top }
+	}
+
+	&.disabled {
+		color: lighten($icon-color, 13%);
+
+		.fa.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+		}
+	}
+
+	.fa {
+		vertical-align: middle;
+
+		&.fa-retweet {
+			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			
+			&:active,
+			&:hover,
+			&:focus {
+				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
+			}
+		}
+	}
+}
+
+.fa {
+	&.fa-users,
+	&.fa-globe,
+	&.fa-cog,
+	&.fa-star,
+	&.fa-home,
+	&.fa-bell,
+	&.fa-eraser,
+	&.fa-ellipsis-h,
+	&.fa-ellipsis-v,
+	&.fa-address-book,
+	&.fa-thumb-tack,
+	&.fa-lock,
+	&.fa-pencil {
+		font-family: "Material Icons Extended";
+	}
+
+	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
+	&.fa-globe::before { content: "" } // 地球マーク(.drawer__header > .drawer__tab:3)
+	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
+	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
+	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
+	&.fa-bell::before { content: "" } // ベルマーク(通知)
+	&.fa-eraser::before { content: "" } // 通知を消去のマーク
+	&.fa-ellipsis-h::before { content: "" } // 三点リーダー(横)
+	&.fa-ellipsis-v::before { content: "" } // 三点リーダー(縦)
+	&.fa-address-book::before { content: "" } // discoverマーク(explore遷移タブ)
+	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
+	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
+	&.fa-pencil::before { content: "" } // 鉛筆マーク(モバイル用フローティングボタン)
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/lists.scss b/app/javascript/styles/gplus-theme-for-mastodon/lists.scss
new file mode 100644
index 000000000..eb770001e
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/lists.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.column {
+	.column-back-button { background: inherit }
+
+	.column-inline-form {
+		background: $column-header-color;
+
+		label input {
+			color: $secondary-text-color;
+			&:focus { color: $primary-text-color }
+		}
+	}
+
+	.column-inline-form ~ .scrollable {
+		article { margin: 0 }
+	}
+}
+
+.modal-root {
+	.list-editor {
+		background: $base-color;
+		
+		h4 { background: $column-header-color }
+
+		.drawer__pager {
+			.drawer__inner { background: $column-header-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss b/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
new file mode 100644
index 000000000..bab098372
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
@@ -0,0 +1,27 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.notification {
+	&.notification-favourite {
+		.status {
+			&.status-direct { background: transparent }
+		}
+	}
+
+	> .notification__message {
+		color: $primary-lighter2-text-color;
+		font-size: 13px;
+		padding: 8px 0;
+
+		.notification__display-name {
+			&:hover { color: inherit }
+		}
+
+		.notification__favourite-icon-wrapper {
+			.star-icon { color: $icon-active-color }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/profile.scss b/app/javascript/styles/gplus-theme-for-mastodon/profile.scss
new file mode 100644
index 000000000..2bfa60c45
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/profile.scss
@@ -0,0 +1,231 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.public-layout {
+	a.button {
+		@include button-shadow;
+
+		color: $primary-text-color;
+		background: $base-lighter1-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			background: darken($base-lighter1-color, 8%);
+		}
+	}
+
+	.logo-button {
+		svg path {
+			/* Only for Itabashi-don */
+			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+			&:last-child { fill: $base-lighter1-color !important }
+		}
+	}
+
+	.public-account-header {
+		@include status-shadow;
+
+		&__image {
+			background: $base-lighter1-color;
+
+			@media screen and (min-width: 600px) { height: 500px }
+
+			&::after {
+				position: absolute;
+				top: auto;
+				left: 0;
+				bottom: 0;
+
+				width: 100%;
+				height: 30%;
+				background: $account-header-image-shadow-color;
+				box-shadow: none;
+			}
+
+			> img:not([src]),
+			> img[src="/headers/original/missing.png"] {
+				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
+			}
+		}
+
+		&__bar {
+			@media screen and (max-width: 600px) {
+				flex-direction: column;
+				background: $base-color;
+			}
+			
+			@media screen and (min-width: 600px) { margin-top: -140px }
+
+			&::before { background: $base-lighter1-color }
+
+			.avatar {
+				@media screen and (max-width: 600px) {
+					position: relative;
+					bottom: 30px;
+
+					display: initial;
+					width: 60px;
+					height: 60px;
+					margin: 0 auto;
+					padding: 0;
+				}
+
+				img {
+					border: 2px solid $base-lighter1-color;
+					border-radius: 50%;
+					background: transparent;
+				}
+			}
+		}
+
+		&__tabs {
+			@media screen and (max-width: 600px) {
+				flex-wrap: wrap;
+				margin-left: 0;
+
+				&__name {
+					width: 100%;
+					text-align: center;
+
+					h1 {
+						color: $primary-text-color;
+
+						small { color: $primary-lighter1-text-color }
+					}
+				}
+
+				&__tabs {
+					justify-content: center;
+					flex: auto;
+
+					.spacer { display: none }
+
+					a.button.logo-button {
+						color: $light-text-color;
+						background: $secondary-text-color;
+
+						svg path {
+							/* Only for Itabashi-don */
+							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
+							&:last-child { fill: $secondary-text-color !important }
+						}
+					}
+				}
+			}
+
+			.details-counters {
+				.counter {
+					color: $light-text-color;
+					border-right: 0;
+
+					&::after { border-bottom-color: $base-color }
+
+					&.active {
+						&::after { border-bottom-color: $active-color }
+					}
+				}
+			}
+		}
+
+		&__extra {
+			.public-account-bio {
+				.account__header__content { text-align: center }
+			}
+
+			&__links {
+				color: $primary-text-color;
+
+				a {
+					&, strong { color: $primary-text-color }
+				}
+			}
+		}
+	}
+
+	.public-account-bio {
+		@include column-shadow;
+		background: $base-lighter1-color;
+		
+		.account__header__content { color: $primary-text-color }
+		&__extra { color: $primary-lighter1-text-color }
+	}
+
+	.endorsements-widget {
+		@include column-shadow;
+
+		padding-bottom: 0;
+		border-radius: 4px;
+
+		h4 {
+			color: $primary-lighter1-text-color;
+			background: $base-lighter1-color;
+		}
+	}
+
+	.hero-widget {
+		@include column-shadow;
+
+		&__img { background: $base-color }
+		&__text {
+			background: $base-lighter1-color;
+
+			&, em { color: $primary-lighter2-text-color }
+			a { color: $secondary-text-color }
+		}
+	}
+
+	.account__section-headline {
+		background: $base-lighter1-color;
+		border-bottom-color: $base-separation-color;
+
+		a {
+			color: $primary-lighter1-text-color;
+
+			&.active {
+				color: $primary-lighter2-text-color;
+
+				&::before { border-color: transparent transparent $base-separation-color }
+				&::after { border-color: transparent transparent $status-color }
+			}
+		}
+	}
+
+	.activity-stream {
+		box-shadow: none;
+
+		.entry {
+			margin: 1em 0;
+			background: transparent;
+
+			&:first-of-type { margin: 0 }
+		}
+	}
+
+	.nothing-here {
+		@include status-shadow;
+
+		color: $primary-lighter1-text-color;
+		background: $base-lighter1-color;
+	}
+
+	.footer {
+		h4 { color: $primary-lighter1-text-color }
+
+		ul {
+			a { color: $primary-lighter2-text-color }
+		}
+
+		.brand {
+			svg path {
+				/* Only for Itabashi-don */
+				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
+				&:last-child { fill: $base-lighter1-color !important }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/searches.scss b/app/javascript/styles/gplus-theme-for-mastodon/searches.scss
new file mode 100644
index 000000000..b4478b91b
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/searches.scss
@@ -0,0 +1,41 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.search {
+	.search {
+		&__input {
+			@include material-border;
+
+			color: $primary-text-color;
+			background: $form-color;
+	
+			&:focus { background: $form-focused-color }
+		}
+	
+		&__icon {
+			.fa { color: $icon-color }
+		}
+	}
+
+	&-results {
+		> .search-results {
+			&__header { background: $base-color }
+			&__section {
+				> h5 { background: darken($base-color, 10%) }
+			}
+		}
+	}
+}
+
+.trends__item {
+	background: $trend-color;
+
+	.trends__item {
+		&__name a { color: $secondary-text-color }
+		&__current { color: lighten($secondary-text-color, 10%) }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
new file mode 100644
index 000000000..d069af381
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
@@ -0,0 +1,44 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.edit_account {
+	@media screen and (min-width: 415px) {
+		.card {
+			> a {
+				position: relative;
+
+				.card__img { border-bottom: 1px solid $base-separation-color }
+				.card__bar {
+					position: static;
+					padding-top: 30%;
+			
+					.avatar {
+						position: absolute;
+						left: 0;
+						bottom: 0;
+
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 100%;
+						height: 100%;
+
+						img {
+							width: 128px;
+							height: 128px;
+						}
+					}
+			
+					.display-name {
+						flex: auto;
+						margin-left: 0;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
new file mode 100644
index 000000000..0e9c55136
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
@@ -0,0 +1,28 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.dashboard {
+	&__counters {
+		& > div {
+			& > div, & > a { background: $dashboard-counters-base-color }
+			
+			& > a {
+				&:hover,
+				&:focus,
+				&:active {
+					background: $dashboard-counters-hover-color;
+				}
+			}
+		}
+
+		&__num { color: $primary-text-color }
+		&__label { color: $primary-lighter1-text-color }
+	}
+
+	&__widgets {
+		a:not(.name-tag) { color: $primary-lighter2-text-color }
+	}
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
new file mode 100644
index 000000000..7912d1ddc
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.report-card {
+	background: $setting-content-base-color;
+
+	&__profile__stats {
+		color: $primary-lighter2-text-color;
+
+		a {
+			&:focus,
+			&:hover,
+			&:active {
+				color: lighten($primary-lighter2-text-color, 8%);
+			}
+		}
+	}
+
+	&__summary {
+		&__item {
+			border-top-color: $base-separation-color;
+
+			&:hover { background: $column-header-hover-color }
+
+			&__reported-by,
+			&__assigned {
+				color: $primary-lighter2-text-color;
+			}
+
+			&__content {
+				&__icon { color: $icon-color }
+				a { color: $primary-lighter2-text-color }
+			}
+		}
+	}
+}
+
+.batch-table {
+	&__toolbar {
+		background: $base-lighter1-color;
+		border-color: $base-separation-color;
+	}
+
+	&__row {
+		background: $base-lighter1-color;
+		border-color: $base-separation-color;
+
+		&:hover { background: $column-header-hover-color }
+
+		&__content {
+			.status__content { color: $primary-text-color }
+			.detailed-status__meta { color: $primary-lighter1-text-color }
+		}
+	}
+}
+
+.speech-bubble {
+	&__bubble { color: $primary-text-color }
+	a { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings.scss
new file mode 100644
index 000000000..752d2c662
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/settings.scss
@@ -0,0 +1,208 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+@import 'settings-account';
+@import 'settings-report';
+@import 'settings-dashboard';
+
+
+
+body.admin {
+	color: $primary-text-color;
+	background: $setting-base-color;
+	
+	.sidebar {
+		&-wrapper { background: inherit }
+
+		ul {
+			border-radius: 0;
+
+			a {
+				color: $primary-lighter2-text-color;
+				border-radius: 0;
+
+				&:hover {
+					color: $primary-text-color;
+					background: $setting-lists-hover-color;
+				}
+
+				&.selected {
+					color: $primary-text-color;
+					background: $setting-lists-selected-color;
+				}
+			}
+
+			ul { background: darken($setting-base-color, 4%) }
+
+			.simple-navigation-active-leaf a {
+				color: $icon-active-color;
+				background: initial;
+
+				&:hover { background: $setting-lists-hover-color }
+			}
+		}
+	}
+
+	.content {
+		@include column-shadow;
+		background: $setting-content-base-color;
+
+		h2, h3, h4, h6 { color: $primary-text-color }
+
+		p {
+			color: $primary-text-color;
+			strong { color: $primary-text-color }
+		}
+
+		h2, h4, hr { border-bottom-color: $base-separation-color }
+		.muted-hint { color: $primary-lighter1-text-color }
+	}
+}
+
+.simple_form {
+	.input {
+		&.boolean,
+		&.with_label,
+		&.with_floating_label {
+			.label_input > label { color: $primary-text-color }
+		}
+
+		&.with_block_label {
+			& > label { color: $primary-text-color }
+		}
+
+		&.radio_buttons{
+			.radio label { color: $primary-text-color }
+		}
+
+		&-copy { background: $base-color }
+	}
+
+	.check_boxes {
+		.checkbox {
+			label { color: $primary-text-color }
+		}
+	}
+
+	input[type=text],
+	input[type=number],
+	input[type=email],
+	input[type=password],
+	textarea {
+		color: $primary-text-color;
+		background: $setting-content-base-color;
+		border-color: $base-separation-color;
+
+		&:hover {
+			border-color: $base-separation-color;
+		}
+
+		&:active,
+		&:focus {
+			background: darken($setting-content-base-color, 8%);
+		}
+	}
+
+	select {
+		color: $primary-text-color;
+		background-color: $setting-content-base-color;
+		border-color: $base-separation-color;
+	}
+
+	.input.field_with_errors {
+		label,
+		.error {
+			color: $error-text-color;
+		}
+	}
+
+	.hint, p.hint { color: $primary-lighter1-text-color !important }
+
+	.label_input {
+		&__append { color: $primary-lighter1-text-color }
+	}
+}
+
+.simple_form,
+.table-form {
+	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
+}
+
+.quick-nav {
+	a {
+		color: $secondary-text-color;
+
+		&:hover,
+		&:focus,
+		&:active {
+			color: lighten($secondary-text-color, 8%);
+		}
+	}
+}
+
+.pagination {
+	.page,
+	a {
+		color: $primary-text-color;
+	}
+
+	.page {
+		&.current {
+			background: $icon-active-color;
+			color: $light-text-color;
+		}
+	}
+}
+
+.filters {
+	.filter-subset {
+		strong { color: $primary-text-color }
+
+		a {
+			color: $primary-lighter2-text-color;
+
+			&:hover { color: $primary-text-color }
+
+			&.selected {
+				color: $active-text-color;
+				border-bottom-color: $active-text-color;
+			}
+		}
+	}
+}
+
+label {
+	&[for=user_setting_default_privacy_public],
+	&[for=user_setting_default_privacy_unlisted] {
+		color: $active-text-color !important;
+	}
+}
+
+.column-header__collapsible__extra {
+	.column-settings__section { color: $primary-text-color }
+
+	.setting-toggle {
+		.react-toggle {
+			&.react-toggle--checked {
+				> .react-toggle-track { background: $setting-toggle-checked-color }
+
+				> .react-toggle-thumb {
+					border-color: $setting-toggle-checked-color;
+					background-color: $setting-toggle-thumb-checked-color;
+				}
+			}
+
+			> .react-toggle-track { background: $setting-toggle-color }
+
+			> .react-toggle-thumb {
+				border-color: $setting-toggle-color;
+				background-color: $setting-toggle-thumb-color;
+			}
+		}
+
+		.setting-toggle__label { color: $primary-text-color }
+	}
+
+	.setting-meta__label { color: $primary-lighter1-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss b/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
new file mode 100644
index 000000000..0532a0b90
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+@import 'variables';
+@import 'mixins';
+
+
+
+.status {
+	@include status-shadow;
+	border-bottom: 0;
+
+	transition: box-shadow 0.1s 0s ease-out;
+
+	&.light {
+		.status {
+			&__relative-time { color: $primary-lighter1-text-color }
+			&__display-name {
+				color: $primary-text-color;
+
+				.display-name__account { color: $primary-lighter1-text-color }
+			}
+
+			&__content { color: $primary-text-color }
+		}
+	}
+
+	&.status-direct {
+		background: $status-direct-color;
+
+		&:not(.read) {
+			background: inherit;
+			border-bottom-color: initial;
+		}
+	}
+
+	&.muted {
+		.status__content {
+			p { color: lighten($primary-text-color, 20%) }
+		}
+	}
+
+	.status {
+		&__info {
+			.status__display-name {
+				color: $primary-lighter1-text-color;
+	
+				strong { color: $primary-text-color }
+			}
+	
+			.status__relative-time { color: $primary-lighter1-text-color }
+		}
+	}
+}
+
+.detailed-status {
+	.detailed-status {
+		&__display-name {
+			color: $secondary-text-color;
+	
+			strong { color: $primary-text-color }
+		}
+	
+		&__meta {
+			.detailed-status__datetime { color: $primary-lighter1-text-color }
+	
+			.detailed-status__link {
+				.fa.fa-star { vertical-align: middle }
+			}
+		}
+	}
+	
+	&__wrapper {
+		@include status-shadow;
+		
+		.detailed-status { @extend .detailed-status; }
+		.detailed-status__action-bar {
+			background: $status-actionbar-color;
+			border-color: $base-separation-color;
+		}
+	}
+}
+
+.status,
+.detailed-status {
+	background: $status-color;
+
+	.status__content {
+		color: $primary-text-color;
+
+		a { color: $secondary-text-color }
+
+		.status__content__spoiler-link {
+			color: $primary-text-color;
+			background: $base-color;
+		}
+	}
+}
+
+a.status-card,
+a.status-card.compact {
+	&:hover { background: initial }
+}
+
+.name-tag,
+a.name-tag {
+	color: $secondary-text-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/tables.scss b/app/javascript/styles/gplus-theme-for-mastodon/tables.scss
new file mode 100644
index 000000000..e71ce7a38
--- /dev/null
+++ b/app/javascript/styles/gplus-theme-for-mastodon/tables.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+
+@import 'variables';
+
+
+
+.table {
+	thead th { border-bottom-color: $base-separation-color }
+	
+	th,
+	td {
+		color: $primary-text-color;
+		background-color: $base-color;
+		border-top: 0;
+	}
+
+	& > tbody > tr:nth-child(odd) {
+		& > td, & > th { background: darken($base-color, 4%) }
+	}
+
+	a { color: $secondary-text-color }
+}
+
+a.table-action-link,
+button.table-action-link {
+	color: $secondary-text-color;
+
+	&:hover { color: darken($secondary-text-color, 8%) }
+}
\ No newline at end of file
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 59cfbba17..20a609a77 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -5,12 +5,14 @@
 base_host     = Rails.configuration.x.web_domain
 assets_host   = Rails.configuration.action_controller.asset_host
 assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
+google_font_host = "https://fonts.gstatic.com"
+gplus_theme_host = "https://raw.githubusercontent.com"
 
 Rails.application.config.content_security_policy do |p|
   p.base_uri        :none
   p.default_src     :none
   p.frame_ancestors :none
-  p.font_src        :self, assets_host
+  p.font_src        :self, assets_host, google_font_host
   p.img_src         :self, :https, :data, :blob, assets_host
   p.style_src       :self, :unsafe_inline, assets_host
   p.media_src       :self, :https, :data, assets_host
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 786906e2d..7b704f667 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1056,6 +1056,10 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
+    google-plus: Google+
+    google-plus-dev: Google+ Dev
+    dark-google-plus-dev: Dark Google+ Dev
+
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 1ff5a2b63..65f66fa92 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -987,6 +987,9 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
+    google-plus: Google+
+    google-plus-dev: Google+ Dev
+    dark-google-plus-dev: Dark Google+ Dev
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index 9c21c9459..ff2639be1 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,3 +1,6 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+google-plus: styles/gplus-theme-for-mastodon.scss
+google-plus-dev: styles/gplus-theme-for-mastodon-dev.scss
+dark-google-plus-dev: styles/dark-gplus-theme-for-mastodon-dev.scss

From 45cb583c54fb2c48d8d24f1c6fa3451512c4df4a Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Wed, 14 Aug 2019 22:23:40 +0900
Subject: [PATCH 014/200] =?UTF-8?q?=E3=83=80=E3=83=BC=E3=82=AF=E3=83=86?=
 =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=81v2.9.x?=
 =?UTF-8?q?=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=81=AA=E3=81=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_variables.scss                           |  2 +-
 .../columns.scss                              | 69 +++++++++++++++++--
 .../components-button.scss                    |  5 +-
 .../icons.scss                                | 16 ++++-
 .../gplus-theme-for-mastodon-dev/columns.scss | 69 +++++++++++++++++--
 .../components-button.scss                    |  5 +-
 .../gplus-theme-for-mastodon-dev/icons.scss   | 16 ++++-
 7 files changed, 167 insertions(+), 15 deletions(-)

diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
index 9f5098b22..6907a668f 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
@@ -29,7 +29,7 @@ $icon-active-color: $active-color;
 
 
 // Background colors
-$base-color: #212121;
+$base-color: #121212;
 $base-lighter1-color: #2d2d2d;
 $base-darker1-color: #000000;
 
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
index 9e5cd2621..8fbd6be10 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
@@ -6,9 +6,10 @@
 
 
 .tabs-bar {
-	@include column-shadow;
 	margin: 0;
 	background: $column-header-color;
+	position: relative;
+	z-index: 2;
 
 	.tabs-bar {
 		&__link {
@@ -99,6 +100,7 @@
 	.column-header {
 		@include column-shadow;
 		background: $column-header-color;
+		z-index: 1;
 
 		&.active {
 			.column-header__icon {
@@ -121,9 +123,9 @@
 
 			.column-header {
 				&__back-button {
-					.column-back-button__icon { vertical-align: unset }
+					.column-back-button__icon { vertical-align: bottom }
 				}
-	
+
 				&__button {
 					&.active {
 						color: $icon-active-color;
@@ -143,7 +145,7 @@
 		&__collapsible {
 			color: $secondary-text-color;
 			border-bottom: 1px solid $base-separation-color;
-	
+
 			&-inner { background: $column-header-color }
 		}
 	}
@@ -158,7 +160,10 @@
 
 	.column {
 		&-subheading,
-		&-link__badge { background: $base-color }
+		&-link__badge {
+			background: $base-color;
+			color: $secondary-text-color;
+		}
 	
 		&-link {
 			color: $primary-text-color;
@@ -223,6 +228,60 @@
 	}
 }
 
+// v2.9.0以降
+.column-header {
+	@include column-shadow;
+	background: $column-header-color;
+	z-index: 1;
+
+	&.active {
+		.column-header__icon {
+			color: $icon-active-color;
+			text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
+		}
+	}
+
+	* { background: inherit }
+
+	&__icon {
+		@include material-icon-large;
+		color: $icon-color;
+		vertical-align: bottom;
+		margin-right: 10px;
+	}
+
+	&__buttons {
+		height: 50px;
+
+		.column-header {
+			&__back-button {
+				.column-back-button__icon { vertical-align: bottom }
+			}
+
+			&__button {
+				&.active {
+					color: $icon-active-color;
+					background: inherit;
+				}
+	
+				.fa { vertical-align: unset }
+			}
+		}
+	}
+
+	&__button {
+		color: $icon-color;
+		padding: 0 16px;
+	}
+
+	&__collapsible {
+		color: $secondary-text-color;
+		border-bottom: 1px solid $base-separation-color;
+
+		&-inner { background: $column-header-color }
+	}
+}
+
 .getting-started {
 	&__wrapper,
 	& {
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
index 42d4f8db8..2b6644215 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
@@ -25,7 +25,10 @@
 	@include material-card-radius;
 	background-color: $active-button-color;
 
-	.text-icon-button { color: $primary-lighter1-text-color }
+	.text-icon-button {
+		color: $primary-lighter1-text-color;
+		border-radius: 50%;
+	}
 }
 
 .modal-root {
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
index 825d18dac..d28fa367d 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
@@ -24,11 +24,13 @@
 
 .icon-button {
 	color: $icon-color;
+	border-radius: 50%;
 
 	&:active,
 	&:focus,
 	&:hover {
 		color: lighten($icon-color, 7%);
+		background-color: $column-header-hover-color;
 	}
 
 	&.star-icon {
@@ -116,7 +118,13 @@
 	&.fa-chevron-down,
 	&.fa-bars,
 	&.fa-navicon,
-	&.fa-reorder {
+	&.fa-reorder,
+	&.fa-desktop,
+	&.fa-code,
+	&.fa-list,
+	&.fa-paperclip,
+	&.fa-plus,
+	&.fa-bullhorn {
 		font-family: "Material Icons Extended";
 	}
 
@@ -167,6 +175,12 @@
 	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
 	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
 	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
+	&.fa-desktop::before { content: "desktop-windows" } //外観設定のアイコン
+	&.fa-code::before { content: "code" } //開発アイコン
+	&.fa-list::before { content: "list" } //リストアイコン
+	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
+	&.fa-plus::before { content: "add" } // 追加ボタン
+	&.fa-bullhorn::before { content: "announcement"} //Adminからのお知らせ(一部サーバーのみ)
 }
 
 .fa {
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
index 6a0239562..8fbd6be10 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
@@ -6,9 +6,10 @@
 
 
 .tabs-bar {
-	@include column-shadow;
 	margin: 0;
 	background: $column-header-color;
+	position: relative;
+	z-index: 2;
 
 	.tabs-bar {
 		&__link {
@@ -99,6 +100,7 @@
 	.column-header {
 		@include column-shadow;
 		background: $column-header-color;
+		z-index: 1;
 
 		&.active {
 			.column-header__icon {
@@ -121,9 +123,9 @@
 
 			.column-header {
 				&__back-button {
-					.column-back-button__icon { vertical-align: unset }
+					.column-back-button__icon { vertical-align: bottom }
 				}
-	
+
 				&__button {
 					&.active {
 						color: $icon-active-color;
@@ -143,7 +145,7 @@
 		&__collapsible {
 			color: $secondary-text-color;
 			border-bottom: 1px solid $base-separation-color;
-	
+
 			&-inner { background: $column-header-color }
 		}
 	}
@@ -158,7 +160,10 @@
 
 	.column {
 		&-subheading,
-		&-link__badge { background: darken($base-color, 10%) }
+		&-link__badge {
+			background: $base-color;
+			color: $secondary-text-color;
+		}
 	
 		&-link {
 			color: $primary-text-color;
@@ -223,6 +228,60 @@
 	}
 }
 
+// v2.9.0以降
+.column-header {
+	@include column-shadow;
+	background: $column-header-color;
+	z-index: 1;
+
+	&.active {
+		.column-header__icon {
+			color: $icon-active-color;
+			text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
+		}
+	}
+
+	* { background: inherit }
+
+	&__icon {
+		@include material-icon-large;
+		color: $icon-color;
+		vertical-align: bottom;
+		margin-right: 10px;
+	}
+
+	&__buttons {
+		height: 50px;
+
+		.column-header {
+			&__back-button {
+				.column-back-button__icon { vertical-align: bottom }
+			}
+
+			&__button {
+				&.active {
+					color: $icon-active-color;
+					background: inherit;
+				}
+	
+				.fa { vertical-align: unset }
+			}
+		}
+	}
+
+	&__button {
+		color: $icon-color;
+		padding: 0 16px;
+	}
+
+	&__collapsible {
+		color: $secondary-text-color;
+		border-bottom: 1px solid $base-separation-color;
+
+		&-inner { background: $column-header-color }
+	}
+}
+
 .getting-started {
 	&__wrapper,
 	& {
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
index 42d4f8db8..2b6644215 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
@@ -25,7 +25,10 @@
 	@include material-card-radius;
 	background-color: $active-button-color;
 
-	.text-icon-button { color: $primary-lighter1-text-color }
+	.text-icon-button {
+		color: $primary-lighter1-text-color;
+		border-radius: 50%;
+	}
 }
 
 .modal-root {
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
index 825d18dac..d28fa367d 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
@@ -24,11 +24,13 @@
 
 .icon-button {
 	color: $icon-color;
+	border-radius: 50%;
 
 	&:active,
 	&:focus,
 	&:hover {
 		color: lighten($icon-color, 7%);
+		background-color: $column-header-hover-color;
 	}
 
 	&.star-icon {
@@ -116,7 +118,13 @@
 	&.fa-chevron-down,
 	&.fa-bars,
 	&.fa-navicon,
-	&.fa-reorder {
+	&.fa-reorder,
+	&.fa-desktop,
+	&.fa-code,
+	&.fa-list,
+	&.fa-paperclip,
+	&.fa-plus,
+	&.fa-bullhorn {
 		font-family: "Material Icons Extended";
 	}
 
@@ -167,6 +175,12 @@
 	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
 	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
 	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
+	&.fa-desktop::before { content: "desktop-windows" } //外観設定のアイコン
+	&.fa-code::before { content: "code" } //開発アイコン
+	&.fa-list::before { content: "list" } //リストアイコン
+	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
+	&.fa-plus::before { content: "add" } // 追加ボタン
+	&.fa-bullhorn::before { content: "announcement"} //Adminからのお知らせ(一部サーバーのみ)
 }
 
 .fa {

From 94dd22e12f0e7aaf5b398e808b7441835093d04b Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Thu, 15 Aug 2019 00:34:59 +0000
Subject: [PATCH 015/200] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E3=82=A2=E3=83=90?=
 =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=92=E6=97=A7=E6=9D=A5=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/avatars/original/missing.png | Bin 3292 -> 23108 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/avatars/original/missing.png b/public/avatars/original/missing.png
index 34c8e45e61ce1e1ddeb6a9f69dc1979816a7286e..fb27b84df87468af256ff6ed33af0f06576fdfdf 100644
GIT binary patch
literal 23108
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

literal 3292
zcmZ{ncRUo1|HseFopoFnopm^?Q1+H_#uX=<gh+@`lAUq(rjS{(WgX7ubV!cO%ibd$
z&MG4+etmxbe_xNs`|)}{p6@^2f4}4IqV<?TFc1I$U`FX9O#lF@)c=No=AUVH=sW*c
z_wE{)>CCK<i<(AoJ(Gl?x!{bZ$))dK7dEDs$$evsrLAK<BMYN5>*I6ZT0c(@POLQb
zPF1vx4^6G&2j|*}GySAx?8k}94pKG#YXNR3=3Qrac56oE=RE9Sa&fm%*Xk?)z@&yk
zYMS}aQV8MyP6EOT{#I~QQ2&SjGtS@bQn~5EZvy<9g_dd9M*S~xJ>A?y+Er8_W3qL1
zf6%F4`Od;ol5YmTdAHuIP`PD5a{406j5mdW3MW1%C^(<_AIPQG91D+k<uUhh><_0a
z5R}g>W$iTU0wJ3sO-C>*GM>u-dauX-4Cf{B7lBs0T&|G$_Ibust&kMXm-oO+A%3U8
z&alY)Fi$QjAF@MJ^0a!^26WwRUqo<cq)j2&q?an*m`jiNAtY$_8Nqz${tK)%hiJA8
zolkd)qH8Wz=v837U@2@3E13LT$An8S*BmtNAH$U-rQ~Towm=j($n?$j(VE=B1c`ev
zZ{yzER$Xc}(+R2$Nezl=mvfMNr9N(_N$Hgvz0RaMW*v-zxSy{bz<rk8Hp5R}PbvlX
zKf7&KJY`0`7m;3K*~)@9z2r28J1gthG&i3Av8d#DlW<YW)+)}6mtv!t3Kv~uOSpn3
zyR09EULTXFds<jp9o`aLaagKpS9I}8ub?Zhq|pdz&0fLtgAsOKE;x3|e$cyVWWMQ{
z)l-%A(;sZo7+5GChsz?8yNGM5`L;>}uk=3#m+J9$<b`co>N#@Ay2dCqKIMqBRSnU8
zA{KEMvH@+Z5v8G-1A3BK1vi|TUn-kEtd;mS`XEH+k%RkmaU@2E8Q+tno?qsAbZFyn
zbj@8rjay{Ywjuy7nXVni3?h>if=eUSS64*SehvLXUX7#G7w(Gq^2>tx+o<NXQ=VeN
z2}~>k#PXipEWi~w*;lj75IrrCr4_=Jz08m~?EpLQKxnZaNWAPt&|R+PHPNrNVk~91
z$1x#N?dqHjgz>J{`tX;1FsbZ6g(dK)FJ9*qMfi`De!!juTLXP_YRKMPxAKgH6G3py
zcE+$+xRAu1%B@!%eX@mqp&^}!=c!^}AaTv34~5nM+qAV&jJxo*1WqfV)2&Xzj+0*+
zV0)d#T81}e7lgO>L6%vKH&k!4EZ%;%8-}gj#-b^PnUOTz>Zg;~+ms&gWe0?XS`}M6
zM|`;z#iKJq#Oabikt4sPB^*)i_^k2h2aQt5oeNp}@c!xXTMIQB2y^kbIT@U>%XOCM
zPg)3F&?H0W;4A5eQd8oLC|Y$BJxyIlQ^K`u*7D*fQS)-{VYKWw8azdb2KO%`(oVL;
zl(cWS55=eI&&%AuT*5C5se)KHI5mRt!iDg-j<T&+P2fHaY6P323vp}niS5g<6H@Xq
zd)t*CwgeS@L~ZpTtiHwf1&v-g&kn-3-!UgBA0vVM3k8En;D{^oX@_13UDGPfM`jLi
zPz(?b53eoAdg^~MH4m*Uj|3OmNE0qTC^+U$WXnOKAJ|N|n>brT;E_ms&Ee@4xUQt*
zORgWuZ3?XYTH?y%vrY278em3W!`%n=n!HjfVv}!!wwsQkyvR%^PD;n=_<#J?l3yaA
zmX>n8|KnC!?|J<N$kDi4`E@W|orpvJOkFM9a{A2WfD0j!+gvZ}$032X%25%W13MjA
z3c4B<JkbU-+VK{)?zA&&dM7N#<%Y*6F*p*h6J*_%JQy6cKUFSa*TjOp)7CZXggWiT
z!=dF^{3=gulSHf>bT7%a^^qo}!vE5Ea64vtUyCSpNrYA@oL=4_`C3*eq-o8MiIEYK
zc?P8WyjNk9js1!mybm7kROoJPh5IIFcLcmSD7M3+zvB0%3WH*<d5HWucT3uG^E9*S
z+gUMg4D03tSD(NPcUVPfeG7y-V(^CG#nTi{JtBNpW5FK+U+M`A5Df9AbHB)*y`R>{
z$N#Hv)9?Bvy^EOIk?IE$k>$0wa!aexzH)@`w1i!<Zchp1;F+Q6&O4s2;{GF2sPkg1
zP48o`<9q6p`+Y&?bprOla|)H5!iXhLsJy>a!*fito@Hb#s&aUH5On)|D5^~3sz=fm
z7d^U$u3r?%q^$kShEOMv)SNyz+iaAR5Ld~Q&zKq&@w}|!GRctKo5XG*ldKg0^0}cA
ztu=^cTQO~on^JgxnH*A{5t<Z4Rey-23NSSLiBfQVV`+8dL&nvbbt=UJtfy;IENmU1
zj?ZHETPx!#K5&G-_G~GFj!2R;+NX7LW-8?%<~Po4tBi-GuQ#+vOT?8#SyZ2COjSOz
zbCSZ)fzI*}7=}kiV-lB(-^%|P^Ha*MV>qP(kfbY3kJlXESNaXay6IX*i0pq!-s*TU
zK03iw)Anehad0*jUGsV0cH^z*sd_C1r}QL31S(#D@K@AeZ6myf94giy)TqOFKRpv^
z7GON8id)RQ5l<7oocLU)Huw<MBO{<-^jXPH?R5h<M}Kb<?Of$PtR>&+Py1B%Vg9yw
zq%buAJ!#eB@VvzU5zQ-78rp{dOyBDPeKfvv3$j5rSSM;>RbSWKi5y1ev4FLxqs3j!
zM<Widx~fS#DQz<V(98;n1%TMCDo)&cS}~zg=fAXF1)*Ach6CUkWpa0_N6tJ%TDHmV
z@pd?Nm51TBxFkEYKqs#LBa8u*Rq{ovz9}I+GBSqUSuAy1vtN=*C}6y7z1QZ=zGEP2
zcVImQV{o8XudNY?d7)k0@%O?h{w6W)m~Vt~wO=e$e`JfFJ;rId44}j`NG6MG3NT-!
z&o?-?qlq+PbU@(jv39o+Fa;}$NI@>TnF*G$6wS}<w`@4m(}>Tdv2DMI$)<3Gl(%v=
zaYe!?$A^U|wi55k0}JZdJlQtaZgy4E4n|<N+1PhXGw9jvQXmQZ^1H)8a^E8CK`!4Z
zr`S*@w4Cg${UADV9C~}HrC?aOHvy4;<(<*JM3Y2?{#zRQp{M@im{7{XoHynsn0~oR
zg^HRpT%hA3*TN&$O_PQ3z47_pqC?*cR+L88Rk_MH-zqcZC-&*wEZ!-8<I?7mhRPH<
z9}S!iUh*LK+uNOiM<IhtEC{$4yxiKT_)k$uQr;=GT%~;<+I&>_9$sT8P{6^ZXhOfo
zZ*g7psann+53viw*Fjn#!NhMVrg@dFa^a3vG9|eh*AFyo_#ST#XRCVuM;@EGOkEoh
zDvSGx7LqPkbdhiQ^wTPUtFr4=e5}R&Pcct8(^g^s$Q8rzAybuCKP`>Ty**ZT${((y
z%c8}-NAemx!CuM6>Yub}ss7}%s_{drQjpt9`vC5mrCwmlubbO%Sqoi(jG3lTcgYcB
z9Q`9z&51KuZJXV%wC{53s;B|n*MkF-te14m3n;-1Ih;Xhq0j6m-}z~g5S=*u-)68x
z;lz3@MPASQZSmw*-xY*qIb%LtU^QfSdRoY=?vTHt#o6b$#(K%HG{k)Ho%W3Y_V)H5
zUT>7zh`xA!z>1UoqdQaed~TX1zUPg8vL1%EFMV#G#ufkgjqJf4iK0tx84L3laVvN@
zJao6fAX>LRpvdz9)I15t);~RSjzUe;o&K7aGW4%Azs4oL3w{;pHo<1ox7ptuh){7n
zip)GY<ZTnVa~z--{KVy$MQ@Sx`w?(e3a5H!K%aRG@f=qEPX5yXwyUC4-b4`B62(Mp
zmqIO4M(Xm2OWF&>Bxr8in41-M22dq#!N&Jb{EsT!n+LrR(!ko%-`;@79@ZOUyT?$D
za+Fibkqei&DkGIqGNSIcP0*jmr~>n4Mij-F<QpUel+DW7{TpiZ`Jv)DH&TRuIYFMY
z4)ZF$2};O~c9se1_~vmPICN5fgFBe2?PJbOQK)j@-72yjWM4=IgK5ld*KK+ORip=^
zJZ?JBA(U6GuEBGdfwHb}b@G{$es@7QL*jgvY5u*o?$X~~m7seY5{vxYsSpWMF{=rx
zJp$vPgSG0@cwRFNFe}td16xEUT>WWo)k`I16?&fzl1jh*GxsjF_s8=L5eXnCE`?8%
zcD<o9h^PsUrWVa{EDQrRQng*=D?i6@Ue%AwYl!0F4L^Kc{VQNbGqtbUu1hv5<66pR
z0|NZ?ZqT1Qu?|twITkYCFuiNsY^Hb9AKJru-0blnX<}V5GWGsoUH-ncjBqHM0yOi}
zHJ(l6!poM(X76|O_Um&wmmWLv{to)kp6jQpwE1<iXH>1mg#`ScFTnpV!fqYWis6he
T1m@pU{u3x2G_pqP0p|YzWF96{


From e3809d241727e13d4d017df71f98104894fcdb5e Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Fri, 16 Aug 2019 19:16:50 +0900
Subject: [PATCH 016/200] =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?=
 =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=A7=E3=81=AE=E4=B8=AD=E5=A4=AE?=
 =?UTF-8?q?=E5=AF=84=E3=81=9B=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a7cbca4b5..f4ad094c8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1875,7 +1875,7 @@ a.account__display-name {
       }
 
       &__inner {
-        position: fixed;
+        position: static;
         width: 285px;
         pointer-events: auto;
         height: 100%;

From 2d25a56a7aea624017d2bc847636408f41c5e224 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Sat, 17 Aug 2019 17:17:38 +0900
Subject: [PATCH 017/200] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E3=81=A7?=
 =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=20=E5=BD=B1?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20UI=E5=AF=86=E5=BA=A6=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=20=E3=81=9D=E3=81=AE=E4=BB=96=E3=81=9F?=
 =?UTF-8?q?=E3=81=8F=E3=81=95=E3=82=93=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=AA?=
 =?UTF-8?q?=E3=81=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_variables.scss                           |  1 +
 .../accounts.scss                             |  5 +++-
 .../columns.scss                              | 23 ++++++++++++++----
 .../components-button.scss                    | 22 +++++++++++++++--
 .../components-dropdown.scss                  | 12 ++++++----
 .../icons.scss                                | 24 ++++++++++++++-----
 .../settings.scss                             |  1 +
 .../statuses.scss                             |  2 ++
 .../_variables.scss                           |  1 +
 .../accounts.scss                             |  5 +++-
 .../gplus-theme-for-mastodon-dev/columns.scss | 23 ++++++++++++++----
 .../components-button.scss                    | 22 +++++++++++++++--
 .../components-dropdown.scss                  | 12 ++++++----
 .../gplus-theme-for-mastodon-dev/icons.scss   | 24 ++++++++++++++-----
 .../settings.scss                             |  1 +
 .../statuses.scss                             |  2 ++
 16 files changed, 142 insertions(+), 38 deletions(-)

diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
index 6907a668f..250491a45 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
@@ -46,6 +46,7 @@ $account-foreground-color: $base-darker1-color;
 $card-color: $base-lighter1-color;
 $card-hover-color: $column-header-hover-color;
 $card-image-color: $base-color;
+$warning-card-color: #26a69a;
 
 $form-color: rgba(0, 0, 0, 0.1);
 $form-focused-color: lighten($form-color, 20%);
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
index 984a8c9ae..7c4bcb5bf 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
@@ -74,7 +74,10 @@
 						}
 
 						&__buttons {
-							.icon-button { border: 0 }
+							.icon-button { 
+								border: 0;
+								border-radius: 50%;
+							}
 						}
 
 						&__name {
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
index 8fbd6be10..ce5f082b1 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
@@ -9,7 +9,6 @@
 	margin: 0;
 	background: $column-header-color;
 	position: relative;
-	z-index: 2;
 
 	.tabs-bar {
 		&__link {
@@ -81,8 +80,11 @@
 			}
 		}
 
+		&__warning {
+			background-color: $warning-card-color;
+		}
+
 		&__publish { border-top: 1px solid $base-separation-color }
-		&__publish-button-wrapper { @include button-shadow }
 		&__modifiers { background-color: $base-lighter1-color }
 	}
 
@@ -100,7 +102,6 @@
 	.column-header {
 		@include column-shadow;
 		background: $column-header-color;
-		z-index: 1;
 
 		&.active {
 			.column-header__icon {
@@ -151,6 +152,9 @@
 	}
 
 	.column-back-button {
+		background-color: $column-header-color;
+		color: $secondary-text-color;
+
 		&__icon {
 			@include material-icon-large;
 			vertical-align: bottom;
@@ -228,11 +232,10 @@
 	}
 }
 
-// v2.9.0以降
+// v2.9.0以降に対応
 .column-header {
 	@include column-shadow;
 	background: $column-header-color;
-	z-index: 1;
 
 	&.active {
 		.column-header__icon {
@@ -281,6 +284,16 @@
 		&-inner { background: $column-header-color }
 	}
 }
+.column-back-button {
+	background-color: $column-header-color;
+	color: $secondary-text-color;
+
+	&__icon {
+		@include material-icon-large;
+		vertical-align: bottom;
+		margin-right: 8px;
+	}
+}
 
 .getting-started {
 	&__wrapper,
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
index 2b6644215..8abd2ad5e 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
@@ -29,14 +29,32 @@
 		color: $primary-lighter1-text-color;
 		border-radius: 50%;
 	}
+
+	.button--block { @include button-shadow }
+
+	.button-secondary {
+		background-color: $primary-lighter1-text-color;
+		border: 0px;
+	}
 }
 
 .modal-root {
 	&__modal {
 		.media-modal {
 			&__close.icon-button {
-				font-size: 40px !important;
+				font-size: 40px;
+				width: 40px;
+				height: 40px;
+
+				&:hover {
+					background-color: darken($base-lighter1-color, 40%);
+				}
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
+// DOM操作によりpaddingが調整できないもの
+.privacy-dropdown__value-icon.icon-button.inverted,
+.compose-form__poll-button-icon.icon-button.inverted,
+.compose-form__upload-button-icon.icon-button.inverted { padding: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
index a9c6dc5ef..b84fae3be 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
@@ -6,6 +6,13 @@
 
 .dropdown-menu {
 	background-color: $column-header-color;
+
+		&__arrow {
+			&.top { border-top-color: $column-header-color }
+			&.bottom { border-bottom-color: $column-header-color }
+		}
+
+		&__separator { margin: 4px 0 }
 }
 
 .dropdown-menu,
@@ -16,11 +23,6 @@
 		background: $base-lighter1-color;
 
 		.dropdown-menu {
-			&__arrow {
-				&.top { border-top-color: $column-header-color }
-				&.bottom { border-bottom-color: $column-header-color }
-			}
-
 			&__item {
 				a {
 					color: $primary-lighter2-text-color;
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
index d28fa367d..ee45f5712 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
@@ -25,9 +25,12 @@
 .icon-button {
 	color: $icon-color;
 	border-radius: 50%;
+	width: 28px !important; // UIの密度が下がる代わりに、ホバー時に正常に表示
+	height: 28px !important; // !importantを付けないと動作しない…?
 
 	&:active,
-	&:focus,
+	&:focus { background-color: transparent }
+
 	&:hover {
 		color: lighten($icon-color, 7%);
 		background-color: $column-header-hover-color;
@@ -43,9 +46,9 @@
 		.fa.fa-star { vertical-align: top }
 	}
 
-	&.inverted {
-		color: $icon-color;
-	}
+	&.inverted { color: $icon-color }
+
+	&.overlayed { border-radius: 50% }
 
 	&.disabled {
 		color: lighten($icon-color, 13%);
@@ -175,7 +178,7 @@
 	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
 	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
 	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
-	&.fa-desktop::before { content: "desktop-windows" } //外観設定のアイコン
+	&.fa-desktop::before { content: "desktop_windows" } //外観設定のアイコン
 	&.fa-code::before { content: "code" } //開発アイコン
 	&.fa-list::before { content: "list" } //リストアイコン
 	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
@@ -186,8 +189,17 @@
 .fa {
 	&.fa-chevron-left,
 	&.fa-chevron-right,
-	&.fa.fa-times {
+	&.fa-plus {
 		@include material-icon-large;
 		vertical-align: bottom;
 	}
+
+	&.fa-times {
+		@include material-icon-large;
+		vertical-align: top;
+		&.fa-fw {
+			font-size: 24px;
+			vertical-align: 8px;
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
index 308c7e6a0..bfabd1e6e 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
@@ -149,6 +149,7 @@ body.admin {
 
 	button {
 		@include button-shadow;
+		background-color: $active-button-color;
 	}
 }
 
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
index 6746032b4..b3f5ffae3 100644
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
+++ b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
@@ -23,6 +23,8 @@
 
 			&__content { color: $primary-text-color }
 		}
+
+		.display-name strong { color: $primary-text-color }
 	}
 
 	&.status-direct {
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
index 77a68f3b8..8ae2a027a 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
@@ -46,6 +46,7 @@ $account-foreground-color: $base-darker1-color;
 $card-color: $base-lighter1-color;
 $card-hover-color: $column-header-hover-color;
 $card-image-color: $base-color;
+$warning-card-color: #26a69a;
 
 $form-color: rgba(0, 0, 0, 0.1);
 $form-focused-color: lighten($form-color, 20%);
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
index 984a8c9ae..7c4bcb5bf 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
@@ -74,7 +74,10 @@
 						}
 
 						&__buttons {
-							.icon-button { border: 0 }
+							.icon-button { 
+								border: 0;
+								border-radius: 50%;
+							}
 						}
 
 						&__name {
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
index 8fbd6be10..ce5f082b1 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
@@ -9,7 +9,6 @@
 	margin: 0;
 	background: $column-header-color;
 	position: relative;
-	z-index: 2;
 
 	.tabs-bar {
 		&__link {
@@ -81,8 +80,11 @@
 			}
 		}
 
+		&__warning {
+			background-color: $warning-card-color;
+		}
+
 		&__publish { border-top: 1px solid $base-separation-color }
-		&__publish-button-wrapper { @include button-shadow }
 		&__modifiers { background-color: $base-lighter1-color }
 	}
 
@@ -100,7 +102,6 @@
 	.column-header {
 		@include column-shadow;
 		background: $column-header-color;
-		z-index: 1;
 
 		&.active {
 			.column-header__icon {
@@ -151,6 +152,9 @@
 	}
 
 	.column-back-button {
+		background-color: $column-header-color;
+		color: $secondary-text-color;
+
 		&__icon {
 			@include material-icon-large;
 			vertical-align: bottom;
@@ -228,11 +232,10 @@
 	}
 }
 
-// v2.9.0以降
+// v2.9.0以降に対応
 .column-header {
 	@include column-shadow;
 	background: $column-header-color;
-	z-index: 1;
 
 	&.active {
 		.column-header__icon {
@@ -281,6 +284,16 @@
 		&-inner { background: $column-header-color }
 	}
 }
+.column-back-button {
+	background-color: $column-header-color;
+	color: $secondary-text-color;
+
+	&__icon {
+		@include material-icon-large;
+		vertical-align: bottom;
+		margin-right: 8px;
+	}
+}
 
 .getting-started {
 	&__wrapper,
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
index 2b6644215..8abd2ad5e 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
@@ -29,14 +29,32 @@
 		color: $primary-lighter1-text-color;
 		border-radius: 50%;
 	}
+
+	.button--block { @include button-shadow }
+
+	.button-secondary {
+		background-color: $primary-lighter1-text-color;
+		border: 0px;
+	}
 }
 
 .modal-root {
 	&__modal {
 		.media-modal {
 			&__close.icon-button {
-				font-size: 40px !important;
+				font-size: 40px;
+				width: 40px;
+				height: 40px;
+
+				&:hover {
+					background-color: darken($base-lighter1-color, 40%);
+				}
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
+// DOM操作によりpaddingが調整できないもの
+.privacy-dropdown__value-icon.icon-button.inverted,
+.compose-form__poll-button-icon.icon-button.inverted,
+.compose-form__upload-button-icon.icon-button.inverted { padding: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
index a9c6dc5ef..b84fae3be 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
@@ -6,6 +6,13 @@
 
 .dropdown-menu {
 	background-color: $column-header-color;
+
+		&__arrow {
+			&.top { border-top-color: $column-header-color }
+			&.bottom { border-bottom-color: $column-header-color }
+		}
+
+		&__separator { margin: 4px 0 }
 }
 
 .dropdown-menu,
@@ -16,11 +23,6 @@
 		background: $base-lighter1-color;
 
 		.dropdown-menu {
-			&__arrow {
-				&.top { border-top-color: $column-header-color }
-				&.bottom { border-bottom-color: $column-header-color }
-			}
-
 			&__item {
 				a {
 					color: $primary-lighter2-text-color;
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
index d28fa367d..ee45f5712 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
@@ -25,9 +25,12 @@
 .icon-button {
 	color: $icon-color;
 	border-radius: 50%;
+	width: 28px !important; // UIの密度が下がる代わりに、ホバー時に正常に表示
+	height: 28px !important; // !importantを付けないと動作しない…?
 
 	&:active,
-	&:focus,
+	&:focus { background-color: transparent }
+
 	&:hover {
 		color: lighten($icon-color, 7%);
 		background-color: $column-header-hover-color;
@@ -43,9 +46,9 @@
 		.fa.fa-star { vertical-align: top }
 	}
 
-	&.inverted {
-		color: $icon-color;
-	}
+	&.inverted { color: $icon-color }
+
+	&.overlayed { border-radius: 50% }
 
 	&.disabled {
 		color: lighten($icon-color, 13%);
@@ -175,7 +178,7 @@
 	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
 	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
 	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
-	&.fa-desktop::before { content: "desktop-windows" } //外観設定のアイコン
+	&.fa-desktop::before { content: "desktop_windows" } //外観設定のアイコン
 	&.fa-code::before { content: "code" } //開発アイコン
 	&.fa-list::before { content: "list" } //リストアイコン
 	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
@@ -186,8 +189,17 @@
 .fa {
 	&.fa-chevron-left,
 	&.fa-chevron-right,
-	&.fa.fa-times {
+	&.fa-plus {
 		@include material-icon-large;
 		vertical-align: bottom;
 	}
+
+	&.fa-times {
+		@include material-icon-large;
+		vertical-align: top;
+		&.fa-fw {
+			font-size: 24px;
+			vertical-align: 8px;
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
index 308c7e6a0..bfabd1e6e 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
@@ -149,6 +149,7 @@ body.admin {
 
 	button {
 		@include button-shadow;
+		background-color: $active-button-color;
 	}
 }
 
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
index 6746032b4..b3f5ffae3 100644
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
+++ b/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
@@ -23,6 +23,8 @@
 
 			&__content { color: $primary-text-color }
 		}
+
+		.display-name strong { color: $primary-text-color }
 	}
 
 	&.status-direct {

From 30ce8dd0dc4ccaca6d1624437f67ac0fc286234d Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 2 Sep 2019 12:49:19 +0900
Subject: [PATCH 018/200] =?UTF-8?q?=E6=8A=95=E7=A8=BF=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8A=E9=99=90=E3=82=922048=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/validators/status_length_validator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 93bae2fa8..3cae672ae 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StatusLengthValidator < ActiveModel::Validator
-  MAX_CHARS = 500
+  MAX_CHARS = 2048
 
   def validate(status)
     return unless status.local? && !status.reblog?

From 83e9ccd514d3a83fbaa769364510d16d5996bba6 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Sat, 1 Feb 2020 16:54:22 +0900
Subject: [PATCH 019/200] delete google-plus theme

---
 .../dark-gplus-theme-for-mastodon-dev.scss    |  24 --
 .../_functions.scss                           |  15 -
 .../_mixins.scss                              |  13 -
 .../_variables.scss                           |  99 ------
 .../about.scss                                | 138 --------
 .../accounts.scss                             | 194 ----------
 .../basics.scss                               |  47 ---
 .../columns.scss                              | 335 ------------------
 .../components-button.scss                    |  60 ----
 .../components-card.scss                      |  38 --
 .../components-dropdown.scss                  |  71 ----
 .../components-status-card.scss               |  12 -
 .../components.scss                           |   6 -
 .../emoji-picker.scss                         |  68 ----
 .../explore.scss                              |  47 ---
 .../icons.scss                                | 205 -----------
 .../keyboard_shortcuts.scss                   |  21 --
 .../lists.scss                                |  55 ---
 .../notifications.scss                        |  27 --
 .../profile.scss                              | 232 ------------
 .../searches.scss                             |  41 ---
 .../settings-account.scss                     |  54 ---
 .../settings-dashboard.scss                   |  30 --
 .../settings-directory_tag.scss               |  21 --
 .../settings-log.scss                         |  30 --
 .../settings-report.scss                      |  75 ----
 .../settings.scss                             | 245 -------------
 .../statuses.scss                             | 123 -------
 .../tables.scss                               |  29 --
 .../styles/gplus-theme-for-mastodon-dev.scss  |  24 --
 .../_functions.scss                           |  15 -
 .../gplus-theme-for-mastodon-dev/_mixins.scss |  13 -
 .../_variables.scss                           |  99 ------
 .../gplus-theme-for-mastodon-dev/about.scss   | 138 --------
 .../accounts.scss                             | 194 ----------
 .../gplus-theme-for-mastodon-dev/basics.scss  |  47 ---
 .../gplus-theme-for-mastodon-dev/columns.scss | 335 ------------------
 .../components-button.scss                    |  60 ----
 .../components-card.scss                      |  38 --
 .../components-dropdown.scss                  |  71 ----
 .../components-status-card.scss               |  12 -
 .../components.scss                           |   6 -
 .../emoji-picker.scss                         |  68 ----
 .../gplus-theme-for-mastodon-dev/explore.scss |  47 ---
 .../gplus-theme-for-mastodon-dev/icons.scss   | 205 -----------
 .../keyboard_shortcuts.scss                   |  21 --
 .../gplus-theme-for-mastodon-dev/lists.scss   |  55 ---
 .../notifications.scss                        |  27 --
 .../gplus-theme-for-mastodon-dev/profile.scss | 232 ------------
 .../searches.scss                             |  41 ---
 .../settings-account.scss                     |  54 ---
 .../settings-dashboard.scss                   |  30 --
 .../settings-directory_tag.scss               |  21 --
 .../settings-log.scss                         |  30 --
 .../settings-report.scss                      |  75 ----
 .../settings.scss                             | 245 -------------
 .../statuses.scss                             | 123 -------
 .../gplus-theme-for-mastodon-dev/tables.scss  |  29 --
 .../styles/gplus-theme-for-mastodon.scss      |  22 --
 .../gplus-theme-for-mastodon/_mixins.scss     |  11 -
 .../gplus-theme-for-mastodon/_variables.scss  |  81 -----
 .../gplus-theme-for-mastodon/about.scss       | 138 --------
 .../gplus-theme-for-mastodon/accounts.scss    | 109 ------
 .../gplus-theme-for-mastodon/basics.scss      |  47 ---
 .../gplus-theme-for-mastodon/columns.scss     | 197 ----------
 .../components-button.scss                    |  11 -
 .../components-card.scss                      |  37 --
 .../components-dropdown.scss                  |  42 ---
 .../gplus-theme-for-mastodon/components.scss  |   5 -
 .../gplus-theme-for-mastodon/explore.scss     |  38 --
 .../gplus-theme-for-mastodon/icons.scss       |  97 -----
 .../gplus-theme-for-mastodon/lists.scss       |  34 --
 .../notifications.scss                        |  27 --
 .../gplus-theme-for-mastodon/profile.scss     | 231 ------------
 .../gplus-theme-for-mastodon/searches.scss    |  41 ---
 .../settings-account.scss                     |  44 ---
 .../settings-dashboard.scss                   |  28 --
 .../settings-report.scss                      |  63 ----
 .../gplus-theme-for-mastodon/settings.scss    | 208 -----------
 .../gplus-theme-for-mastodon/statuses.scss    | 107 ------
 .../gplus-theme-for-mastodon/tables.scss      |  29 --
 config/locales/en.yml                         |   3 -
 config/locales/ja.yml                         |   3 -
 config/themes.yml                             |   3 -
 84 files changed, 6366 deletions(-)
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
 delete mode 100644 app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/about.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/basics.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/columns.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/components.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/explore.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/icons.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/lists.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/profile.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/searches.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/settings.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
 delete mode 100644 app/javascript/styles/gplus-theme-for-mastodon/tables.scss

diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
deleted file mode 100644
index 8c2471deb..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Google+ Theme for Mastodon v1.1
- * Copyright (C) 2018-2019 Genbu Project
- */
-
-@charset "UTF-8";
-
-// @import 'application';
-@import 'application';
-@import 'dark-gplus-theme-for-mastodon-dev/basics';
-@import 'dark-gplus-theme-for-mastodon-dev/components';
-@import 'dark-gplus-theme-for-mastodon-dev/emoji-picker';
-@import 'dark-gplus-theme-for-mastodon-dev/tables';
-@import 'dark-gplus-theme-for-mastodon-dev/columns';
-@import 'dark-gplus-theme-for-mastodon-dev/lists';
-@import 'dark-gplus-theme-for-mastodon-dev/accounts';
-@import 'dark-gplus-theme-for-mastodon-dev/statuses';
-@import 'dark-gplus-theme-for-mastodon-dev/notifications';
-@import 'dark-gplus-theme-for-mastodon-dev/searches';
-@import 'dark-gplus-theme-for-mastodon-dev/settings';
-@import 'dark-gplus-theme-for-mastodon-dev/icons';
-@import 'dark-gplus-theme-for-mastodon-dev/profile';
-@import 'dark-gplus-theme-for-mastodon-dev/about';
-@import 'dark-gplus-theme-for-mastodon-dev/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
deleted file mode 100644
index e5aea0e4e..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_functions.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@charset "UTF-8";
-
-
-
-@function adjust-lightness ($color, $lightness) {
-	@if (lightness($color) - $lightness <= 0 and lightness($color) + $lightness < 100) {
-		@return lighten($color, $lightness);
-	}
-
-	@if (0 < lightness($color) - $lightness and 100 <= lightness($color) + $lightness) {
-		@return darken($color, $lightness);
-	}
-
-	@return change-color($color, $lightness: $lightness);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
deleted file mode 100644
index 400a1ac90..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_mixins.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
-@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
-@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
-@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
-@mixin material-border { border-radius: 4px }
-@mixin material-card-radius { border-radius: 2px }
-@mixin material-icon-large { font-size: 20px }
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
deleted file mode 100644
index 250491a45..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/_variables.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "UTF-8";
-
-
-
-// Base colors
-$active-color: #db4437;
-$accent-color: #fbbc04;
-$valid-color: #4285f4;
-$error-color: #d50000;
-$checked-color: #4285f4;
-$verified-color: #4caf50;
-
-
-// Text colors
-$primary-text-color: #ffffff;
-$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
-$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
-$secondary-text-color: #2196F3; // ex: リンク
-$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
-$light-text-color: #000000;
-$light-darker1-text-color: darken($light-text-color, 15%);
-$active-text-color: $active-color;
-$error-text-color: $error-color;
-
-
-// Icon colors
-$icon-color: #BDBDBD;
-$icon-active-color: $active-color;
-
-
-// Background colors
-$base-color: #121212;
-$base-lighter1-color: #2d2d2d;
-$base-darker1-color: #000000;
-
-$column-header-color: $base-lighter1-color;
-$column-header-hover-color: change-color($color: $column-header-color, $lightness: 10%);
-
-$status-color: $base-lighter1-color;
-$status-direct-color: darken($status-color, 5%);
-$status-actionbar-color: darken($status-color, 2%);
-
-$account-color: $base-lighter1-color;
-$account-foreground-color: $base-darker1-color;
-
-$card-color: $base-lighter1-color;
-$card-hover-color: $column-header-hover-color;
-$card-image-color: $base-color;
-$warning-card-color: #26a69a;
-
-$form-color: rgba(0, 0, 0, 0.1);
-$form-focused-color: lighten($form-color, 20%);
-$trend-color: $base-lighter1-color;
-
-$setting-base-color: $base-color;
-$setting-lists-selected-color: darken($base-color, 2%);
-$setting-lists-hover-color: darken($base-color, 5%);
-$setting-content-base-color: $base-lighter1-color;
-
-$setting-toggle-color: #b9b9b9;
-$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
-$setting-toggle-thumb-color: #fafafa;
-$setting-toggle-thumb-checked-color: $checked-color;
-
-$setting-emphasis-color: $verified-color;
-
-$dashboard-counters-base-color: $base-color;
-$dashboard-counters-hover-color: lighten($base-color, 2%);
-
-$log-entry-color: $base-lighter1-color;
-$log-entry-extra-color: $base-color;
-$log-entry-extra--neutral-color: $valid-color;
-$log-entry-extra--old-color: $active-color;
-$log-entry-extra--new-color: $verified-color;
-
-$explore-header-color: lighten($accent-color, 16%);
-$explore-directory-color: $base-lighter1-color;
-
-$active-button-color: $valid-color; //文字入りボタン
-$non-active-button-color: lighten($base-color, 20%);
-
-$floating-acton-button-hover-color: lighten($active-color, 10%);
-
-
-// Shadow colors
-$column-header-shadow-color: rgba(0, 0, 0, 0.3);
-$status-shadow-color: rgba(0, 0, 0, 0.14);
-$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
-$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
-$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
-$button-shadow-color: rgba(0, 0, 0, 0.4);
-
-
-// Separation colors
-$base-separation-color: rgba(0, 0, 0, 0.14);
-
-
-//Border colors
-$non-elevated-card-boader : #e0e0e0;
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
deleted file mode 100644
index de48883a8..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/about.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-// from mastodon/about.scss
-$column-breakpoint: 700px;
-
-
-
-.landing-page {
-	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
-	p { color: $primary-lighter1-text-color }
-	em { color: $primary-text-color }
-
-	.column-0 { background: $base-darker1-color }
-	.column-2 {
-		.landing-page {
-			&__information { padding: 0 }
-
-			&__short-description {
-				& > .row:first-child {
-					background: $base-darker1-color;
-					padding: 10px 20px;
-				}
-
-				& > * {
-					padding-left: 40px; padding-right: 40px;
-					&:last-child { padding-bottom: 45px }
-
-					@media screen and (max-width: $column-breakpoint) {
-						padding-left: 20px; padding-right: 20px;
-						&:last-child { padding-bottom: 25px }
-					}
-				}
-			}
-		}
-	}
-
-	&__forms,
-	&__information,
-	&__call-to-action {
-		@include status-shadow;
-		background: $column-header-color;
-	}
-
-	&__forms {
-		padding: 0;
-
-		& > *:first-child { margin: inherit }
-		& > * { margin-left: 20px; margin-right: 20px; }
-
-		.brand { background: $base-darker1-color }
-
-		form {
-			& > .input input {
-				background: $form-color;
-
-				&:focus { background: $form-focused-color }
-			}
-		}
-
-		.separator-or {
-			margin-left: 20px; margin-right: 20px;
-			
-			span {
-				color: $primary-lighter1-text-color;
-				background: $column-header-color;
-			}
-		}
-
-		@media screen and (max-width: $column-breakpoint) {
-			background: inherit;
-			box-shadow: none;
-
-			.separator-or span { background: $base-color }
-		}
-	}
-
-	&__information {
-		color: $primary-lighter1-text-color;
-
-		&.contact-widget {
-			@include status-shadow;
-			background: $column-header-color;
-
-			.contact-widget {
-				&__mail {
-					a { color: $primary-text-color }
-				}
-			}
-		}
-
-		strong { color: inherit }
-
-		.row:first-child {
-			h1 small {
-				color: $light-darker1-text-color;
-
-				span { color: $light-text-color }
-			}
-		}
-	}
-
-	&__call-to-action {
-		.row__information-board {
-			.information-board__section {
-				color: $primary-lighter2-text-color;
-
-				& > span:last-child { color: $primary-lighter1-text-color }
-			}
-		}
-	}
-
-	&__features {
-		.features-list {
-			.features-list__row {
-				.text { color: $primary-lighter1-text-color }
-				.visual .fa { color: $icon-color }
-			}
-		}
-	}
-
-	&__footer { color: $primary-lighter1-text-color }
-
-	#mastodon-timeline {
-		color: $primary-text-color;
-		background: transparent;
-
-		p {
-			color: $primary-text-color;
-
-			a { color: $secondary-text-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
deleted file mode 100644
index 7c4bcb5bf..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/accounts.scss
+++ /dev/null
@@ -1,194 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.account {
-	background: $account-color;
-	border-color: $base-separation-color;
-
-	.account {
-		&__display-name {
-			color: $secondary-text-color;
-			strong { color: $primary-text-color }
-		}
-	}
-
-	&-role {
-		color: $primary-lighter2-text-color;
-		background-color: rgba($base-separation-color, 0.1);
-		border-color: rgba($base-separation-color, 0.5);
-	}
-}
-
-.column {
-	> .column-back-button {
-		@include column-shadow;
-		background: $column-header-color;
-	}
-}
-
-.account-timeline__header {
-	.account__header {
-		background-color: $account-foreground-color;
-
-		> div { background-color: inherit } // -> v2.7.4
-
-		.account__header {
-			&__username { color: $secondary-lighter1-text-color }
-			&__fields { @extend .account__header__fields; }
-
-			&__image { // v2.8.0 ->
-				&::after {
-					content: "";
-
-					position: absolute;
-					top: auto;
-					left: 0;
-					bottom: 0;
-	
-					width: 100%;
-					height: 30%;
-					background: $account-header-image-shadow-color;
-					box-shadow: none;
-				}
-
-				> img:not([src]),
-				> img[src$="/headers/original/missing.png"] {
-					content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-				}
-			}
-
-			&__bar { // v2.8.0 ->
-				background-color: $base-lighter1-color;
-
-				.account__header {
-					&__tabs {
-						.avatar {
-							.account__avatar {
-								border-color: $base-lighter1-color;
-								border-radius: 50%;
-							}
-						}
-
-						&__buttons {
-							.icon-button { 
-								border: 0;
-								border-radius: 50%;
-							}
-						}
-
-						&__name {
-							h1 { color: $primary-text-color }
-							small { color: $secondary-text-color }
-						}
-					}
-
-					&__bio {
-						.account__header {
-							&__content { color: $primary-text-color }
-							&__fields { border-color: $base-separation-color }
-						}
-					}
-
-					&__extra {
-						&__links {
-							&, a { color: $primary-lighter1-text-color }
-							strong { color: $primary-lighter2-text-color }
-						}
-					}
-				}
-			}
-		}
-
-		.account--action-button {
-			.icon-button:not(.active) {
-				color: darken($light-text-color, 7%);
-
-				&:active,
-				&:focus,
-				&:hover {
-					color: $light-text-color;
-				}
-			}
-		}
-	}
-
-	.account {
-		&__disclaimer,
-		&__action-bar,
-		&__section-headline {
-			background: $base-lighter1-color;
-			border-color: $base-separation-color;
-		}
-
-		&__action-bar {
-			&__tab {
-				border-color: $base-separation-color;
-				&.active { border-bottom-color: $active-color }
-	
-				> span { color: $primary-lighter1-text-color }
-			}
-		}
-	
-		&__section-headline {
-			a {
-				color: $primary-text-color;
-	
-				&.active {
-					color: $active-color;
-	
-					&::before { border-color: transparent transparent $base-separation-color }
-					&::after { border-color: transparent transparent $status-color }
-				}
-			}
-		}
-	}
-}
-
-.account-authorize__wrapper {
-	@include status-shadow;
-	background: $base-lighter1-color;
-
-	&:focus { @include status-focus-shadow; }
-
-	.account {
-		&__header__content {
-			color: $primary-lighter2-text-color;
-		}
-	
-		&--panel {
-			background: $account-color;
-			border-color: $base-separation-color;
-		}
-	}
-}
-
-.account__header__fields {
-	dl {
-		border-color: $base-separation-color;
-		
-		dt,
-		dd {
-			color: $primary-text-color;
-			background: $base-lighter1-color;
-		}
-
-		dd {
-			&.verified {
-				border-color: transparentize($valid-color, 0.5);
-				background: transparentize($valid-color, 0.75);
-
-				a { color: lighten($verified-color, 20%) }
-			}
-		}
-	}
-
-	a { color: $secondary-text-color }
-}
-
-.account__action-bar__tab {
-	strong { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
deleted file mode 100644
index a141ecd13..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/basics.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-body {
-	&,
-	.ui {
-		color: $primary-text-color;
-		background: $base-color;
-	}
-}
-
-.focusable {
-	&:focus {
-		background: inherit;
-
-		.status {
-			@include status-focus-shadow;
-
-			&.status-direct { background: $status-direct-color }
-		}
-
-		.detailed-status {
-			& { background: $status-color }
-			&__action-bar { background: $status-actionbar-color }
-		}
-	}
-}
-
-::-webkit-scrollbar-thumb {
-	background: darken($base-lighter1-color, 12%);
-
-	&:hover { background: darken($base-lighter1-color, 16%) }
-	&:active { background: darken($base-lighter1-color, 12%) }
-}
-
-::-webkit-scrollbar-track {
-	background: $base-color;
-
-	&:hover,
-	&:active {
-		background: darken($base-lighter1-color, 8%);
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
deleted file mode 100644
index ce5f082b1..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/columns.scss
+++ /dev/null
@@ -1,335 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.tabs-bar {
-	margin: 0;
-	background: $column-header-color;
-	position: relative;
-
-	.tabs-bar {
-		&__link {
-			color: $icon-color;
-			border-bottom: 4px solid $column-header-color;
-			padding: 15px 10px 11px 10px;
-			
-			&.active {
-				border-bottom: 4px solid $active-color;
-			}
-
-			.fa {
-				@include material-icon-large;
-				vertical-align: top;
-			}
-		}
-	}
-}
-
-.drawer {
-	.drawer {
-		&__header {
-			@include column-shadow;
-			background: $column-header-color;
-	
-			.drawer__tab {
-				@include material-icon-large;
-				color: $icon-color;
-			}
-	
-			a {
-				&:hover { background: $column-header-hover-color }
-			}
-		}
-	
-		&__pager {
-			@include status-shadow;
-			@include material-card-radius;
-			
-			.drawer__inner {
-				background: $column-header-color;
-		
-				&__mastodon { display: none }
-			}
-		}
-	}
-}
-
-.navigation-bar {
-	color: $secondary-text-color;
-	background: $column-header-color;
-
-	.navigation-bar {
-		&__profile {
-			strong { color: $primary-text-color }
-			&-edit { color: $secondary-text-color }
-		}
-	}
-}
-
-
-.compose-form {
-	.compose-form {
-		&__buttons-wrapper {
-			background: $column-header-color;
-
-			&.character-counter__wrapper {
-				.character-counter { color: $primary-lighter1-text-color }
-			}
-		}
-
-		&__warning {
-			background-color: $warning-card-color;
-		}
-
-		&__publish { border-top: 1px solid $base-separation-color }
-		&__modifiers { background-color: $base-lighter1-color }
-	}
-
-	.autosuggest-textarea__textarea {
-		background-color: $base-lighter1-color;
-		color: $primary-text-color;
-	}
-
-	.character-counter {
-		color: $icon-color
-	}
-}
-
-.column {
-	.column-header {
-		@include column-shadow;
-		background: $column-header-color;
-
-		&.active {
-			.column-header__icon {
-				color: $icon-active-color;
-				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
-			}
-		}
-
-		* { background: inherit }
-
-		&__icon {
-			@include material-icon-large;
-			color: $icon-color;
-			vertical-align: bottom;
-			margin-right: 10px;
-		}
-
-		&__buttons {
-			height: 50px;
-
-			.column-header {
-				&__back-button {
-					.column-back-button__icon { vertical-align: bottom }
-				}
-
-				&__button {
-					&.active {
-						color: $icon-active-color;
-						background: inherit;
-					}
-		
-					.fa { vertical-align: unset }
-				}
-			}
-		}
-
-		&__button {
-			color: $icon-color;
-			padding: 0 16px;
-		}
-
-		&__collapsible {
-			color: $secondary-text-color;
-			border-bottom: 1px solid $base-separation-color;
-
-			&-inner { background: $column-header-color }
-		}
-	}
-
-	.column-back-button {
-		background-color: $column-header-color;
-		color: $secondary-text-color;
-
-		&__icon {
-			@include material-icon-large;
-			vertical-align: bottom;
-			margin-right: 8px;
-		}
-	}
-
-	.column {
-		&-subheading,
-		&-link__badge {
-			background: $base-color;
-			color: $secondary-text-color;
-		}
-	
-		&-link {
-			color: $primary-text-color;
-			background: $base-color;
-	
-			&__icon {
-				@include material-icon-large;
-				color: $icon-color;
-				vertical-align: bottom;
-				margin-right: 8px;
-			}
-		}
-	}
-
-	.scrollable {
-		background: transparent;
-
-		*[role="feed"] {
-			article {
-				margin: 1em 0;
-				&:first-of-type { margin: 0 }
-
-				&:focus { outline: none }
-			}
-		}
-
-		div[tabindex="-1"] { margin-bottom: 1em }
-	}
-
-	.notification__filter-bar {
-		background: $column-header-color;
-		border-bottom-color: $base-separation-color;
-
-		button {
-			color: $icon-color;
-			background: $column-header-color;
-
-			&.active {
-				color: $icon-active-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $column-header-color }
-			}
-		}
-	}
-
-	.empty-column-indicator {
-		flex-direction: column;
-		background: $base-color;
-
-		&::before {
-			content: "";
-			display: block;
-
-			width: 100px;
-			height: 100px;
-			margin-bottom: 1em;
-
-			background: none center / contain no-repeat;
-			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
-		}
-	}
-}
-
-// v2.9.0以降に対応
-.column-header {
-	@include column-shadow;
-	background: $column-header-color;
-
-	&.active {
-		.column-header__icon {
-			color: $icon-active-color;
-			text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
-		}
-	}
-
-	* { background: inherit }
-
-	&__icon {
-		@include material-icon-large;
-		color: $icon-color;
-		vertical-align: bottom;
-		margin-right: 10px;
-	}
-
-	&__buttons {
-		height: 50px;
-
-		.column-header {
-			&__back-button {
-				.column-back-button__icon { vertical-align: bottom }
-			}
-
-			&__button {
-				&.active {
-					color: $icon-active-color;
-					background: inherit;
-				}
-	
-				.fa { vertical-align: unset }
-			}
-		}
-	}
-
-	&__button {
-		color: $icon-color;
-		padding: 0 16px;
-	}
-
-	&__collapsible {
-		color: $secondary-text-color;
-		border-bottom: 1px solid $base-separation-color;
-
-		&-inner { background: $column-header-color }
-	}
-}
-.column-back-button {
-	background-color: $column-header-color;
-	color: $secondary-text-color;
-
-	&__icon {
-		@include material-icon-large;
-		vertical-align: bottom;
-		margin-right: 8px;
-	}
-}
-
-.getting-started {
-	&__wrapper,
-	& {
-		background: $base-color;
-	}
-
-	& {
-		border-top: 1px solid $base-separation-color;
-
-		a { color: $primary-text-color }
-	}
-}
-
-.load {
-	&-more,
-	&-gap {
-		background: transparent;
-
-		&:hover { background: darken($column-header-color, 10%) }
-	}
-
-	&-gap { border: 0 }
-}
-
-.confirmation-modal {
-	@include material-card-radius;
-	color: $primary-text-color;
-	background-color: $base-lighter1-color;
-
-	&__action-bar {
-		background-color: $base-lighter1-color;
-	}
-
-	&__cancel-button {
-		color: $primary-lighter1-text-color;
-		box-shadow: 0 2px 5px 0 transparent;
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
deleted file mode 100644
index 8abd2ad5e..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-button.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.floating-action-button {
-	font-size: 24px;
-	background-color: $active-color;
-	width: 3.6rem;
-	height: 3.6rem;
-
-	&:active {
-		background-color: $active-color;
-	}
-
-	&:hover {
-		background-color: $floating-acton-button-hover-color;
-	}
-}
-
-.button {
-	@include button-shadow;
-	@include material-card-radius;
-	background-color: $active-button-color;
-
-	.text-icon-button {
-		color: $primary-lighter1-text-color;
-		border-radius: 50%;
-	}
-
-	.button--block { @include button-shadow }
-
-	.button-secondary {
-		background-color: $primary-lighter1-text-color;
-		border: 0px;
-	}
-}
-
-.modal-root {
-	&__modal {
-		.media-modal {
-			&__close.icon-button {
-				font-size: 40px;
-				width: 40px;
-				height: 40px;
-
-				&:hover {
-					background-color: darken($base-lighter1-color, 40%);
-				}
-			}
-		}
-	}
-}
-
-// DOM操作によりpaddingが調整できないもの
-.privacy-dropdown__value-icon.icon-button.inverted,
-.compose-form__poll-button-icon.icon-button.inverted,
-.compose-form__upload-button-icon.icon-button.inverted { padding: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
deleted file mode 100644
index dc72775a1..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-card.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.card {
-	//border: 1px solid $base-separation-color;
-	//不要(?)
-
-	> a {
-		@include status-shadow;
-
-		&:hover,
-		&:focus,
-		&:active {
-			.card__bar {
-				background: initial;
-
-				.display-name strong { color: $secondary-text-color }
-			}
-		}
-
-		.card__img { background: $card-image-color }
-		.card__bar {
-			background: $card-color;
-	
-			.avatar {
-				img { background: transparent }
-			}
-	
-			.display-name {
-				strong { color: $primary-text-color }
-				span { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
deleted file mode 100644
index b84fae3be..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-dropdown.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-.dropdown-menu {
-	background-color: $column-header-color;
-
-		&__arrow {
-			&.top { border-top-color: $column-header-color }
-			&.bottom { border-bottom-color: $column-header-color }
-		}
-
-		&__separator { margin: 4px 0 }
-}
-
-.dropdown-menu,
-.actions-modal {
-	@include material-card-radius;
-
-	& > ul {
-		background: $base-lighter1-color;
-
-		.dropdown-menu {
-			&__item {
-				a {
-					color: $primary-lighter2-text-color;
-
-					padding: 16px 16px;
-					background: $column-header-color;
-
-					&:active,
-					&:focus,
-					&:hover {
-						color: $primary-text-color;
-						background: $column-header-hover-color;
-					}
-				}
-			}
-
-			&__separator { border-bottom-color: $base-separation-color }
-		}
-
-		& > li:not(:empty) {
-			@extend .dropdown-menu__item;
-
-			a {
-				padding: 12px 16px;
-				color: $primary-text-color;
-
-				&:hover {
-					color: $primary-text-color;
-					background-color: $column-header-hover-color;
-				}
-			}
-		}
-	}
-
-	.status {
-		background-color: $base-lighter1-color;
-		padding-top: 16px;
-		padding-bottom: 16px;
-		padding-right: 16px;
-		padding-left: 74px;
-
-		&__avatar {
-			top: 16px;
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
deleted file mode 100644
index 9b64572f9..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components-status-card.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.status-card {
-	color: $primary-lighter1-text-color;
-	&__title, &__description { color: $primary-lighter2-text-color }
-
-	&__image { background: transparent }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
deleted file mode 100644
index e735b108d..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/components.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@charset "UTF-8";
-
-@import 'components-button';
-@import 'components-card';
-@import 'components-dropdown';
-@import 'components-status-card';
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
deleted file mode 100644
index 0937158bf..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/emoji-picker.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.emoji-mart {
-    &-bar {
-        border: 0 solid $base-separation-color;
-
-        &:first-child {
-            border-top-left-radius: 2px;
-            border-top-right-radius: 2px;
-            background-color: $base-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-color;
-    }
-    &-anchor {
-        &-selected {
-            color: $icon-active-color;
-
-            &:hover {
-                color: $icon-active-color;
-            }
-        }
-
-        &-bar {
-            background-color: $icon-active-color;
-        }
-    }
-
-    &-search {
-        background-color: $base-lighter1-color;
-    }
-    &-search input {
-        color: $primary-text-color;
-        background-color: $form-color;
-        border: 0px solid #ffffff00;
-    }
-
-    &-category-label span {
-        color: $primary-text-color;
-        background-color: $base-lighter1-color;
-    }
-
-    &-scroll {
-        background-color: $base-lighter1-color;
-    }
-}
-
-.emoji-picker-dropdown {
-    &__modifiers {
-        &__menu {
-            @include status-shadow;
-            @include material-card-radius;
-            background-color: $base-lighter1-color;
-        }
-    }
-
-    &__menu {
-        @include column-shadow;
-        background-color: $base-lighter1-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
deleted file mode 100644
index ae80b3884..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/explore.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.public-layout {
-	.page-header {
-		background: $explore-header-color;
-
-		h1 { color: $primary-text-color }
-		p { color: $primary-lighter2-text-color }
-	}
-
-	.directory,
-	.notice-widget { @include column-shadow; }
-
-	.directory {
-		background: $explore-directory-color;
-
-		.accounts-table {
-			&__count {
-				color: $primary-lighter2-text-color;
-				small { color: $primary-lighter1-text-color }
-			}
-		}
-
-		&__tag {
-			& > a {
-				@include status-shadow;
-				background: $explore-directory-color;
-			}
-
-			h4 { color: $primary-lighter2-text-color }
-			.fa, small { color: $primary-lighter1-text-color }
-			.trends__item__current { color: $primary-text-color }
-		}
-	}
-
-	.notice-widget {
-		color: $primary-lighter1-text-color;
-		background: $explore-directory-color;
-
-		a { color: $secondary-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
deleted file mode 100644
index ee45f5712..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/icons.scss
+++ /dev/null
@@ -1,205 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@function hex-color($color) {
-	@if type-of($color) == 'color' {
-		$color: str-slice(ie-hex-str($color), 4);
-	}
-
-	@return '%23' + unquote($color)
-};
-
-
-
-@font-face {
-	font-family: "Material Icons Extended";
-	src:
-		local("Material Icons Extended"),
-		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
-		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
-}
-
-.icon-button {
-	color: $icon-color;
-	border-radius: 50%;
-	width: 28px !important; // UIの密度が下がる代わりに、ホバー時に正常に表示
-	height: 28px !important; // !importantを付けないと動作しない…?
-
-	&:active,
-	&:focus { background-color: transparent }
-
-	&:hover {
-		color: lighten($icon-color, 7%);
-		background-color: $column-header-hover-color;
-	}
-
-	&.star-icon {
-		&.active {
-			color: $light-text-color;
-			background: $icon-active-color;
-			border-radius: 50%;
-		}
-
-		.fa.fa-star { vertical-align: top }
-	}
-
-	&.inverted { color: $icon-color }
-
-	&.overlayed { border-radius: 50% }
-
-	&.disabled {
-		color: lighten($icon-color, 13%);
-
-		.fa.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-		}
-	}
-
-	.fa {
-		@include material-icon-large;
-		vertical-align: middle;
-
-		&.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			
-			&:active,
-			&:hover,
-			&:focus {
-				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			}
-		}
-	}
-}
-
-.fa {
-	&.fa-users,
-	&.fa-globe,
-	&.fa-cog,
-	&.fa-cogs,
-	&.fa-gears,
-	&.fa-sign-out,
-	&.fa-star,
-	&.fa-reply,
-	&.fa-reply-all,
-	&.fa-mail-reply,
-	&.fa-mail-reply-all,
-	&.fa-envelope,
-	&.fa-bookmark,
-	&.fa-home,
-	&.fa-bell,
-	&.fa-eraser,
-	&.fa-ellipsis-h,
-	&.fa-ellipsis-v,
-	&.fa-address-book,
-	&.fa-thumb-tack,
-	&.fa-lock,
-	&.fa-pencil,
-	&.fa-chevron-left,
-	&.fa-chevron-right,
-	&.fa-camera,
-	&.fa-tasks,
-	&.fa-sliders,
-	&.fa-fire,
-	&.fa-list-ul,
-	&.fa-search,
-	&.fa-close,
-	&.fa-remove,
-	&.fa-times,
-	&.fa-user,
-	&.fa-mobile-phone,
-	&.fa-mobile,
-	&.fa-filter,
-	&.fa-user-plus,
-	&.fa-cloud-upload,
-	&.fa-cloud-download,
-	&.fa-eye,
-	&.fa-eye-slash,
-	&.fa-share-alt,
-	&.fa-chevron-down,
-	&.fa-bars,
-	&.fa-navicon,
-	&.fa-reorder,
-	&.fa-desktop,
-	&.fa-code,
-	&.fa-list,
-	&.fa-paperclip,
-	&.fa-plus,
-	&.fa-bullhorn {
-		font-family: "Material Icons Extended";
-	}
-
-	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
-	&.fa-globe::before { content: "public" } // 地球マーク(.drawer__header > .drawer__tab:3)
-	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
-	&.fa-cogs::before { content: "settings" } //歯車マーク(モバイル)
-	&.fa-gears::before { content: "settings" } //歯車マーク(モバイル)
-	&.fa-sign-out::before { content: "exit_to_app" } //サインアウト
-	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
-	&.fa-reply::before { content: "reply" } //返信ボタン
-	&.fa-reply-all::before { content: "reply_all" } //全員に返信ボタン
-	&.fa-mail-reply::before { content: "reply" } //返信ボタン
-	&.fa-mail-reply-all::before { content: "reply_all" } //全員に返信ボタン
-	&.fa-envelope::before { content: "mail" } //ダイレクトメッセージボタン
-	&.fa-bookmark::before { content: "bookmark" } //ブックマークボタン
-	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
-	&.fa-bell::before { content: "notifications" } // ベルマーク(通知)
-	&.fa-eraser::before { content: "clear_all" } // 通知を消去のマーク
-	&.fa-ellipsis-h::before { content: "more_horiz" } // 三点リーダー(横)
-	&.fa-ellipsis-v::before { content: "more_vert" } // 三点リーダー(縦)
-	&.fa-address-book::before { content: "explore" } // discoverマーク(explore遷移タブ)
-	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
-	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
-	&.fa-pencil::before { content: "create" } // 鉛筆マーク(モバイル用フローティングボタン)
-	&.fa-chevron-left::before { content: "arrow_back" } //戻るボタン
-	&.fa-chevron-right::before { content: "arrow_forward" } //進むボタン
-	&.fa-camera::before { content: "camera_alt" } //メディアを追加ボタン
-	&.fa-tasks::before { content: "poll" } //投票を追加ボタン
-	&.fa-sliders::before { content: "tune" } //設定を表示ボタン
-	&.fa-fire::before { content: "whatshot" } //トレンドマーク
-	&.fa-list-ul::before { content: "list" } //リストマーク
-	&.fa-search::before { content: "search" } //検索アイコン(モバイル、トップバー内)
-	&.fa-close::before { content: "close" } //閉じるボタン
-	&.fa-remove::before { content: "close" } //閉じるボタン
-	&.fa-times::before { content: "close" } //閉じるボタン(メディア)
-	&.fa-user::before { content: "account_circle" } //ユーザーアイコン
-	&.fa-mobile-phone::before { content: "smartphone" } //モバイルアイコン
-	&.fa-mobile::before { content: "smartphone" } //モバイルアイコン
-	&.fa-filter::before { content: "filter_list" } //フィルターアイコン
-	&.fa-user-plus::before { content: "person_add" } //ユーザーの追加アイコン
-	&.fa-cloud-upload::before { content: "cloud_upload" } //インポートアイコン
-	&.fa-cloud-download::before { content: "cloud_download" } //エクスポートアイコン
-	&.fa-eye::before { content: "visibility" } //目のアイコン
-	&.fa-eye-slash::before { content : "visibility_off" } //閉じた目のアイコン
-	&.fa-share-alt::before { content: "share" } //モバイル共有ボタン
-	&.fa-chevron-down::before { content: "keyboard_arrow_down" } //メニューボタン
-	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
-	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
-	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
-	&.fa-desktop::before { content: "desktop_windows" } //外観設定のアイコン
-	&.fa-code::before { content: "code" } //開発アイコン
-	&.fa-list::before { content: "list" } //リストアイコン
-	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
-	&.fa-plus::before { content: "add" } // 追加ボタン
-	&.fa-bullhorn::before { content: "announcement"} //Adminからのお知らせ(一部サーバーのみ)
-}
-
-.fa {
-	&.fa-chevron-left,
-	&.fa-chevron-right,
-	&.fa-plus {
-		@include material-icon-large;
-		vertical-align: bottom;
-	}
-
-	&.fa-times {
-		@include material-icon-large;
-		vertical-align: top;
-		&.fa-fw {
-			font-size: 24px;
-			vertical-align: 8px;
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
deleted file mode 100644
index 6c664b32f..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.keyboard-shortcuts {
-	kbd {
-		@include status-shadow;
-
-		color: $primary-text-color;
-		background-color: $base-lighter1-color;
-		border-color: $base-darker1-color;
-
-		margin: 0 0.25em;
-
-		&:first-child { margin-left: 0 }
-		&:last-child { margin-right: 0 }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
deleted file mode 100644
index 05c29a6df..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/lists.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.column {
-	.column-back-button { background: inherit }
-
-	.column-inline-form {
-		background: $column-header-color;
-
-		label input {
-			color: $secondary-text-color;
-			&:focus { color: $primary-text-color }
-		}
-	}
-
-	.column-inline-form ~ .scrollable {
-		article { margin: 0 }
-	}
-}
-
-.modal-root {
-	.column-inline-form {
-		background: $column-header-color;
-		
-		.setting-text {
-			color: $primary-text-color;
-			&:active, &:focus { color: $primary-lighter2-text-color }
-		}
-	}
-
-	.list-editor {
-		background: $base-color;
-		h4 { background: $column-header-color }
-
-		.drawer__pager {
-			.drawer__inner { background: $column-header-color }
-		}
-	}
-
-	.list-adder {
-		background: $base-color;
-
-		.column-inline-form { border-bottom: 1px solid $base-separation-color }
-
-		&__account,
-		&__lists { background: $column-header-color }
-
-		&__lists {
-			.list { border-color: $base-separation-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
deleted file mode 100644
index bab098372..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/notifications.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.notification {
-	&.notification-favourite {
-		.status {
-			&.status-direct { background: transparent }
-		}
-	}
-
-	> .notification__message {
-		color: $primary-lighter2-text-color;
-		font-size: 13px;
-		padding: 8px 0;
-
-		.notification__display-name {
-			&:hover { color: inherit }
-		}
-
-		.notification__favourite-icon-wrapper {
-			.star-icon { color: $icon-active-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
deleted file mode 100644
index 246d24b7d..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/profile.scss
+++ /dev/null
@@ -1,232 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.public-layout {
-	a.button {
-		@include button-shadow;
-
-		color: $primary-text-color;
-		background: $base-lighter1-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			background: darken($base-lighter1-color, 8%);
-		}
-	}
-
-	.logo-button {
-		svg path {
-			/* Only for Itabashi-don */
-			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-			&#Mastodon { fill: $base-lighter1-color !important }
-		}
-	}
-
-	.public-account-header {
-		@include status-shadow;
-
-		&__image {
-			background: $base-lighter1-color;
-
-			@media screen and (min-width: 600px) { height: 500px }
-
-			&::after {
-				content: "";
-				
-				position: absolute;
-				top: auto;
-				left: 0;
-				bottom: 0;
-
-				width: 100%;
-				height: 30%;
-				background: $account-header-image-shadow-color;
-				box-shadow: none;
-			}
-
-			> img:not([src]),
-			> img[src="/headers/original/missing.png"] {
-				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-			}
-		}
-
-		&__bar {
-			@media screen and (max-width: 600px) {
-				flex-direction: column;
-				background: $base-color;
-			}
-			
-			@media screen and (min-width: 600px) { margin-top: -140px }
-
-			&::before { background: $base-lighter1-color }
-
-			.avatar {
-				@media screen and (max-width: 600px) {
-					position: relative;
-					bottom: 30px;
-
-					display: initial;
-					width: 60px;
-					height: 60px;
-					margin: 0 auto;
-					padding: 0;
-				}
-
-				img {
-					border: 2px solid $base-lighter1-color;
-					border-radius: 50%;
-					background: transparent;
-				}
-			}
-		}
-
-		&__tabs {
-			@media screen and (max-width: 600px) {
-				flex-wrap: wrap;
-				margin-left: 0;
-
-				&__name {
-					width: 100%;
-					text-align: center;
-
-					h1 {
-						color: $primary-text-color;
-
-						small { color: $primary-lighter1-text-color }
-					}
-				}
-
-				&__tabs {
-					justify-content: center;
-					flex: auto;
-
-					.spacer { display: none }
-
-					a.button.logo-button {
-						color: $light-text-color;
-						background: $secondary-text-color;
-
-						svg path {
-							/* Only for Itabashi-don */
-							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
-							&#Mastodon { fill: $secondary-text-color !important }
-						}
-					}
-				}
-			}
-
-			.details-counters {
-				.counter {
-					color: $light-text-color;
-					border-right: 0;
-
-					&::after { border-bottom-color: $base-color }
-
-					&.active {
-						&::after { border-bottom-color: $active-color }
-					}
-				}
-			}
-		}
-
-		&__extra {
-			.public-account-bio {
-				.account__header__content { text-align: center }
-			}
-
-			&__links {
-				color: $primary-text-color;
-
-				a {
-					&, strong { color: $primary-text-color }
-				}
-			}
-		}
-	}
-
-	.public-account-bio,
-	.endorsements-widget,
-	.hero-widget { @include status-shadow; }
-
-	.public-account-bio {
-		background: $base-lighter1-color;
-		
-		.account__header__content { color: $primary-text-color }
-		&__extra { color: $primary-lighter1-text-color }
-	}
-
-	.endorsements-widget {
-		padding-bottom: 0;
-		border-radius: 4px;
-
-		h4 {
-			color: $primary-lighter1-text-color;
-			background: $base-lighter1-color;
-		}
-	}
-
-	.hero-widget {
-		&__img { background: $base-color }
-		&__text {
-			background: $base-lighter1-color;
-
-			&, em { color: $primary-lighter2-text-color }
-			a { color: $secondary-text-color }
-		}
-	}
-
-	.account__section-headline {
-		background: $base-lighter1-color;
-		border-bottom-color: $base-separation-color;
-
-		a {
-			color: $primary-lighter1-text-color;
-
-			&.active {
-				color: $primary-lighter2-text-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $status-color }
-			}
-		}
-	}
-
-	.activity-stream {
-		box-shadow: none;
-
-		.entry {
-			margin: 1em 0;
-			background: transparent;
-
-			&:first-of-type { margin: 0 }
-		}
-	}
-
-	.nothing-here {
-		@include status-shadow;
-
-		color: $primary-lighter1-text-color;
-		background: $base-lighter1-color;
-	}
-
-	.footer {
-		h4 { color: $primary-lighter1-text-color }
-
-		ul {
-			a { color: $primary-lighter2-text-color }
-		}
-
-		.brand {
-			svg path {
-				/* Only for Itabashi-don */
-				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-				&#Mastodon { fill: $base-lighter1-color !important }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
deleted file mode 100644
index b4478b91b..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/searches.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.search {
-	.search {
-		&__input {
-			@include material-border;
-
-			color: $primary-text-color;
-			background: $form-color;
-	
-			&:focus { background: $form-focused-color }
-		}
-	
-		&__icon {
-			.fa { color: $icon-color }
-		}
-	}
-
-	&-results {
-		> .search-results {
-			&__header { background: $base-color }
-			&__section {
-				> h5 { background: darken($base-color, 10%) }
-			}
-		}
-	}
-}
-
-.trends__item {
-	background: $trend-color;
-
-	.trends__item {
-		&__name a { color: $secondary-text-color }
-		&__current { color: lighten($secondary-text-color, 10%) }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
deleted file mode 100644
index 02fb9eac4..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-account.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.edit_account {
-	@media screen and (min-width: 415px) {
-		.card {
-			> a {
-				position: relative;
-
-				.card__img {
-					border-bottom: 1px solid $base-separation-color;
-
-					> img:not([src]),
-					> img[src="/headers/original/missing.png"] {
-						content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-					}
-				}
-				
-				.card__bar {
-					position: static;
-					padding-top: 30%;
-			
-					.avatar {
-						position: absolute;
-						left: 0;
-						bottom: 0;
-
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						width: 100%;
-						height: 100%;
-
-						img {
-							width: 128px;
-							height: 128px;
-
-							border-radius: 50%;
-						}
-					}
-			
-					.display-name {
-						flex: auto;
-						margin-left: 0;
-						text-align: center;
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
deleted file mode 100644
index b4303249b..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-dashboard.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.dashboard {
-	&__counters {
-		& > div {
-			& > div, & > a { background: $dashboard-counters-base-color }
-			
-			& > a {
-				&:hover,
-				&:focus,
-				&:active {
-					background: $dashboard-counters-hover-color;
-				}
-			}
-		}
-
-		&__text,
-		&__num { color: $primary-text-color }
-		
-		&__label { color: $primary-lighter1-text-color }
-	}
-
-	&__widgets {
-		a:not(.name-tag) { color: $primary-lighter2-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
deleted file mode 100644
index 9f75646ac..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-directory_tag.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.admin-wrapper {
-	.content {
-		.directory__tag {
-			& > a,
-			& > div { background: $setting-base-color }
-
-			h4 {
-				& { color: $primary-lighter2-text-color }
-				.fa, small { color: $primary-lighter1-text-color }
-			}
-
-			.trends__item__current { color: $primary-text-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
deleted file mode 100644
index 672a77c06..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-log.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.log-entry {
-	.log-entry {
-		&__header {
-			color: $primary-lighter2-text-color;
-			background: $log-entry-color;
-
-			.username,
-			.target,
-			a { color: $secondary-text-color }
-		}
-
-		&__timestamp { color: $primary-lighter1-text-color }
-		&__icon { color: $icon-color }
-
-		&__extras {
-			color: $primary-text-color;
-			background: $log-entry-extra-color;
-
-			.diff-neutral { color: $log-entry-extra--neutral-color }
-			.diff-old { color: $log-entry-extra--old-color }
-			.diff-new { color: $log-entry-extra--new-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
deleted file mode 100644
index 2e198f338..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings-report.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.report-card {
-	background: $setting-content-base-color;
-
-	&__profile__stats {
-		color: $primary-lighter2-text-color;
-
-		a {
-			&:focus,
-			&:hover,
-			&:active {
-				color: lighten($primary-lighter2-text-color, 8%);
-			}
-		}
-	}
-
-	&__summary {
-		&__item {
-			border-top-color: $base-separation-color;
-
-			&:hover { background: $column-header-hover-color }
-
-			&__reported-by,
-			&__assigned {
-				color: $primary-lighter2-text-color;
-			}
-
-			&__content {
-				&__icon { color: $icon-color }
-				a { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
-
-.batch-table {
-	&__toolbar {
-		background: $base-lighter1-color;
-		border-color: $base-separation-color;
-	}
-
-	&__row {
-		&, &:nth-child(2n) { background: $base-lighter1-color }
-		&:hover, &:nth-child(2n):hover { background: $column-header-hover-color }
-
-		border-color: $base-separation-color;
-
-		&__content {
-			.status__content { color: $primary-text-color }
-			.detailed-status__meta { color: $primary-lighter1-text-color }
-
-
-			.accounts-table { // v2.8.0 ->
-				.accounts-table {
-					&__count {
-						& {color: $primary-text-color }
-						small { color: $primary-lighter1-text-color }
-					}
-				}
-
-				td .account { background: inherit }
-			}
-		}
-	}
-}
-
-.speech-bubble {
-	&__bubble { color: $primary-text-color }
-	a { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
deleted file mode 100644
index bfabd1e6e..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/settings.scss
+++ /dev/null
@@ -1,245 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-@import 'settings-account';
-@import 'settings-report';
-@import 'settings-log';
-@import 'settings-dashboard';
-@import 'settings-directory_tag';
-
-
-
-body.admin {
-	color: $primary-text-color;
-	background: $setting-base-color;
-	
-	.sidebar {
-		&-wrapper { background: inherit }
-
-		ul {
-			border-radius: 0;
-
-			a {
-				color: $primary-lighter2-text-color;
-				border-radius: 0;
-
-				&:hover {
-					color: $primary-text-color;
-					background: $setting-lists-hover-color;
-				}
-
-				&.selected {
-					color: $primary-text-color;
-					background: $setting-lists-selected-color;
-				}
-
-				i.fa {
-					@include material-icon-large;
-					margin-right: 8px;
-					vertical-align: bottom;
-				}
-			}
-
-			ul { background: darken($setting-base-color, 4%) }
-
-			.simple-navigation-active-leaf a {
-				color: $icon-active-color;
-				background: initial;
-
-				&:hover { background: $setting-lists-hover-color }
-			}
-		}
-	}
-
-	.content {
-		@include column-shadow;
-		background: $setting-content-base-color;
-
-		h2, h3, h4, h6 { color: $primary-text-color }
-
-		p {
-			color: $primary-text-color;
-			strong { color: $primary-text-color }
-		}
-
-		h2, h4, hr { border-bottom-color: $base-separation-color }
-		.muted-hint { color: $primary-lighter1-text-color }
-	}
-}
-
-.simple_form {
-	.input {
-		&.boolean,
-		&.with_label,
-		&.with_floating_label {
-			.label_input > label { color: $primary-text-color }
-		}
-
-		&.with_block_label {
-			& > label { color: $primary-text-color }
-		}
-
-		&.radio_buttons{
-			.radio label { color: $primary-text-color }
-		}
-
-		&-copy {
-			background: $base-color;
-			border-color: $base-separation-color;
-		}
-	}
-
-	.check_boxes {
-		.checkbox {
-			label { color: $primary-text-color }
-		}
-	}
-
-	input[type=text],
-	input[type=number],
-	input[type=email],
-	input[type=password],
-	textarea {
-		color: $primary-text-color;
-		background: $setting-content-base-color;
-		border-color: $base-separation-color;
-
-		&:hover {
-			border-color: $base-separation-color;
-		}
-
-		&:active,
-		&:focus {
-			background: darken($setting-content-base-color, 8%);
-		}
-	}
-
-	select {
-		color: $primary-text-color;
-		background-color: $setting-content-base-color;
-		border-color: $base-separation-color;
-	}
-
-	.input.field_with_errors {
-		label,
-		.error {
-			color: $error-text-color;
-		}
-	}
-
-	.hint, p.hint {
-		color: $primary-lighter1-text-color !important;
-
-		code {
-			color: $light-text-color;
-			background: $setting-emphasis-color;
-		}
-	}
-
-	.recommended {
-		color: $verified-color;
-		background-color: transparentize($verified-color, 0.75);
-		border-color: $verified-color;
-	}
-
-	.label_input {
-		&__append { color: $primary-lighter1-text-color }
-	}
-
-	button {
-		@include button-shadow;
-		background-color: $active-button-color;
-	}
-}
-
-.simple_form,
-.table-form {
-	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
-}
-
-.quick-nav {
-	a {
-		color: $secondary-text-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			color: lighten($secondary-text-color, 8%);
-		}
-	}
-}
-
-.pagination {
-	.page,
-	a {
-		color: $primary-text-color;
-	}
-
-	.page {
-		&.current {
-			background: $icon-active-color;
-			color: $light-text-color;
-		}
-	}
-}
-
-.filters {
-	.filter-subset {
-		strong { color: $primary-text-color }
-
-		a {
-			color: $primary-lighter2-text-color;
-
-			&:hover { color: $primary-text-color }
-
-			&.selected {
-				color: $active-text-color;
-				border-bottom-color: $active-text-color;
-			}
-		}
-	}
-}
-
-.new_form_two_factor_confirmation {
-	.qr-wrapper {
-		.qr-code { box-shadow: none }
-		.qr-alternative { color: $secondary-lighter1-text-color }
-	}
-}
-
-label,
-select#user_setting_default_privacy {
-	&[for=user_setting_default_privacy_public],
-	&[for=user_setting_default_privacy_unlisted],
-	option[value="public"],
-	option[value="unlisted"] { color: $active-text-color !important }
-}
-
-.column-header__collapsible__extra {
-	.column-settings__section { color: $primary-text-color }
-
-	.setting-toggle {
-		.react-toggle {
-			&.react-toggle--checked {
-				> .react-toggle-track { background: $setting-toggle-checked-color }
-
-				> .react-toggle-thumb {
-					border-color: $setting-toggle-checked-color;
-					background-color: $setting-toggle-thumb-checked-color;
-				}
-			}
-
-			> .react-toggle-track { background: $setting-toggle-color }
-
-			> .react-toggle-thumb {
-				border-color: $setting-toggle-color;
-				background-color: $setting-toggle-thumb-color;
-			}
-		}
-
-		.setting-toggle__label { color: $primary-text-color }
-	}
-
-	.setting-meta__label { color: $primary-lighter1-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
deleted file mode 100644
index b3f5ffae3..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/statuses.scss
+++ /dev/null
@@ -1,123 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.status {
-	@include status-shadow;
-	@include material-card-radius;
-	border-bottom: 0;
-
-	transition: box-shadow 0.1s 0s ease-out;
-
-	&.light {
-		.status {
-			&__relative-time { color: $primary-lighter1-text-color }
-			&__display-name {
-				color: $primary-text-color;
-
-				.display-name__account { color: $primary-lighter1-text-color }
-			}
-
-			&__content { color: $primary-text-color }
-		}
-
-		.display-name strong { color: $primary-text-color }
-	}
-
-	&.status-direct {
-		background: $status-direct-color;
-
-		&:not(.read) {
-			background: inherit;
-			border-bottom-color: initial;
-		}
-	}
-
-	&.muted {
-		.status__content {
-			p { color: lighten($primary-text-color, 20%) }
-		}
-	}
-
-	.status {
-		&__info {
-			.status__display-name {
-				color: $primary-lighter1-text-color;
-	
-				strong { color: $primary-text-color }
-			}
-	
-			.status__relative-time { color: $primary-lighter1-text-color }
-		}
-	}
-
-	&__action-bar__counter__label { color: $primary-lighter1-text-color }
-}
-
-.detailed-status {
-	&__display-name {
-		color: $secondary-text-color;
-
-		strong { color: $primary-text-color }
-	}
-
-	&__meta {
-		.detailed-status__datetime { color: $primary-lighter1-text-color }
-
-		.detailed-status__link {
-			.fa.fa-star { vertical-align: middle }
-		}
-	}
-	
-	&__wrapper {
-		@include status-shadow;
-		
-		.detailed-status { @extend .detailed-status; }
-		.detailed-status__action-bar {
-			background: $status-actionbar-color;
-			border-color: $base-separation-color;
-		}
-	}
-}
-
-.status,
-.detailed-status {
-	background: $status-color;
-
-	.status__content {
-		color: $primary-text-color;
-
-		a { color: $secondary-text-color }
-
-		.status__content__spoiler-link {
-			color: $primary-text-color;
-			background: $base-color;
-		}
-	}
-}
-
-a.status-card,
-a.status-card.compact {
-	&:hover { background: initial }
-}
-
-.status-card,
-.status-card.compact {
-	border-color: $non-elevated-card-boader;
-
-	&__title {
-		color : $primary-text-color;
-	}
-
-	&__host {
-		color: $primary-lighter1-text-color;
-	}
-}
-
-.name-tag,
-a.name-tag {
-	color: $secondary-text-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss b/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
deleted file mode 100644
index e71ce7a38..000000000
--- a/app/javascript/styles/dark-gplus-theme-for-mastodon-dev/tables.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.table {
-	thead th { border-bottom-color: $base-separation-color }
-	
-	th,
-	td {
-		color: $primary-text-color;
-		background-color: $base-color;
-		border-top: 0;
-	}
-
-	& > tbody > tr:nth-child(odd) {
-		& > td, & > th { background: darken($base-color, 4%) }
-	}
-
-	a { color: $secondary-text-color }
-}
-
-a.table-action-link,
-button.table-action-link {
-	color: $secondary-text-color;
-
-	&:hover { color: darken($secondary-text-color, 8%) }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev.scss
deleted file mode 100644
index 1c8df2bab..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Google+ Theme for Mastodon v1.1
- * Copyright (C) 2018-2019 Genbu Project
- */
-
- @charset "UTF-8";
-
- // @import 'application';
- @import 'application';
- @import 'gplus-theme-for-mastodon-dev/basics';
- @import 'gplus-theme-for-mastodon-dev/components';
- @import 'gplus-theme-for-mastodon-dev/emoji-picker';
- @import 'gplus-theme-for-mastodon-dev/tables';
- @import 'gplus-theme-for-mastodon-dev/columns';
- @import 'gplus-theme-for-mastodon-dev/lists';
- @import 'gplus-theme-for-mastodon-dev/accounts';
- @import 'gplus-theme-for-mastodon-dev/statuses';
- @import 'gplus-theme-for-mastodon-dev/notifications';
- @import 'gplus-theme-for-mastodon-dev/searches';
- @import 'gplus-theme-for-mastodon-dev/settings';
- @import 'gplus-theme-for-mastodon-dev/icons';
- @import 'gplus-theme-for-mastodon-dev/profile';
- @import 'gplus-theme-for-mastodon-dev/about';
- @import 'gplus-theme-for-mastodon-dev/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
deleted file mode 100644
index e5aea0e4e..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/_functions.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@charset "UTF-8";
-
-
-
-@function adjust-lightness ($color, $lightness) {
-	@if (lightness($color) - $lightness <= 0 and lightness($color) + $lightness < 100) {
-		@return lighten($color, $lightness);
-	}
-
-	@if (0 < lightness($color) - $lightness and 100 <= lightness($color) + $lightness) {
-		@return darken($color, $lightness);
-	}
-
-	@return change-color($color, $lightness: $lightness);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
deleted file mode 100644
index 400a1ac90..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/_mixins.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
-@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
-@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
-@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
-@mixin material-border { border-radius: 4px }
-@mixin material-card-radius { border-radius: 2px }
-@mixin material-icon-large { font-size: 20px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
deleted file mode 100644
index 8ae2a027a..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/_variables.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "UTF-8";
-
-
-
-// Base colors
-$active-color: #db4437;
-$accent-color: #fbbc04;
-$valid-color: #4285f4;
-$error-color: #d50000;
-$checked-color: #4285f4;
-$verified-color: #4caf50;
-
-
-// Text colors
-$primary-text-color: rgba(0, 0, 0, 0.87);
-$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
-$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
-$secondary-text-color: #2962ff; // ex: リンク
-$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
-$light-text-color: #ffffff;
-$light-darker1-text-color: darken($light-text-color, 15%);
-$active-text-color: $active-color;
-$error-text-color: $error-color;
-
-
-// Icon colors
-$icon-color: #757575;
-$icon-active-color: $active-color;
-
-
-// Background colors
-$base-color: #f1f1f1;
-$base-lighter1-color: #ffffff;
-$base-darker1-color: rgba(0, 0, 0, 0.4);
-
-$column-header-color: $base-lighter1-color;
-$column-header-hover-color: darken($column-header-color, 10%);
-
-$status-color: $base-lighter1-color;
-$status-direct-color: darken($status-color, 5%);
-$status-actionbar-color: darken($status-color, 2%);
-
-$account-color: $base-lighter1-color;
-$account-foreground-color: $base-darker1-color;
-
-$card-color: $base-lighter1-color;
-$card-hover-color: $column-header-hover-color;
-$card-image-color: $base-color;
-$warning-card-color: #26a69a;
-
-$form-color: rgba(0, 0, 0, 0.1);
-$form-focused-color: lighten($form-color, 20%);
-$trend-color: $base-lighter1-color;
-
-$setting-base-color: $base-color;
-$setting-lists-selected-color: darken($base-color, 2%);
-$setting-lists-hover-color: darken($base-color, 5%);
-$setting-content-base-color: $base-lighter1-color;
-
-$setting-toggle-color: #b9b9b9;
-$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
-$setting-toggle-thumb-color: #fafafa;
-$setting-toggle-thumb-checked-color: $checked-color;
-
-$setting-emphasis-color: $verified-color;
-
-$dashboard-counters-base-color: $base-color;
-$dashboard-counters-hover-color: lighten($base-color, 2%);
-
-$log-entry-color: $base-lighter1-color;
-$log-entry-extra-color: $base-color;
-$log-entry-extra--neutral-color: $valid-color;
-$log-entry-extra--old-color: $active-color;
-$log-entry-extra--new-color: $verified-color;
-
-$explore-header-color: lighten($accent-color, 16%);
-$explore-directory-color: $base-lighter1-color;
-
-$active-button-color: $valid-color; //文字入りボタン
-$non-active-button-color: lighten($base-color, 20%);
-
-$floating-acton-button-hover-color: lighten($active-color, 10%);
-
-
-// Shadow colors
-$column-header-shadow-color: rgba(0, 0, 0, 0.3);
-$status-shadow-color: rgba(0, 0, 0, 0.14);
-$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
-$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
-$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
-$button-shadow-color: rgba(0, 0, 0, 0.4);
-
-
-// Separation colors
-$base-separation-color: rgba(0, 0, 0, 0.14);
-
-
-//Border colors
-$non-elevated-card-boader : #e0e0e0;
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
deleted file mode 100644
index de48883a8..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/about.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-// from mastodon/about.scss
-$column-breakpoint: 700px;
-
-
-
-.landing-page {
-	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
-	p { color: $primary-lighter1-text-color }
-	em { color: $primary-text-color }
-
-	.column-0 { background: $base-darker1-color }
-	.column-2 {
-		.landing-page {
-			&__information { padding: 0 }
-
-			&__short-description {
-				& > .row:first-child {
-					background: $base-darker1-color;
-					padding: 10px 20px;
-				}
-
-				& > * {
-					padding-left: 40px; padding-right: 40px;
-					&:last-child { padding-bottom: 45px }
-
-					@media screen and (max-width: $column-breakpoint) {
-						padding-left: 20px; padding-right: 20px;
-						&:last-child { padding-bottom: 25px }
-					}
-				}
-			}
-		}
-	}
-
-	&__forms,
-	&__information,
-	&__call-to-action {
-		@include status-shadow;
-		background: $column-header-color;
-	}
-
-	&__forms {
-		padding: 0;
-
-		& > *:first-child { margin: inherit }
-		& > * { margin-left: 20px; margin-right: 20px; }
-
-		.brand { background: $base-darker1-color }
-
-		form {
-			& > .input input {
-				background: $form-color;
-
-				&:focus { background: $form-focused-color }
-			}
-		}
-
-		.separator-or {
-			margin-left: 20px; margin-right: 20px;
-			
-			span {
-				color: $primary-lighter1-text-color;
-				background: $column-header-color;
-			}
-		}
-
-		@media screen and (max-width: $column-breakpoint) {
-			background: inherit;
-			box-shadow: none;
-
-			.separator-or span { background: $base-color }
-		}
-	}
-
-	&__information {
-		color: $primary-lighter1-text-color;
-
-		&.contact-widget {
-			@include status-shadow;
-			background: $column-header-color;
-
-			.contact-widget {
-				&__mail {
-					a { color: $primary-text-color }
-				}
-			}
-		}
-
-		strong { color: inherit }
-
-		.row:first-child {
-			h1 small {
-				color: $light-darker1-text-color;
-
-				span { color: $light-text-color }
-			}
-		}
-	}
-
-	&__call-to-action {
-		.row__information-board {
-			.information-board__section {
-				color: $primary-lighter2-text-color;
-
-				& > span:last-child { color: $primary-lighter1-text-color }
-			}
-		}
-	}
-
-	&__features {
-		.features-list {
-			.features-list__row {
-				.text { color: $primary-lighter1-text-color }
-				.visual .fa { color: $icon-color }
-			}
-		}
-	}
-
-	&__footer { color: $primary-lighter1-text-color }
-
-	#mastodon-timeline {
-		color: $primary-text-color;
-		background: transparent;
-
-		p {
-			color: $primary-text-color;
-
-			a { color: $secondary-text-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
deleted file mode 100644
index 7c4bcb5bf..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/accounts.scss
+++ /dev/null
@@ -1,194 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.account {
-	background: $account-color;
-	border-color: $base-separation-color;
-
-	.account {
-		&__display-name {
-			color: $secondary-text-color;
-			strong { color: $primary-text-color }
-		}
-	}
-
-	&-role {
-		color: $primary-lighter2-text-color;
-		background-color: rgba($base-separation-color, 0.1);
-		border-color: rgba($base-separation-color, 0.5);
-	}
-}
-
-.column {
-	> .column-back-button {
-		@include column-shadow;
-		background: $column-header-color;
-	}
-}
-
-.account-timeline__header {
-	.account__header {
-		background-color: $account-foreground-color;
-
-		> div { background-color: inherit } // -> v2.7.4
-
-		.account__header {
-			&__username { color: $secondary-lighter1-text-color }
-			&__fields { @extend .account__header__fields; }
-
-			&__image { // v2.8.0 ->
-				&::after {
-					content: "";
-
-					position: absolute;
-					top: auto;
-					left: 0;
-					bottom: 0;
-	
-					width: 100%;
-					height: 30%;
-					background: $account-header-image-shadow-color;
-					box-shadow: none;
-				}
-
-				> img:not([src]),
-				> img[src$="/headers/original/missing.png"] {
-					content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-				}
-			}
-
-			&__bar { // v2.8.0 ->
-				background-color: $base-lighter1-color;
-
-				.account__header {
-					&__tabs {
-						.avatar {
-							.account__avatar {
-								border-color: $base-lighter1-color;
-								border-radius: 50%;
-							}
-						}
-
-						&__buttons {
-							.icon-button { 
-								border: 0;
-								border-radius: 50%;
-							}
-						}
-
-						&__name {
-							h1 { color: $primary-text-color }
-							small { color: $secondary-text-color }
-						}
-					}
-
-					&__bio {
-						.account__header {
-							&__content { color: $primary-text-color }
-							&__fields { border-color: $base-separation-color }
-						}
-					}
-
-					&__extra {
-						&__links {
-							&, a { color: $primary-lighter1-text-color }
-							strong { color: $primary-lighter2-text-color }
-						}
-					}
-				}
-			}
-		}
-
-		.account--action-button {
-			.icon-button:not(.active) {
-				color: darken($light-text-color, 7%);
-
-				&:active,
-				&:focus,
-				&:hover {
-					color: $light-text-color;
-				}
-			}
-		}
-	}
-
-	.account {
-		&__disclaimer,
-		&__action-bar,
-		&__section-headline {
-			background: $base-lighter1-color;
-			border-color: $base-separation-color;
-		}
-
-		&__action-bar {
-			&__tab {
-				border-color: $base-separation-color;
-				&.active { border-bottom-color: $active-color }
-	
-				> span { color: $primary-lighter1-text-color }
-			}
-		}
-	
-		&__section-headline {
-			a {
-				color: $primary-text-color;
-	
-				&.active {
-					color: $active-color;
-	
-					&::before { border-color: transparent transparent $base-separation-color }
-					&::after { border-color: transparent transparent $status-color }
-				}
-			}
-		}
-	}
-}
-
-.account-authorize__wrapper {
-	@include status-shadow;
-	background: $base-lighter1-color;
-
-	&:focus { @include status-focus-shadow; }
-
-	.account {
-		&__header__content {
-			color: $primary-lighter2-text-color;
-		}
-	
-		&--panel {
-			background: $account-color;
-			border-color: $base-separation-color;
-		}
-	}
-}
-
-.account__header__fields {
-	dl {
-		border-color: $base-separation-color;
-		
-		dt,
-		dd {
-			color: $primary-text-color;
-			background: $base-lighter1-color;
-		}
-
-		dd {
-			&.verified {
-				border-color: transparentize($valid-color, 0.5);
-				background: transparentize($valid-color, 0.75);
-
-				a { color: lighten($verified-color, 20%) }
-			}
-		}
-	}
-
-	a { color: $secondary-text-color }
-}
-
-.account__action-bar__tab {
-	strong { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
deleted file mode 100644
index a141ecd13..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/basics.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-body {
-	&,
-	.ui {
-		color: $primary-text-color;
-		background: $base-color;
-	}
-}
-
-.focusable {
-	&:focus {
-		background: inherit;
-
-		.status {
-			@include status-focus-shadow;
-
-			&.status-direct { background: $status-direct-color }
-		}
-
-		.detailed-status {
-			& { background: $status-color }
-			&__action-bar { background: $status-actionbar-color }
-		}
-	}
-}
-
-::-webkit-scrollbar-thumb {
-	background: darken($base-lighter1-color, 12%);
-
-	&:hover { background: darken($base-lighter1-color, 16%) }
-	&:active { background: darken($base-lighter1-color, 12%) }
-}
-
-::-webkit-scrollbar-track {
-	background: $base-color;
-
-	&:hover,
-	&:active {
-		background: darken($base-lighter1-color, 8%);
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
deleted file mode 100644
index ce5f082b1..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/columns.scss
+++ /dev/null
@@ -1,335 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.tabs-bar {
-	margin: 0;
-	background: $column-header-color;
-	position: relative;
-
-	.tabs-bar {
-		&__link {
-			color: $icon-color;
-			border-bottom: 4px solid $column-header-color;
-			padding: 15px 10px 11px 10px;
-			
-			&.active {
-				border-bottom: 4px solid $active-color;
-			}
-
-			.fa {
-				@include material-icon-large;
-				vertical-align: top;
-			}
-		}
-	}
-}
-
-.drawer {
-	.drawer {
-		&__header {
-			@include column-shadow;
-			background: $column-header-color;
-	
-			.drawer__tab {
-				@include material-icon-large;
-				color: $icon-color;
-			}
-	
-			a {
-				&:hover { background: $column-header-hover-color }
-			}
-		}
-	
-		&__pager {
-			@include status-shadow;
-			@include material-card-radius;
-			
-			.drawer__inner {
-				background: $column-header-color;
-		
-				&__mastodon { display: none }
-			}
-		}
-	}
-}
-
-.navigation-bar {
-	color: $secondary-text-color;
-	background: $column-header-color;
-
-	.navigation-bar {
-		&__profile {
-			strong { color: $primary-text-color }
-			&-edit { color: $secondary-text-color }
-		}
-	}
-}
-
-
-.compose-form {
-	.compose-form {
-		&__buttons-wrapper {
-			background: $column-header-color;
-
-			&.character-counter__wrapper {
-				.character-counter { color: $primary-lighter1-text-color }
-			}
-		}
-
-		&__warning {
-			background-color: $warning-card-color;
-		}
-
-		&__publish { border-top: 1px solid $base-separation-color }
-		&__modifiers { background-color: $base-lighter1-color }
-	}
-
-	.autosuggest-textarea__textarea {
-		background-color: $base-lighter1-color;
-		color: $primary-text-color;
-	}
-
-	.character-counter {
-		color: $icon-color
-	}
-}
-
-.column {
-	.column-header {
-		@include column-shadow;
-		background: $column-header-color;
-
-		&.active {
-			.column-header__icon {
-				color: $icon-active-color;
-				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
-			}
-		}
-
-		* { background: inherit }
-
-		&__icon {
-			@include material-icon-large;
-			color: $icon-color;
-			vertical-align: bottom;
-			margin-right: 10px;
-		}
-
-		&__buttons {
-			height: 50px;
-
-			.column-header {
-				&__back-button {
-					.column-back-button__icon { vertical-align: bottom }
-				}
-
-				&__button {
-					&.active {
-						color: $icon-active-color;
-						background: inherit;
-					}
-		
-					.fa { vertical-align: unset }
-				}
-			}
-		}
-
-		&__button {
-			color: $icon-color;
-			padding: 0 16px;
-		}
-
-		&__collapsible {
-			color: $secondary-text-color;
-			border-bottom: 1px solid $base-separation-color;
-
-			&-inner { background: $column-header-color }
-		}
-	}
-
-	.column-back-button {
-		background-color: $column-header-color;
-		color: $secondary-text-color;
-
-		&__icon {
-			@include material-icon-large;
-			vertical-align: bottom;
-			margin-right: 8px;
-		}
-	}
-
-	.column {
-		&-subheading,
-		&-link__badge {
-			background: $base-color;
-			color: $secondary-text-color;
-		}
-	
-		&-link {
-			color: $primary-text-color;
-			background: $base-color;
-	
-			&__icon {
-				@include material-icon-large;
-				color: $icon-color;
-				vertical-align: bottom;
-				margin-right: 8px;
-			}
-		}
-	}
-
-	.scrollable {
-		background: transparent;
-
-		*[role="feed"] {
-			article {
-				margin: 1em 0;
-				&:first-of-type { margin: 0 }
-
-				&:focus { outline: none }
-			}
-		}
-
-		div[tabindex="-1"] { margin-bottom: 1em }
-	}
-
-	.notification__filter-bar {
-		background: $column-header-color;
-		border-bottom-color: $base-separation-color;
-
-		button {
-			color: $icon-color;
-			background: $column-header-color;
-
-			&.active {
-				color: $icon-active-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $column-header-color }
-			}
-		}
-	}
-
-	.empty-column-indicator {
-		flex-direction: column;
-		background: $base-color;
-
-		&::before {
-			content: "";
-			display: block;
-
-			width: 100px;
-			height: 100px;
-			margin-bottom: 1em;
-
-			background: none center / contain no-repeat;
-			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
-		}
-	}
-}
-
-// v2.9.0以降に対応
-.column-header {
-	@include column-shadow;
-	background: $column-header-color;
-
-	&.active {
-		.column-header__icon {
-			color: $icon-active-color;
-			text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
-		}
-	}
-
-	* { background: inherit }
-
-	&__icon {
-		@include material-icon-large;
-		color: $icon-color;
-		vertical-align: bottom;
-		margin-right: 10px;
-	}
-
-	&__buttons {
-		height: 50px;
-
-		.column-header {
-			&__back-button {
-				.column-back-button__icon { vertical-align: bottom }
-			}
-
-			&__button {
-				&.active {
-					color: $icon-active-color;
-					background: inherit;
-				}
-	
-				.fa { vertical-align: unset }
-			}
-		}
-	}
-
-	&__button {
-		color: $icon-color;
-		padding: 0 16px;
-	}
-
-	&__collapsible {
-		color: $secondary-text-color;
-		border-bottom: 1px solid $base-separation-color;
-
-		&-inner { background: $column-header-color }
-	}
-}
-.column-back-button {
-	background-color: $column-header-color;
-	color: $secondary-text-color;
-
-	&__icon {
-		@include material-icon-large;
-		vertical-align: bottom;
-		margin-right: 8px;
-	}
-}
-
-.getting-started {
-	&__wrapper,
-	& {
-		background: $base-color;
-	}
-
-	& {
-		border-top: 1px solid $base-separation-color;
-
-		a { color: $primary-text-color }
-	}
-}
-
-.load {
-	&-more,
-	&-gap {
-		background: transparent;
-
-		&:hover { background: darken($column-header-color, 10%) }
-	}
-
-	&-gap { border: 0 }
-}
-
-.confirmation-modal {
-	@include material-card-radius;
-	color: $primary-text-color;
-	background-color: $base-lighter1-color;
-
-	&__action-bar {
-		background-color: $base-lighter1-color;
-	}
-
-	&__cancel-button {
-		color: $primary-lighter1-text-color;
-		box-shadow: 0 2px 5px 0 transparent;
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
deleted file mode 100644
index 8abd2ad5e..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-button.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.floating-action-button {
-	font-size: 24px;
-	background-color: $active-color;
-	width: 3.6rem;
-	height: 3.6rem;
-
-	&:active {
-		background-color: $active-color;
-	}
-
-	&:hover {
-		background-color: $floating-acton-button-hover-color;
-	}
-}
-
-.button {
-	@include button-shadow;
-	@include material-card-radius;
-	background-color: $active-button-color;
-
-	.text-icon-button {
-		color: $primary-lighter1-text-color;
-		border-radius: 50%;
-	}
-
-	.button--block { @include button-shadow }
-
-	.button-secondary {
-		background-color: $primary-lighter1-text-color;
-		border: 0px;
-	}
-}
-
-.modal-root {
-	&__modal {
-		.media-modal {
-			&__close.icon-button {
-				font-size: 40px;
-				width: 40px;
-				height: 40px;
-
-				&:hover {
-					background-color: darken($base-lighter1-color, 40%);
-				}
-			}
-		}
-	}
-}
-
-// DOM操作によりpaddingが調整できないもの
-.privacy-dropdown__value-icon.icon-button.inverted,
-.compose-form__poll-button-icon.icon-button.inverted,
-.compose-form__upload-button-icon.icon-button.inverted { padding: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
deleted file mode 100644
index dc72775a1..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-card.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.card {
-	//border: 1px solid $base-separation-color;
-	//不要(?)
-
-	> a {
-		@include status-shadow;
-
-		&:hover,
-		&:focus,
-		&:active {
-			.card__bar {
-				background: initial;
-
-				.display-name strong { color: $secondary-text-color }
-			}
-		}
-
-		.card__img { background: $card-image-color }
-		.card__bar {
-			background: $card-color;
-	
-			.avatar {
-				img { background: transparent }
-			}
-	
-			.display-name {
-				strong { color: $primary-text-color }
-				span { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
deleted file mode 100644
index b84fae3be..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-dropdown.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-.dropdown-menu {
-	background-color: $column-header-color;
-
-		&__arrow {
-			&.top { border-top-color: $column-header-color }
-			&.bottom { border-bottom-color: $column-header-color }
-		}
-
-		&__separator { margin: 4px 0 }
-}
-
-.dropdown-menu,
-.actions-modal {
-	@include material-card-radius;
-
-	& > ul {
-		background: $base-lighter1-color;
-
-		.dropdown-menu {
-			&__item {
-				a {
-					color: $primary-lighter2-text-color;
-
-					padding: 16px 16px;
-					background: $column-header-color;
-
-					&:active,
-					&:focus,
-					&:hover {
-						color: $primary-text-color;
-						background: $column-header-hover-color;
-					}
-				}
-			}
-
-			&__separator { border-bottom-color: $base-separation-color }
-		}
-
-		& > li:not(:empty) {
-			@extend .dropdown-menu__item;
-
-			a {
-				padding: 12px 16px;
-				color: $primary-text-color;
-
-				&:hover {
-					color: $primary-text-color;
-					background-color: $column-header-hover-color;
-				}
-			}
-		}
-	}
-
-	.status {
-		background-color: $base-lighter1-color;
-		padding-top: 16px;
-		padding-bottom: 16px;
-		padding-right: 16px;
-		padding-left: 74px;
-
-		&__avatar {
-			top: 16px;
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
deleted file mode 100644
index 9b64572f9..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components-status-card.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.status-card {
-	color: $primary-lighter1-text-color;
-	&__title, &__description { color: $primary-lighter2-text-color }
-
-	&__image { background: transparent }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
deleted file mode 100644
index e735b108d..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/components.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@charset "UTF-8";
-
-@import 'components-button';
-@import 'components-card';
-@import 'components-dropdown';
-@import 'components-status-card';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
deleted file mode 100644
index 0937158bf..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/emoji-picker.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.emoji-mart {
-    &-bar {
-        border: 0 solid $base-separation-color;
-
-        &:first-child {
-            border-top-left-radius: 2px;
-            border-top-right-radius: 2px;
-            background-color: $base-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-color;
-    }
-    &-anchor {
-        &-selected {
-            color: $icon-active-color;
-
-            &:hover {
-                color: $icon-active-color;
-            }
-        }
-
-        &-bar {
-            background-color: $icon-active-color;
-        }
-    }
-
-    &-search {
-        background-color: $base-lighter1-color;
-    }
-    &-search input {
-        color: $primary-text-color;
-        background-color: $form-color;
-        border: 0px solid #ffffff00;
-    }
-
-    &-category-label span {
-        color: $primary-text-color;
-        background-color: $base-lighter1-color;
-    }
-
-    &-scroll {
-        background-color: $base-lighter1-color;
-    }
-}
-
-.emoji-picker-dropdown {
-    &__modifiers {
-        &__menu {
-            @include status-shadow;
-            @include material-card-radius;
-            background-color: $base-lighter1-color;
-        }
-    }
-
-    &__menu {
-        @include column-shadow;
-        background-color: $base-lighter1-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
deleted file mode 100644
index ae80b3884..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/explore.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.public-layout {
-	.page-header {
-		background: $explore-header-color;
-
-		h1 { color: $primary-text-color }
-		p { color: $primary-lighter2-text-color }
-	}
-
-	.directory,
-	.notice-widget { @include column-shadow; }
-
-	.directory {
-		background: $explore-directory-color;
-
-		.accounts-table {
-			&__count {
-				color: $primary-lighter2-text-color;
-				small { color: $primary-lighter1-text-color }
-			}
-		}
-
-		&__tag {
-			& > a {
-				@include status-shadow;
-				background: $explore-directory-color;
-			}
-
-			h4 { color: $primary-lighter2-text-color }
-			.fa, small { color: $primary-lighter1-text-color }
-			.trends__item__current { color: $primary-text-color }
-		}
-	}
-
-	.notice-widget {
-		color: $primary-lighter1-text-color;
-		background: $explore-directory-color;
-
-		a { color: $secondary-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
deleted file mode 100644
index ee45f5712..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/icons.scss
+++ /dev/null
@@ -1,205 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@function hex-color($color) {
-	@if type-of($color) == 'color' {
-		$color: str-slice(ie-hex-str($color), 4);
-	}
-
-	@return '%23' + unquote($color)
-};
-
-
-
-@font-face {
-	font-family: "Material Icons Extended";
-	src:
-		local("Material Icons Extended"),
-		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
-		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
-}
-
-.icon-button {
-	color: $icon-color;
-	border-radius: 50%;
-	width: 28px !important; // UIの密度が下がる代わりに、ホバー時に正常に表示
-	height: 28px !important; // !importantを付けないと動作しない…?
-
-	&:active,
-	&:focus { background-color: transparent }
-
-	&:hover {
-		color: lighten($icon-color, 7%);
-		background-color: $column-header-hover-color;
-	}
-
-	&.star-icon {
-		&.active {
-			color: $light-text-color;
-			background: $icon-active-color;
-			border-radius: 50%;
-		}
-
-		.fa.fa-star { vertical-align: top }
-	}
-
-	&.inverted { color: $icon-color }
-
-	&.overlayed { border-radius: 50% }
-
-	&.disabled {
-		color: lighten($icon-color, 13%);
-
-		.fa.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-		}
-	}
-
-	.fa {
-		@include material-icon-large;
-		vertical-align: middle;
-
-		&.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			
-			&:active,
-			&:hover,
-			&:focus {
-				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			}
-		}
-	}
-}
-
-.fa {
-	&.fa-users,
-	&.fa-globe,
-	&.fa-cog,
-	&.fa-cogs,
-	&.fa-gears,
-	&.fa-sign-out,
-	&.fa-star,
-	&.fa-reply,
-	&.fa-reply-all,
-	&.fa-mail-reply,
-	&.fa-mail-reply-all,
-	&.fa-envelope,
-	&.fa-bookmark,
-	&.fa-home,
-	&.fa-bell,
-	&.fa-eraser,
-	&.fa-ellipsis-h,
-	&.fa-ellipsis-v,
-	&.fa-address-book,
-	&.fa-thumb-tack,
-	&.fa-lock,
-	&.fa-pencil,
-	&.fa-chevron-left,
-	&.fa-chevron-right,
-	&.fa-camera,
-	&.fa-tasks,
-	&.fa-sliders,
-	&.fa-fire,
-	&.fa-list-ul,
-	&.fa-search,
-	&.fa-close,
-	&.fa-remove,
-	&.fa-times,
-	&.fa-user,
-	&.fa-mobile-phone,
-	&.fa-mobile,
-	&.fa-filter,
-	&.fa-user-plus,
-	&.fa-cloud-upload,
-	&.fa-cloud-download,
-	&.fa-eye,
-	&.fa-eye-slash,
-	&.fa-share-alt,
-	&.fa-chevron-down,
-	&.fa-bars,
-	&.fa-navicon,
-	&.fa-reorder,
-	&.fa-desktop,
-	&.fa-code,
-	&.fa-list,
-	&.fa-paperclip,
-	&.fa-plus,
-	&.fa-bullhorn {
-		font-family: "Material Icons Extended";
-	}
-
-	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
-	&.fa-globe::before { content: "public" } // 地球マーク(.drawer__header > .drawer__tab:3)
-	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
-	&.fa-cogs::before { content: "settings" } //歯車マーク(モバイル)
-	&.fa-gears::before { content: "settings" } //歯車マーク(モバイル)
-	&.fa-sign-out::before { content: "exit_to_app" } //サインアウト
-	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
-	&.fa-reply::before { content: "reply" } //返信ボタン
-	&.fa-reply-all::before { content: "reply_all" } //全員に返信ボタン
-	&.fa-mail-reply::before { content: "reply" } //返信ボタン
-	&.fa-mail-reply-all::before { content: "reply_all" } //全員に返信ボタン
-	&.fa-envelope::before { content: "mail" } //ダイレクトメッセージボタン
-	&.fa-bookmark::before { content: "bookmark" } //ブックマークボタン
-	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
-	&.fa-bell::before { content: "notifications" } // ベルマーク(通知)
-	&.fa-eraser::before { content: "clear_all" } // 通知を消去のマーク
-	&.fa-ellipsis-h::before { content: "more_horiz" } // 三点リーダー(横)
-	&.fa-ellipsis-v::before { content: "more_vert" } // 三点リーダー(縦)
-	&.fa-address-book::before { content: "explore" } // discoverマーク(explore遷移タブ)
-	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
-	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
-	&.fa-pencil::before { content: "create" } // 鉛筆マーク(モバイル用フローティングボタン)
-	&.fa-chevron-left::before { content: "arrow_back" } //戻るボタン
-	&.fa-chevron-right::before { content: "arrow_forward" } //進むボタン
-	&.fa-camera::before { content: "camera_alt" } //メディアを追加ボタン
-	&.fa-tasks::before { content: "poll" } //投票を追加ボタン
-	&.fa-sliders::before { content: "tune" } //設定を表示ボタン
-	&.fa-fire::before { content: "whatshot" } //トレンドマーク
-	&.fa-list-ul::before { content: "list" } //リストマーク
-	&.fa-search::before { content: "search" } //検索アイコン(モバイル、トップバー内)
-	&.fa-close::before { content: "close" } //閉じるボタン
-	&.fa-remove::before { content: "close" } //閉じるボタン
-	&.fa-times::before { content: "close" } //閉じるボタン(メディア)
-	&.fa-user::before { content: "account_circle" } //ユーザーアイコン
-	&.fa-mobile-phone::before { content: "smartphone" } //モバイルアイコン
-	&.fa-mobile::before { content: "smartphone" } //モバイルアイコン
-	&.fa-filter::before { content: "filter_list" } //フィルターアイコン
-	&.fa-user-plus::before { content: "person_add" } //ユーザーの追加アイコン
-	&.fa-cloud-upload::before { content: "cloud_upload" } //インポートアイコン
-	&.fa-cloud-download::before { content: "cloud_download" } //エクスポートアイコン
-	&.fa-eye::before { content: "visibility" } //目のアイコン
-	&.fa-eye-slash::before { content : "visibility_off" } //閉じた目のアイコン
-	&.fa-share-alt::before { content: "share" } //モバイル共有ボタン
-	&.fa-chevron-down::before { content: "keyboard_arrow_down" } //メニューボタン
-	&.fa-bars::before { content: "menu" } //ハンバーガーボタン
-	&.fa-navicon::before { content: "menu" } //ハンバーガーボタン
-	&.fa-reorder::before { content: "menu" } //ハンバーガーボタン
-	&.fa-desktop::before { content: "desktop_windows" } //外観設定のアイコン
-	&.fa-code::before { content: "code" } //開発アイコン
-	&.fa-list::before { content: "list" } //リストアイコン
-	&.fa-paperclip::before { content: "attach_file" } //メディアを追加のアイコン
-	&.fa-plus::before { content: "add" } // 追加ボタン
-	&.fa-bullhorn::before { content: "announcement"} //Adminからのお知らせ(一部サーバーのみ)
-}
-
-.fa {
-	&.fa-chevron-left,
-	&.fa-chevron-right,
-	&.fa-plus {
-		@include material-icon-large;
-		vertical-align: bottom;
-	}
-
-	&.fa-times {
-		@include material-icon-large;
-		vertical-align: top;
-		&.fa-fw {
-			font-size: 24px;
-			vertical-align: 8px;
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
deleted file mode 100644
index 6c664b32f..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/keyboard_shortcuts.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.keyboard-shortcuts {
-	kbd {
-		@include status-shadow;
-
-		color: $primary-text-color;
-		background-color: $base-lighter1-color;
-		border-color: $base-darker1-color;
-
-		margin: 0 0.25em;
-
-		&:first-child { margin-left: 0 }
-		&:last-child { margin-right: 0 }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
deleted file mode 100644
index 05c29a6df..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/lists.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.column {
-	.column-back-button { background: inherit }
-
-	.column-inline-form {
-		background: $column-header-color;
-
-		label input {
-			color: $secondary-text-color;
-			&:focus { color: $primary-text-color }
-		}
-	}
-
-	.column-inline-form ~ .scrollable {
-		article { margin: 0 }
-	}
-}
-
-.modal-root {
-	.column-inline-form {
-		background: $column-header-color;
-		
-		.setting-text {
-			color: $primary-text-color;
-			&:active, &:focus { color: $primary-lighter2-text-color }
-		}
-	}
-
-	.list-editor {
-		background: $base-color;
-		h4 { background: $column-header-color }
-
-		.drawer__pager {
-			.drawer__inner { background: $column-header-color }
-		}
-	}
-
-	.list-adder {
-		background: $base-color;
-
-		.column-inline-form { border-bottom: 1px solid $base-separation-color }
-
-		&__account,
-		&__lists { background: $column-header-color }
-
-		&__lists {
-			.list { border-color: $base-separation-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
deleted file mode 100644
index bab098372..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/notifications.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.notification {
-	&.notification-favourite {
-		.status {
-			&.status-direct { background: transparent }
-		}
-	}
-
-	> .notification__message {
-		color: $primary-lighter2-text-color;
-		font-size: 13px;
-		padding: 8px 0;
-
-		.notification__display-name {
-			&:hover { color: inherit }
-		}
-
-		.notification__favourite-icon-wrapper {
-			.star-icon { color: $icon-active-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
deleted file mode 100644
index 246d24b7d..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/profile.scss
+++ /dev/null
@@ -1,232 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.public-layout {
-	a.button {
-		@include button-shadow;
-
-		color: $primary-text-color;
-		background: $base-lighter1-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			background: darken($base-lighter1-color, 8%);
-		}
-	}
-
-	.logo-button {
-		svg path {
-			/* Only for Itabashi-don */
-			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-			&#Mastodon { fill: $base-lighter1-color !important }
-		}
-	}
-
-	.public-account-header {
-		@include status-shadow;
-
-		&__image {
-			background: $base-lighter1-color;
-
-			@media screen and (min-width: 600px) { height: 500px }
-
-			&::after {
-				content: "";
-				
-				position: absolute;
-				top: auto;
-				left: 0;
-				bottom: 0;
-
-				width: 100%;
-				height: 30%;
-				background: $account-header-image-shadow-color;
-				box-shadow: none;
-			}
-
-			> img:not([src]),
-			> img[src="/headers/original/missing.png"] {
-				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-			}
-		}
-
-		&__bar {
-			@media screen and (max-width: 600px) {
-				flex-direction: column;
-				background: $base-color;
-			}
-			
-			@media screen and (min-width: 600px) { margin-top: -140px }
-
-			&::before { background: $base-lighter1-color }
-
-			.avatar {
-				@media screen and (max-width: 600px) {
-					position: relative;
-					bottom: 30px;
-
-					display: initial;
-					width: 60px;
-					height: 60px;
-					margin: 0 auto;
-					padding: 0;
-				}
-
-				img {
-					border: 2px solid $base-lighter1-color;
-					border-radius: 50%;
-					background: transparent;
-				}
-			}
-		}
-
-		&__tabs {
-			@media screen and (max-width: 600px) {
-				flex-wrap: wrap;
-				margin-left: 0;
-
-				&__name {
-					width: 100%;
-					text-align: center;
-
-					h1 {
-						color: $primary-text-color;
-
-						small { color: $primary-lighter1-text-color }
-					}
-				}
-
-				&__tabs {
-					justify-content: center;
-					flex: auto;
-
-					.spacer { display: none }
-
-					a.button.logo-button {
-						color: $light-text-color;
-						background: $secondary-text-color;
-
-						svg path {
-							/* Only for Itabashi-don */
-							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
-							&#Mastodon { fill: $secondary-text-color !important }
-						}
-					}
-				}
-			}
-
-			.details-counters {
-				.counter {
-					color: $light-text-color;
-					border-right: 0;
-
-					&::after { border-bottom-color: $base-color }
-
-					&.active {
-						&::after { border-bottom-color: $active-color }
-					}
-				}
-			}
-		}
-
-		&__extra {
-			.public-account-bio {
-				.account__header__content { text-align: center }
-			}
-
-			&__links {
-				color: $primary-text-color;
-
-				a {
-					&, strong { color: $primary-text-color }
-				}
-			}
-		}
-	}
-
-	.public-account-bio,
-	.endorsements-widget,
-	.hero-widget { @include status-shadow; }
-
-	.public-account-bio {
-		background: $base-lighter1-color;
-		
-		.account__header__content { color: $primary-text-color }
-		&__extra { color: $primary-lighter1-text-color }
-	}
-
-	.endorsements-widget {
-		padding-bottom: 0;
-		border-radius: 4px;
-
-		h4 {
-			color: $primary-lighter1-text-color;
-			background: $base-lighter1-color;
-		}
-	}
-
-	.hero-widget {
-		&__img { background: $base-color }
-		&__text {
-			background: $base-lighter1-color;
-
-			&, em { color: $primary-lighter2-text-color }
-			a { color: $secondary-text-color }
-		}
-	}
-
-	.account__section-headline {
-		background: $base-lighter1-color;
-		border-bottom-color: $base-separation-color;
-
-		a {
-			color: $primary-lighter1-text-color;
-
-			&.active {
-				color: $primary-lighter2-text-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $status-color }
-			}
-		}
-	}
-
-	.activity-stream {
-		box-shadow: none;
-
-		.entry {
-			margin: 1em 0;
-			background: transparent;
-
-			&:first-of-type { margin: 0 }
-		}
-	}
-
-	.nothing-here {
-		@include status-shadow;
-
-		color: $primary-lighter1-text-color;
-		background: $base-lighter1-color;
-	}
-
-	.footer {
-		h4 { color: $primary-lighter1-text-color }
-
-		ul {
-			a { color: $primary-lighter2-text-color }
-		}
-
-		.brand {
-			svg path {
-				/* Only for Itabashi-don */
-				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-				&#Mastodon { fill: $base-lighter1-color !important }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
deleted file mode 100644
index b4478b91b..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/searches.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.search {
-	.search {
-		&__input {
-			@include material-border;
-
-			color: $primary-text-color;
-			background: $form-color;
-	
-			&:focus { background: $form-focused-color }
-		}
-	
-		&__icon {
-			.fa { color: $icon-color }
-		}
-	}
-
-	&-results {
-		> .search-results {
-			&__header { background: $base-color }
-			&__section {
-				> h5 { background: darken($base-color, 10%) }
-			}
-		}
-	}
-}
-
-.trends__item {
-	background: $trend-color;
-
-	.trends__item {
-		&__name a { color: $secondary-text-color }
-		&__current { color: lighten($secondary-text-color, 10%) }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
deleted file mode 100644
index 02fb9eac4..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-account.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.edit_account {
-	@media screen and (min-width: 415px) {
-		.card {
-			> a {
-				position: relative;
-
-				.card__img {
-					border-bottom: 1px solid $base-separation-color;
-
-					> img:not([src]),
-					> img[src="/headers/original/missing.png"] {
-						content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-					}
-				}
-				
-				.card__bar {
-					position: static;
-					padding-top: 30%;
-			
-					.avatar {
-						position: absolute;
-						left: 0;
-						bottom: 0;
-
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						width: 100%;
-						height: 100%;
-
-						img {
-							width: 128px;
-							height: 128px;
-
-							border-radius: 50%;
-						}
-					}
-			
-					.display-name {
-						flex: auto;
-						margin-left: 0;
-						text-align: center;
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
deleted file mode 100644
index b4303249b..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-dashboard.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.dashboard {
-	&__counters {
-		& > div {
-			& > div, & > a { background: $dashboard-counters-base-color }
-			
-			& > a {
-				&:hover,
-				&:focus,
-				&:active {
-					background: $dashboard-counters-hover-color;
-				}
-			}
-		}
-
-		&__text,
-		&__num { color: $primary-text-color }
-		
-		&__label { color: $primary-lighter1-text-color }
-	}
-
-	&__widgets {
-		a:not(.name-tag) { color: $primary-lighter2-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
deleted file mode 100644
index 9f75646ac..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-directory_tag.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.admin-wrapper {
-	.content {
-		.directory__tag {
-			& > a,
-			& > div { background: $setting-base-color }
-
-			h4 {
-				& { color: $primary-lighter2-text-color }
-				.fa, small { color: $primary-lighter1-text-color }
-			}
-
-			.trends__item__current { color: $primary-text-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
deleted file mode 100644
index 672a77c06..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-log.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.log-entry {
-	.log-entry {
-		&__header {
-			color: $primary-lighter2-text-color;
-			background: $log-entry-color;
-
-			.username,
-			.target,
-			a { color: $secondary-text-color }
-		}
-
-		&__timestamp { color: $primary-lighter1-text-color }
-		&__icon { color: $icon-color }
-
-		&__extras {
-			color: $primary-text-color;
-			background: $log-entry-extra-color;
-
-			.diff-neutral { color: $log-entry-extra--neutral-color }
-			.diff-old { color: $log-entry-extra--old-color }
-			.diff-new { color: $log-entry-extra--new-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
deleted file mode 100644
index 2e198f338..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings-report.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.report-card {
-	background: $setting-content-base-color;
-
-	&__profile__stats {
-		color: $primary-lighter2-text-color;
-
-		a {
-			&:focus,
-			&:hover,
-			&:active {
-				color: lighten($primary-lighter2-text-color, 8%);
-			}
-		}
-	}
-
-	&__summary {
-		&__item {
-			border-top-color: $base-separation-color;
-
-			&:hover { background: $column-header-hover-color }
-
-			&__reported-by,
-			&__assigned {
-				color: $primary-lighter2-text-color;
-			}
-
-			&__content {
-				&__icon { color: $icon-color }
-				a { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
-
-.batch-table {
-	&__toolbar {
-		background: $base-lighter1-color;
-		border-color: $base-separation-color;
-	}
-
-	&__row {
-		&, &:nth-child(2n) { background: $base-lighter1-color }
-		&:hover, &:nth-child(2n):hover { background: $column-header-hover-color }
-
-		border-color: $base-separation-color;
-
-		&__content {
-			.status__content { color: $primary-text-color }
-			.detailed-status__meta { color: $primary-lighter1-text-color }
-
-
-			.accounts-table { // v2.8.0 ->
-				.accounts-table {
-					&__count {
-						& {color: $primary-text-color }
-						small { color: $primary-lighter1-text-color }
-					}
-				}
-
-				td .account { background: inherit }
-			}
-		}
-	}
-}
-
-.speech-bubble {
-	&__bubble { color: $primary-text-color }
-	a { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
deleted file mode 100644
index bfabd1e6e..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/settings.scss
+++ /dev/null
@@ -1,245 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-@import 'settings-account';
-@import 'settings-report';
-@import 'settings-log';
-@import 'settings-dashboard';
-@import 'settings-directory_tag';
-
-
-
-body.admin {
-	color: $primary-text-color;
-	background: $setting-base-color;
-	
-	.sidebar {
-		&-wrapper { background: inherit }
-
-		ul {
-			border-radius: 0;
-
-			a {
-				color: $primary-lighter2-text-color;
-				border-radius: 0;
-
-				&:hover {
-					color: $primary-text-color;
-					background: $setting-lists-hover-color;
-				}
-
-				&.selected {
-					color: $primary-text-color;
-					background: $setting-lists-selected-color;
-				}
-
-				i.fa {
-					@include material-icon-large;
-					margin-right: 8px;
-					vertical-align: bottom;
-				}
-			}
-
-			ul { background: darken($setting-base-color, 4%) }
-
-			.simple-navigation-active-leaf a {
-				color: $icon-active-color;
-				background: initial;
-
-				&:hover { background: $setting-lists-hover-color }
-			}
-		}
-	}
-
-	.content {
-		@include column-shadow;
-		background: $setting-content-base-color;
-
-		h2, h3, h4, h6 { color: $primary-text-color }
-
-		p {
-			color: $primary-text-color;
-			strong { color: $primary-text-color }
-		}
-
-		h2, h4, hr { border-bottom-color: $base-separation-color }
-		.muted-hint { color: $primary-lighter1-text-color }
-	}
-}
-
-.simple_form {
-	.input {
-		&.boolean,
-		&.with_label,
-		&.with_floating_label {
-			.label_input > label { color: $primary-text-color }
-		}
-
-		&.with_block_label {
-			& > label { color: $primary-text-color }
-		}
-
-		&.radio_buttons{
-			.radio label { color: $primary-text-color }
-		}
-
-		&-copy {
-			background: $base-color;
-			border-color: $base-separation-color;
-		}
-	}
-
-	.check_boxes {
-		.checkbox {
-			label { color: $primary-text-color }
-		}
-	}
-
-	input[type=text],
-	input[type=number],
-	input[type=email],
-	input[type=password],
-	textarea {
-		color: $primary-text-color;
-		background: $setting-content-base-color;
-		border-color: $base-separation-color;
-
-		&:hover {
-			border-color: $base-separation-color;
-		}
-
-		&:active,
-		&:focus {
-			background: darken($setting-content-base-color, 8%);
-		}
-	}
-
-	select {
-		color: $primary-text-color;
-		background-color: $setting-content-base-color;
-		border-color: $base-separation-color;
-	}
-
-	.input.field_with_errors {
-		label,
-		.error {
-			color: $error-text-color;
-		}
-	}
-
-	.hint, p.hint {
-		color: $primary-lighter1-text-color !important;
-
-		code {
-			color: $light-text-color;
-			background: $setting-emphasis-color;
-		}
-	}
-
-	.recommended {
-		color: $verified-color;
-		background-color: transparentize($verified-color, 0.75);
-		border-color: $verified-color;
-	}
-
-	.label_input {
-		&__append { color: $primary-lighter1-text-color }
-	}
-
-	button {
-		@include button-shadow;
-		background-color: $active-button-color;
-	}
-}
-
-.simple_form,
-.table-form {
-	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
-}
-
-.quick-nav {
-	a {
-		color: $secondary-text-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			color: lighten($secondary-text-color, 8%);
-		}
-	}
-}
-
-.pagination {
-	.page,
-	a {
-		color: $primary-text-color;
-	}
-
-	.page {
-		&.current {
-			background: $icon-active-color;
-			color: $light-text-color;
-		}
-	}
-}
-
-.filters {
-	.filter-subset {
-		strong { color: $primary-text-color }
-
-		a {
-			color: $primary-lighter2-text-color;
-
-			&:hover { color: $primary-text-color }
-
-			&.selected {
-				color: $active-text-color;
-				border-bottom-color: $active-text-color;
-			}
-		}
-	}
-}
-
-.new_form_two_factor_confirmation {
-	.qr-wrapper {
-		.qr-code { box-shadow: none }
-		.qr-alternative { color: $secondary-lighter1-text-color }
-	}
-}
-
-label,
-select#user_setting_default_privacy {
-	&[for=user_setting_default_privacy_public],
-	&[for=user_setting_default_privacy_unlisted],
-	option[value="public"],
-	option[value="unlisted"] { color: $active-text-color !important }
-}
-
-.column-header__collapsible__extra {
-	.column-settings__section { color: $primary-text-color }
-
-	.setting-toggle {
-		.react-toggle {
-			&.react-toggle--checked {
-				> .react-toggle-track { background: $setting-toggle-checked-color }
-
-				> .react-toggle-thumb {
-					border-color: $setting-toggle-checked-color;
-					background-color: $setting-toggle-thumb-checked-color;
-				}
-			}
-
-			> .react-toggle-track { background: $setting-toggle-color }
-
-			> .react-toggle-thumb {
-				border-color: $setting-toggle-color;
-				background-color: $setting-toggle-thumb-color;
-			}
-		}
-
-		.setting-toggle__label { color: $primary-text-color }
-	}
-
-	.setting-meta__label { color: $primary-lighter1-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
deleted file mode 100644
index b3f5ffae3..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/statuses.scss
+++ /dev/null
@@ -1,123 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.status {
-	@include status-shadow;
-	@include material-card-radius;
-	border-bottom: 0;
-
-	transition: box-shadow 0.1s 0s ease-out;
-
-	&.light {
-		.status {
-			&__relative-time { color: $primary-lighter1-text-color }
-			&__display-name {
-				color: $primary-text-color;
-
-				.display-name__account { color: $primary-lighter1-text-color }
-			}
-
-			&__content { color: $primary-text-color }
-		}
-
-		.display-name strong { color: $primary-text-color }
-	}
-
-	&.status-direct {
-		background: $status-direct-color;
-
-		&:not(.read) {
-			background: inherit;
-			border-bottom-color: initial;
-		}
-	}
-
-	&.muted {
-		.status__content {
-			p { color: lighten($primary-text-color, 20%) }
-		}
-	}
-
-	.status {
-		&__info {
-			.status__display-name {
-				color: $primary-lighter1-text-color;
-	
-				strong { color: $primary-text-color }
-			}
-	
-			.status__relative-time { color: $primary-lighter1-text-color }
-		}
-	}
-
-	&__action-bar__counter__label { color: $primary-lighter1-text-color }
-}
-
-.detailed-status {
-	&__display-name {
-		color: $secondary-text-color;
-
-		strong { color: $primary-text-color }
-	}
-
-	&__meta {
-		.detailed-status__datetime { color: $primary-lighter1-text-color }
-
-		.detailed-status__link {
-			.fa.fa-star { vertical-align: middle }
-		}
-	}
-	
-	&__wrapper {
-		@include status-shadow;
-		
-		.detailed-status { @extend .detailed-status; }
-		.detailed-status__action-bar {
-			background: $status-actionbar-color;
-			border-color: $base-separation-color;
-		}
-	}
-}
-
-.status,
-.detailed-status {
-	background: $status-color;
-
-	.status__content {
-		color: $primary-text-color;
-
-		a { color: $secondary-text-color }
-
-		.status__content__spoiler-link {
-			color: $primary-text-color;
-			background: $base-color;
-		}
-	}
-}
-
-a.status-card,
-a.status-card.compact {
-	&:hover { background: initial }
-}
-
-.status-card,
-.status-card.compact {
-	border-color: $non-elevated-card-boader;
-
-	&__title {
-		color : $primary-text-color;
-	}
-
-	&__host {
-		color: $primary-lighter1-text-color;
-	}
-}
-
-.name-tag,
-a.name-tag {
-	color: $secondary-text-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss b/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
deleted file mode 100644
index e71ce7a38..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon-dev/tables.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.table {
-	thead th { border-bottom-color: $base-separation-color }
-	
-	th,
-	td {
-		color: $primary-text-color;
-		background-color: $base-color;
-		border-top: 0;
-	}
-
-	& > tbody > tr:nth-child(odd) {
-		& > td, & > th { background: darken($base-color, 4%) }
-	}
-
-	a { color: $secondary-text-color }
-}
-
-a.table-action-link,
-button.table-action-link {
-	color: $secondary-text-color;
-
-	&:hover { color: darken($secondary-text-color, 8%) }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon.scss b/app/javascript/styles/gplus-theme-for-mastodon.scss
deleted file mode 100644
index e233cfbea..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Google+ Theme for Mastodon v1.1
- * Copyright (C) 2018-2019 Genbu Project
- */
-
-@charset "UTF-8";
-
-@import 'application';
-@import 'gplus-theme-for-mastodon/basics';
-@import 'gplus-theme-for-mastodon/components';
-@import 'gplus-theme-for-mastodon/tables';
-@import 'gplus-theme-for-mastodon/columns';
-@import 'gplus-theme-for-mastodon/lists';
-@import 'gplus-theme-for-mastodon/accounts';
-@import 'gplus-theme-for-mastodon/statuses';
-@import 'gplus-theme-for-mastodon/notifications';
-@import 'gplus-theme-for-mastodon/searches';
-@import 'gplus-theme-for-mastodon/settings';
-@import 'gplus-theme-for-mastodon/icons';
-@import 'gplus-theme-for-mastodon/profile';
-@import 'gplus-theme-for-mastodon/about';
-@import 'gplus-theme-for-mastodon/explore';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss b/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
deleted file mode 100644
index 196473f89..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/_mixins.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@mixin column-shadow { box-shadow: 0 1px 8px 0 $column-header-shadow-color }
-@mixin status-shadow { box-shadow: 0 1px 4px 0 $status-shadow-color }
-@mixin status-focus-shadow { box-shadow: 0 0 20px 0 $status-focused-shadow-color }
-@mixin button-shadow { box-shadow: 0 2px 5px 0 $button-shadow-color }
-@mixin material-border { border-radius: 4px }
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss b/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
deleted file mode 100644
index 2160a8fc9..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/_variables.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-@charset "UTF-8";
-
-
-
-// Base colors
-$active-color: #db4437;
-$accent-color: #fbbc04;
-$valid-color: #4285f4;
-$error-color: #d50000;
-$checked-color: #4285f4;
-$verified-color: #4caf50;
-
-
-// Text colors
-$primary-text-color: rgba(0, 0, 0, 0.87);
-$primary-lighter1-text-color: change-color($color: $primary-text-color, $lightness: 62%, $alpha: 1.0); // ex: 時間表示
-$primary-lighter2-text-color: change-color($color: $primary-text-color, $lightness: 38%, $alpha: 1.0); // ex: 通知メッセージ表示
-$secondary-text-color: #2962ff;
-$secondary-lighter1-text-color: #00bfff; // ex: アカウントTLのユーザーID
-$light-text-color: #ffffff;
-$light-darker1-text-color: darken($light-text-color, 15%);
-$active-text-color: $active-color;
-$error-text-color: $error-color;
-
-
-// Icon colors
-$icon-color: #757575;
-$icon-active-color: $active-color;
-
-
-// Background colors
-$base-color: #f1f1f1;
-$base-lighter1-color: #ffffff;
-$base-darker1-color: rgba(0, 0, 0, 0.4);
-
-$column-header-color: $base-lighter1-color;
-$column-header-hover-color: change-color($color: $column-header-color, $lightness: 90%);
-
-$status-color: $base-lighter1-color;
-$status-direct-color: darken($status-color, 5%);
-$status-actionbar-color: change-color($color: $status-color, $lightness: 98%);
-
-$account-color: $base-lighter1-color;
-$account-foreground-color: $base-darker1-color;
-
-$card-color: $base-lighter1-color;
-$card-hover-color: $column-header-hover-color;
-$card-image-color: $base-color;
-
-$form-color: rgba(0, 0, 0, 0.1);
-$form-focused-color: lighten($form-color, 20%);
-$trend-color: $base-lighter1-color;
-
-$setting-base-color: $base-color;
-$setting-lists-selected-color: darken($base-color, 2%);
-$setting-lists-hover-color: darken($base-color, 5%);
-$setting-content-base-color: $base-lighter1-color;
-
-$setting-toggle-color: #b9b9b9;
-$setting-toggle-checked-color: change-color($color: $checked-color, $alpha: 0.5);
-$setting-toggle-thumb-color: #fafafa;
-$setting-toggle-thumb-checked-color: $checked-color;
-
-$dashboard-counters-base-color: $base-color;
-$dashboard-counters-hover-color: lighten($base-color, 2%);
-
-$explore-header-color: lighten($accent-color, 16%);
-$explore-directory-color: $base-lighter1-color;
-
-
-// Shadow colors
-$column-header-shadow-color: rgba(0, 0, 0, 0.3);
-$status-shadow-color: rgba(0, 0, 0, 0.14);
-$status-focused-shadow-color: change-color($color: $status-shadow-color, $alpha: 0.3);
-$icon-hovered-shadow-color: rgba(0, 0, 0, 0.26);
-$account-header-image-shadow-color: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.46));
-$button-shadow-color: rgba(0, 0, 0, 0.4);
-
-
-// Separation colors
-$base-separation-color: rgba(0, 0, 0, 0.14);
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/about.scss b/app/javascript/styles/gplus-theme-for-mastodon/about.scss
deleted file mode 100644
index de48883a8..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/about.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-// from mastodon/about.scss
-$column-breakpoint: 700px;
-
-
-
-.landing-page {
-	h3, h4, h5, h6 { color: $primary-lighter2-text-color }
-	p { color: $primary-lighter1-text-color }
-	em { color: $primary-text-color }
-
-	.column-0 { background: $base-darker1-color }
-	.column-2 {
-		.landing-page {
-			&__information { padding: 0 }
-
-			&__short-description {
-				& > .row:first-child {
-					background: $base-darker1-color;
-					padding: 10px 20px;
-				}
-
-				& > * {
-					padding-left: 40px; padding-right: 40px;
-					&:last-child { padding-bottom: 45px }
-
-					@media screen and (max-width: $column-breakpoint) {
-						padding-left: 20px; padding-right: 20px;
-						&:last-child { padding-bottom: 25px }
-					}
-				}
-			}
-		}
-	}
-
-	&__forms,
-	&__information,
-	&__call-to-action {
-		@include status-shadow;
-		background: $column-header-color;
-	}
-
-	&__forms {
-		padding: 0;
-
-		& > *:first-child { margin: inherit }
-		& > * { margin-left: 20px; margin-right: 20px; }
-
-		.brand { background: $base-darker1-color }
-
-		form {
-			& > .input input {
-				background: $form-color;
-
-				&:focus { background: $form-focused-color }
-			}
-		}
-
-		.separator-or {
-			margin-left: 20px; margin-right: 20px;
-			
-			span {
-				color: $primary-lighter1-text-color;
-				background: $column-header-color;
-			}
-		}
-
-		@media screen and (max-width: $column-breakpoint) {
-			background: inherit;
-			box-shadow: none;
-
-			.separator-or span { background: $base-color }
-		}
-	}
-
-	&__information {
-		color: $primary-lighter1-text-color;
-
-		&.contact-widget {
-			@include status-shadow;
-			background: $column-header-color;
-
-			.contact-widget {
-				&__mail {
-					a { color: $primary-text-color }
-				}
-			}
-		}
-
-		strong { color: inherit }
-
-		.row:first-child {
-			h1 small {
-				color: $light-darker1-text-color;
-
-				span { color: $light-text-color }
-			}
-		}
-	}
-
-	&__call-to-action {
-		.row__information-board {
-			.information-board__section {
-				color: $primary-lighter2-text-color;
-
-				& > span:last-child { color: $primary-lighter1-text-color }
-			}
-		}
-	}
-
-	&__features {
-		.features-list {
-			.features-list__row {
-				.text { color: $primary-lighter1-text-color }
-				.visual .fa { color: $icon-color }
-			}
-		}
-	}
-
-	&__footer { color: $primary-lighter1-text-color }
-
-	#mastodon-timeline {
-		color: $primary-text-color;
-		background: transparent;
-
-		p {
-			color: $primary-text-color;
-
-			a { color: $secondary-text-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss b/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
deleted file mode 100644
index 16bff9ee6..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/accounts.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.account {
-	background: $account-color;
-	border-color: $base-separation-color;
-
-	.account {
-		&__display-name {
-			color: $secondary-text-color;
-	
-			strong { color: $primary-text-color }
-		}
-	}
-}
-
-.column {
-	> .column-back-button {
-		@include column-shadow;
-		background: $column-header-color;
-	}
-}
-
-.account-timeline__header {
-	.account__header {
-		background-color: $account-foreground-color;
-
-		> div { background-color: inherit }
-
-		.account__header {
-			&__username { color: $secondary-lighter1-text-color }
-			&__fields { @extend .account__header__fields; }
-		}
-
-		.account--action-button {
-			.icon-button:not(.active) {
-				color: darken($light-text-color, 7%);
-
-				&:active,
-				&:focus,
-				&:hover {
-					color: $light-text-color;
-				}
-			}
-		}
-	}
-
-	.account {
-		&__disclaimer,
-		&__action-bar,
-		&__section-headline {
-			background: $column-header-color;
-			border-color: $base-separation-color;
-		}
-
-		&__action-bar {
-			&__tab {
-				border-color: $base-separation-color;
-				&.active { border-bottom-color: $active-color }
-	
-				> span { color: $primary-lighter1-text-color }
-			}
-		}
-	
-		&__section-headline {
-			a {
-				color: $primary-text-color;
-	
-				&.active {
-					color: $primary-lighter1-text-color;
-	
-					&::before { border-color: transparent transparent $base-separation-color }
-					&::after { border-color: transparent transparent $status-color }
-				}
-			}
-		}
-	}
-}
-
-.account__header__fields {
-	dl {
-		border-color: $base-separation-color;
-		
-		dt,
-		dd {
-			color: $primary-text-color;
-			background: $column-header-color;
-		}
-
-		dd {
-			&.verified {
-				border-color: transparentize($valid-color, 0.5);
-				background: transparentize($valid-color, 0.75);
-
-				a { color: lighten($verified-color, 20%) }
-			}
-		}
-	}
-
-	a { color: $secondary-text-color }
-}
-
-.account__action-bar__tab {
-	strong { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/basics.scss b/app/javascript/styles/gplus-theme-for-mastodon/basics.scss
deleted file mode 100644
index a141ecd13..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/basics.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-body {
-	&,
-	.ui {
-		color: $primary-text-color;
-		background: $base-color;
-	}
-}
-
-.focusable {
-	&:focus {
-		background: inherit;
-
-		.status {
-			@include status-focus-shadow;
-
-			&.status-direct { background: $status-direct-color }
-		}
-
-		.detailed-status {
-			& { background: $status-color }
-			&__action-bar { background: $status-actionbar-color }
-		}
-	}
-}
-
-::-webkit-scrollbar-thumb {
-	background: darken($base-lighter1-color, 12%);
-
-	&:hover { background: darken($base-lighter1-color, 16%) }
-	&:active { background: darken($base-lighter1-color, 12%) }
-}
-
-::-webkit-scrollbar-track {
-	background: $base-color;
-
-	&:hover,
-	&:active {
-		background: darken($base-lighter1-color, 8%);
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/columns.scss b/app/javascript/styles/gplus-theme-for-mastodon/columns.scss
deleted file mode 100644
index 9086e30bc..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/columns.scss
+++ /dev/null
@@ -1,197 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.tabs-bar {
-	margin: 0;
-	background: $column-header-color;
-
-	.tabs-bar {
-		&__link {
-			color: $icon-color;
-			
-			.fa { vertical-align: top }
-		}
-	}
-}
-
-.drawer {
-	.drawer {
-		&__header {
-			@include column-shadow;
-			background: $column-header-color;
-	
-			.drawer__tab { color: $icon-color }
-	
-			a {
-				&:hover { background: $column-header-hover-color }
-			}
-		}
-	
-		&__pager {
-			@include status-shadow;
-			
-			.drawer__inner {
-				background: $column-header-color;
-		
-				&__mastodon { display: none }
-			}
-		}
-	}
-}
-
-.navigation-bar {
-	color: $secondary-text-color;
-	background: $column-header-color;
-
-	.navigation-bar {
-		&__profile {
-			strong { color: $primary-text-color }
-			&-edit { color: $secondary-text-color }
-		}
-	}
-}
-
-.compose-form {
-	.compose-form {
-		&__buttons-wrapper { background: $column-header-color }
-		&__publish { border-top: 1px solid $base-separation-color }
-	}
-}
-
-.column {
-	.column-header {
-		@include column-shadow;
-		background: $column-header-color;
-
-		&.active {
-			.column-header__icon {
-				color: $icon-active-color;
-				text-shadow: 0 0 10px change-color($color: $icon-active-color, $alpha: 0.4);
-			}
-		}
-
-		* { background: inherit }
-
-		&__icon {
-			color: $icon-color;
-			vertical-align: top;
-		}
-
-		&__buttons {
-			.column-header {
-				&__back-button {
-					.column-back-button__icon { vertical-align: unset }
-				}
-	
-				&__button {
-					&.active {
-						color: $icon-active-color;
-						background: inherit;
-					}
-		
-					.fa { vertical-align: unset }
-				}
-			}
-		}
-
-		&__collapsible {
-			color: $secondary-text-color;
-			border-bottom: 1px solid $base-separation-color;
-	
-			&-inner { background: $column-header-color }
-		}
-	}
-
-	.column-back-button {
-		&__icon { vertical-align: unset }
-	}
-
-	.column {
-		&-subheading { background: darken($base-color, 10%) }
-	
-		&-link {
-			color: $primary-text-color;
-			background: $base-color;
-	
-			&__icon {
-				color: $icon-color;
-				vertical-align: top;
-			}
-		}
-	}
-
-	.scrollable {
-		background: transparent;
-
-		*[role="feed"] {
-			article {
-				margin: 1em 0;
-				&:first-of-type { margin: 0 }
-			}
-		}
-
-		div[tabindex="-1"] { margin-bottom: 1em }
-	}
-
-	.notification__filter-bar {
-		background: $column-header-color;
-		border-bottom-color: $base-separation-color;
-
-		button {
-			color: $icon-color;
-			background: $column-header-color;
-
-			&.active {
-				color: $icon-active-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $column-header-color }
-			}
-		}
-	}
-
-	.empty-column-indicator {
-		flex-direction: column;
-		background: $base-color;
-
-		&::before {
-			content: "";
-			display: block;
-
-			width: 100px;
-			height: 100px;
-			margin-bottom: 1em;
-
-			background: none center / contain no-repeat;
-			background-image: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/notification-jingle_2x.gif");
-		}
-	}
-}
-
-.getting-started {
-	&__wrapper,
-	& {
-		background: $base-color;
-	}
-
-	& {
-		border-top: 1px solid $base-separation-color;
-
-		a { color: $primary-text-color }
-	}
-}
-
-.load {
-	&-more,
-	&-gap {
-		background: transparent;
-
-		&:hover { background: darken($column-header-color, 10%) }
-	}
-
-	&-gap { border: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
deleted file mode 100644
index ef50ce863..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/components-button.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.floating-action-button {
-	font-size: 24px;
-	background: $active-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
deleted file mode 100644
index cc6bf2808..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/components-card.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.card {
-	border: 1px solid $base-separation-color;
-
-	> a {
-		@include status-shadow;
-
-		&:hover,
-		&:focus,
-		&:active {
-			.card__bar {
-				background: initial;
-
-				.display-name strong { color: $secondary-text-color }
-			}
-		}
-
-		.card__img { background: $card-image-color }
-		.card__bar {
-			background: $card-color;
-	
-			.avatar {
-				img { background: transparent }
-			}
-	
-			.display-name {
-				strong { color: $primary-text-color }
-				span { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss b/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
deleted file mode 100644
index afc55f95f..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/components-dropdown.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.dropdown-menu,
-.actions-modal > ul {
-	@include material-border;
-	background: $base-lighter1-color;
-
-	.dropdown-menu {
-		&__arrow {
-			&.top { border-top-color: $column-header-color }
-			&.bottom { border-bottom-color: $column-header-color }
-		}
-
-		&__item {
-			a {
-				color: $primary-lighter2-text-color;
-
-				padding: 8px 16px;
-				background: $column-header-color;
-
-				&:active,
-				&:focus,
-				&:hover {
-					background: $column-header-hover-color;
-				}
-			}
-		}
-
-		&__separator { border-bottom-color: $base-separation-color }
-	}
-
-	& > li:not(:empty) {
-		@extend .dropdown-menu__item;
-
-		a { padding: 12px 16px }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/components.scss b/app/javascript/styles/gplus-theme-for-mastodon/components.scss
deleted file mode 100644
index 2b0e8a816..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/components.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-@import 'components-button';
-@import 'components-card';
-@import 'components-dropdown';
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/explore.scss b/app/javascript/styles/gplus-theme-for-mastodon/explore.scss
deleted file mode 100644
index 7d4726790..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/explore.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.public-layout {
-	.page-header {
-		background: $explore-header-color;
-
-		h1 { color: $primary-text-color }
-		p { color: $primary-lighter2-text-color }
-	}
-
-	.directory {
-		background: $explore-directory-color;
-
-		.accounts-table {
-			&__count {
-				color: $primary-lighter2-text-color;
-				small { color: $primary-lighter1-text-color }
-			}
-		}
-
-		&__tag {
-			a { background: $explore-directory-color }
-			h4 { color: $primary-text-color }
-			.fa, small { color: $primary-lighter1-text-color }
-		}
-	}
-
-	.notice-widget {
-		color: $primary-lighter1-text-color;
-		background: $explore-directory-color;
-
-		a { color: $secondary-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/icons.scss b/app/javascript/styles/gplus-theme-for-mastodon/icons.scss
deleted file mode 100644
index 0125172ad..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/icons.scss
+++ /dev/null
@@ -1,97 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-@function hex-color($color) {
-	@if type-of($color) == 'color' {
-		$color: str-slice(ie-hex-str($color), 4);
-	}
-
-	@return '%23' + unquote($color)
-};
-
-
-
-@font-face {
-	font-family: "Material Icons Extended";
-	src:
-		local("Material Icons Extended"),
-		url("https://fonts.gstatic.com/s/materialiconsextended/v50/kJEjBvgX7BgnkSrUwT8UnLVc38YydejYY-oE_LvJ.woff2"),
-		url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/font-Material_Icons_Extended-v50.woff2");
-}
-
-.icon-button {
-	color: $icon-color;
-
-	&:active,
-	&:focus,
-	&:hover {
-		color: lighten($icon-color, 7%);
-	}
-
-	&.star-icon {
-		&.active {
-			color: $light-text-color;
-			background: $icon-active-color;
-			border-radius: 50%;
-		}
-
-		.fa.fa-star { vertical-align: top }
-	}
-
-	&.disabled {
-		color: lighten($icon-color, 13%);
-
-		.fa.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(darken($icon-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-		}
-	}
-
-	.fa {
-		vertical-align: middle;
-
-		&.fa-retweet {
-			background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($icon-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			
-			&:active,
-			&:hover,
-			&:focus {
-				background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($icon-color, 7%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($checked-color)}' stroke-width='0'/></svg>");
-			}
-		}
-	}
-}
-
-.fa {
-	&.fa-users,
-	&.fa-globe,
-	&.fa-cog,
-	&.fa-star,
-	&.fa-home,
-	&.fa-bell,
-	&.fa-eraser,
-	&.fa-ellipsis-h,
-	&.fa-ellipsis-v,
-	&.fa-address-book,
-	&.fa-thumb-tack,
-	&.fa-lock,
-	&.fa-pencil {
-		font-family: "Material Icons Extended";
-	}
-
-	&.fa-users::before { content: "people" } // 人々マーク(.drawer__header > .drawer__tab:2)
-	&.fa-globe::before { content: "" } // 地球マーク(.drawer__header > .drawer__tab:3)
-	&.fa-cog::before { content: "settings" } // 歯車マーク(.drawer__header > .drawer__tab:4)
-	&.fa-star::before { content: "plus_one" } // +1(.status .status__action-bar > .star-icon)
-	&.fa-home::before { content: "home" } // 家マーク(ホームタイムライン)
-	&.fa-bell::before { content: "" } // ベルマーク(通知)
-	&.fa-eraser::before { content: "" } // 通知を消去のマーク
-	&.fa-ellipsis-h::before { content: "" } // 三点リーダー(横)
-	&.fa-ellipsis-v::before { content: "" } // 三点リーダー(縦)
-	&.fa-address-book::before { content: "" } // discoverマーク(explore遷移タブ)
-	&.fa-thumb-tack::before { content: "" } // ピンマーク(ピン留め投稿)
-	&.fa-lock::before { content: "" } // サークルマーク(フォロワー限定投稿)
-	&.fa-pencil::before { content: "" } // 鉛筆マーク(モバイル用フローティングボタン)
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/lists.scss b/app/javascript/styles/gplus-theme-for-mastodon/lists.scss
deleted file mode 100644
index eb770001e..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/lists.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.column {
-	.column-back-button { background: inherit }
-
-	.column-inline-form {
-		background: $column-header-color;
-
-		label input {
-			color: $secondary-text-color;
-			&:focus { color: $primary-text-color }
-		}
-	}
-
-	.column-inline-form ~ .scrollable {
-		article { margin: 0 }
-	}
-}
-
-.modal-root {
-	.list-editor {
-		background: $base-color;
-		
-		h4 { background: $column-header-color }
-
-		.drawer__pager {
-			.drawer__inner { background: $column-header-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss b/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
deleted file mode 100644
index bab098372..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/notifications.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.notification {
-	&.notification-favourite {
-		.status {
-			&.status-direct { background: transparent }
-		}
-	}
-
-	> .notification__message {
-		color: $primary-lighter2-text-color;
-		font-size: 13px;
-		padding: 8px 0;
-
-		.notification__display-name {
-			&:hover { color: inherit }
-		}
-
-		.notification__favourite-icon-wrapper {
-			.star-icon { color: $icon-active-color }
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/profile.scss b/app/javascript/styles/gplus-theme-for-mastodon/profile.scss
deleted file mode 100644
index 2bfa60c45..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/profile.scss
+++ /dev/null
@@ -1,231 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.public-layout {
-	a.button {
-		@include button-shadow;
-
-		color: $primary-text-color;
-		background: $base-lighter1-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			background: darken($base-lighter1-color, 8%);
-		}
-	}
-
-	.logo-button {
-		svg path {
-			/* Only for Itabashi-don */
-			&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-			&:last-child { fill: $base-lighter1-color !important }
-		}
-	}
-
-	.public-account-header {
-		@include status-shadow;
-
-		&__image {
-			background: $base-lighter1-color;
-
-			@media screen and (min-width: 600px) { height: 500px }
-
-			&::after {
-				position: absolute;
-				top: auto;
-				left: 0;
-				bottom: 0;
-
-				width: 100%;
-				height: 30%;
-				background: $account-header-image-shadow-color;
-				box-shadow: none;
-			}
-
-			> img:not([src]),
-			> img[src="/headers/original/missing.png"] {
-				content: url("https://raw.githubusercontent.com/GenbuProject/GPlusTheme-for-Mastodon/asset/account-default_header.jpg");
-			}
-		}
-
-		&__bar {
-			@media screen and (max-width: 600px) {
-				flex-direction: column;
-				background: $base-color;
-			}
-			
-			@media screen and (min-width: 600px) { margin-top: -140px }
-
-			&::before { background: $base-lighter1-color }
-
-			.avatar {
-				@media screen and (max-width: 600px) {
-					position: relative;
-					bottom: 30px;
-
-					display: initial;
-					width: 60px;
-					height: 60px;
-					margin: 0 auto;
-					padding: 0;
-				}
-
-				img {
-					border: 2px solid $base-lighter1-color;
-					border-radius: 50%;
-					background: transparent;
-				}
-			}
-		}
-
-		&__tabs {
-			@media screen and (max-width: 600px) {
-				flex-wrap: wrap;
-				margin-left: 0;
-
-				&__name {
-					width: 100%;
-					text-align: center;
-
-					h1 {
-						color: $primary-text-color;
-
-						small { color: $primary-lighter1-text-color }
-					}
-				}
-
-				&__tabs {
-					justify-content: center;
-					flex: auto;
-
-					.spacer { display: none }
-
-					a.button.logo-button {
-						color: $light-text-color;
-						background: $secondary-text-color;
-
-						svg path {
-							/* Only for Itabashi-don */
-							&:not(#Mastodon):not(#Itabashi) { fill: $base-lighter1-color !important }
-							&:last-child { fill: $secondary-text-color !important }
-						}
-					}
-				}
-			}
-
-			.details-counters {
-				.counter {
-					color: $light-text-color;
-					border-right: 0;
-
-					&::after { border-bottom-color: $base-color }
-
-					&.active {
-						&::after { border-bottom-color: $active-color }
-					}
-				}
-			}
-		}
-
-		&__extra {
-			.public-account-bio {
-				.account__header__content { text-align: center }
-			}
-
-			&__links {
-				color: $primary-text-color;
-
-				a {
-					&, strong { color: $primary-text-color }
-				}
-			}
-		}
-	}
-
-	.public-account-bio {
-		@include column-shadow;
-		background: $base-lighter1-color;
-		
-		.account__header__content { color: $primary-text-color }
-		&__extra { color: $primary-lighter1-text-color }
-	}
-
-	.endorsements-widget {
-		@include column-shadow;
-
-		padding-bottom: 0;
-		border-radius: 4px;
-
-		h4 {
-			color: $primary-lighter1-text-color;
-			background: $base-lighter1-color;
-		}
-	}
-
-	.hero-widget {
-		@include column-shadow;
-
-		&__img { background: $base-color }
-		&__text {
-			background: $base-lighter1-color;
-
-			&, em { color: $primary-lighter2-text-color }
-			a { color: $secondary-text-color }
-		}
-	}
-
-	.account__section-headline {
-		background: $base-lighter1-color;
-		border-bottom-color: $base-separation-color;
-
-		a {
-			color: $primary-lighter1-text-color;
-
-			&.active {
-				color: $primary-lighter2-text-color;
-
-				&::before { border-color: transparent transparent $base-separation-color }
-				&::after { border-color: transparent transparent $status-color }
-			}
-		}
-	}
-
-	.activity-stream {
-		box-shadow: none;
-
-		.entry {
-			margin: 1em 0;
-			background: transparent;
-
-			&:first-of-type { margin: 0 }
-		}
-	}
-
-	.nothing-here {
-		@include status-shadow;
-
-		color: $primary-lighter1-text-color;
-		background: $base-lighter1-color;
-	}
-
-	.footer {
-		h4 { color: $primary-lighter1-text-color }
-
-		ul {
-			a { color: $primary-lighter2-text-color }
-		}
-
-		.brand {
-			svg path {
-				/* Only for Itabashi-don */
-				&:not(#Mastodon):not(#Itabashi) { fill: $secondary-text-color !important }
-				&:last-child { fill: $base-lighter1-color !important }
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/searches.scss b/app/javascript/styles/gplus-theme-for-mastodon/searches.scss
deleted file mode 100644
index b4478b91b..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/searches.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.search {
-	.search {
-		&__input {
-			@include material-border;
-
-			color: $primary-text-color;
-			background: $form-color;
-	
-			&:focus { background: $form-focused-color }
-		}
-	
-		&__icon {
-			.fa { color: $icon-color }
-		}
-	}
-
-	&-results {
-		> .search-results {
-			&__header { background: $base-color }
-			&__section {
-				> h5 { background: darken($base-color, 10%) }
-			}
-		}
-	}
-}
-
-.trends__item {
-	background: $trend-color;
-
-	.trends__item {
-		&__name a { color: $secondary-text-color }
-		&__current { color: lighten($secondary-text-color, 10%) }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
deleted file mode 100644
index d069af381..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/settings-account.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.edit_account {
-	@media screen and (min-width: 415px) {
-		.card {
-			> a {
-				position: relative;
-
-				.card__img { border-bottom: 1px solid $base-separation-color }
-				.card__bar {
-					position: static;
-					padding-top: 30%;
-			
-					.avatar {
-						position: absolute;
-						left: 0;
-						bottom: 0;
-
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						width: 100%;
-						height: 100%;
-
-						img {
-							width: 128px;
-							height: 128px;
-						}
-					}
-			
-					.display-name {
-						flex: auto;
-						margin-left: 0;
-						text-align: center;
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
deleted file mode 100644
index 0e9c55136..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/settings-dashboard.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.dashboard {
-	&__counters {
-		& > div {
-			& > div, & > a { background: $dashboard-counters-base-color }
-			
-			& > a {
-				&:hover,
-				&:focus,
-				&:active {
-					background: $dashboard-counters-hover-color;
-				}
-			}
-		}
-
-		&__num { color: $primary-text-color }
-		&__label { color: $primary-lighter1-text-color }
-	}
-
-	&__widgets {
-		a:not(.name-tag) { color: $primary-lighter2-text-color }
-	}
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
deleted file mode 100644
index 7912d1ddc..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/settings-report.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.report-card {
-	background: $setting-content-base-color;
-
-	&__profile__stats {
-		color: $primary-lighter2-text-color;
-
-		a {
-			&:focus,
-			&:hover,
-			&:active {
-				color: lighten($primary-lighter2-text-color, 8%);
-			}
-		}
-	}
-
-	&__summary {
-		&__item {
-			border-top-color: $base-separation-color;
-
-			&:hover { background: $column-header-hover-color }
-
-			&__reported-by,
-			&__assigned {
-				color: $primary-lighter2-text-color;
-			}
-
-			&__content {
-				&__icon { color: $icon-color }
-				a { color: $primary-lighter2-text-color }
-			}
-		}
-	}
-}
-
-.batch-table {
-	&__toolbar {
-		background: $base-lighter1-color;
-		border-color: $base-separation-color;
-	}
-
-	&__row {
-		background: $base-lighter1-color;
-		border-color: $base-separation-color;
-
-		&:hover { background: $column-header-hover-color }
-
-		&__content {
-			.status__content { color: $primary-text-color }
-			.detailed-status__meta { color: $primary-lighter1-text-color }
-		}
-	}
-}
-
-.speech-bubble {
-	&__bubble { color: $primary-text-color }
-	a { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/settings.scss b/app/javascript/styles/gplus-theme-for-mastodon/settings.scss
deleted file mode 100644
index 752d2c662..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/settings.scss
+++ /dev/null
@@ -1,208 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-@import 'settings-account';
-@import 'settings-report';
-@import 'settings-dashboard';
-
-
-
-body.admin {
-	color: $primary-text-color;
-	background: $setting-base-color;
-	
-	.sidebar {
-		&-wrapper { background: inherit }
-
-		ul {
-			border-radius: 0;
-
-			a {
-				color: $primary-lighter2-text-color;
-				border-radius: 0;
-
-				&:hover {
-					color: $primary-text-color;
-					background: $setting-lists-hover-color;
-				}
-
-				&.selected {
-					color: $primary-text-color;
-					background: $setting-lists-selected-color;
-				}
-			}
-
-			ul { background: darken($setting-base-color, 4%) }
-
-			.simple-navigation-active-leaf a {
-				color: $icon-active-color;
-				background: initial;
-
-				&:hover { background: $setting-lists-hover-color }
-			}
-		}
-	}
-
-	.content {
-		@include column-shadow;
-		background: $setting-content-base-color;
-
-		h2, h3, h4, h6 { color: $primary-text-color }
-
-		p {
-			color: $primary-text-color;
-			strong { color: $primary-text-color }
-		}
-
-		h2, h4, hr { border-bottom-color: $base-separation-color }
-		.muted-hint { color: $primary-lighter1-text-color }
-	}
-}
-
-.simple_form {
-	.input {
-		&.boolean,
-		&.with_label,
-		&.with_floating_label {
-			.label_input > label { color: $primary-text-color }
-		}
-
-		&.with_block_label {
-			& > label { color: $primary-text-color }
-		}
-
-		&.radio_buttons{
-			.radio label { color: $primary-text-color }
-		}
-
-		&-copy { background: $base-color }
-	}
-
-	.check_boxes {
-		.checkbox {
-			label { color: $primary-text-color }
-		}
-	}
-
-	input[type=text],
-	input[type=number],
-	input[type=email],
-	input[type=password],
-	textarea {
-		color: $primary-text-color;
-		background: $setting-content-base-color;
-		border-color: $base-separation-color;
-
-		&:hover {
-			border-color: $base-separation-color;
-		}
-
-		&:active,
-		&:focus {
-			background: darken($setting-content-base-color, 8%);
-		}
-	}
-
-	select {
-		color: $primary-text-color;
-		background-color: $setting-content-base-color;
-		border-color: $base-separation-color;
-	}
-
-	.input.field_with_errors {
-		label,
-		.error {
-			color: $error-text-color;
-		}
-	}
-
-	.hint, p.hint { color: $primary-lighter1-text-color !important }
-
-	.label_input {
-		&__append { color: $primary-lighter1-text-color }
-	}
-}
-
-.simple_form,
-.table-form {
-	.warning { background: change-color($color: $error-color, $alpha: 0.8) }
-}
-
-.quick-nav {
-	a {
-		color: $secondary-text-color;
-
-		&:hover,
-		&:focus,
-		&:active {
-			color: lighten($secondary-text-color, 8%);
-		}
-	}
-}
-
-.pagination {
-	.page,
-	a {
-		color: $primary-text-color;
-	}
-
-	.page {
-		&.current {
-			background: $icon-active-color;
-			color: $light-text-color;
-		}
-	}
-}
-
-.filters {
-	.filter-subset {
-		strong { color: $primary-text-color }
-
-		a {
-			color: $primary-lighter2-text-color;
-
-			&:hover { color: $primary-text-color }
-
-			&.selected {
-				color: $active-text-color;
-				border-bottom-color: $active-text-color;
-			}
-		}
-	}
-}
-
-label {
-	&[for=user_setting_default_privacy_public],
-	&[for=user_setting_default_privacy_unlisted] {
-		color: $active-text-color !important;
-	}
-}
-
-.column-header__collapsible__extra {
-	.column-settings__section { color: $primary-text-color }
-
-	.setting-toggle {
-		.react-toggle {
-			&.react-toggle--checked {
-				> .react-toggle-track { background: $setting-toggle-checked-color }
-
-				> .react-toggle-thumb {
-					border-color: $setting-toggle-checked-color;
-					background-color: $setting-toggle-thumb-checked-color;
-				}
-			}
-
-			> .react-toggle-track { background: $setting-toggle-color }
-
-			> .react-toggle-thumb {
-				border-color: $setting-toggle-color;
-				background-color: $setting-toggle-thumb-color;
-			}
-		}
-
-		.setting-toggle__label { color: $primary-text-color }
-	}
-
-	.setting-meta__label { color: $primary-lighter1-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss b/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
deleted file mode 100644
index 0532a0b90..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/statuses.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-@import 'mixins';
-
-
-
-.status {
-	@include status-shadow;
-	border-bottom: 0;
-
-	transition: box-shadow 0.1s 0s ease-out;
-
-	&.light {
-		.status {
-			&__relative-time { color: $primary-lighter1-text-color }
-			&__display-name {
-				color: $primary-text-color;
-
-				.display-name__account { color: $primary-lighter1-text-color }
-			}
-
-			&__content { color: $primary-text-color }
-		}
-	}
-
-	&.status-direct {
-		background: $status-direct-color;
-
-		&:not(.read) {
-			background: inherit;
-			border-bottom-color: initial;
-		}
-	}
-
-	&.muted {
-		.status__content {
-			p { color: lighten($primary-text-color, 20%) }
-		}
-	}
-
-	.status {
-		&__info {
-			.status__display-name {
-				color: $primary-lighter1-text-color;
-	
-				strong { color: $primary-text-color }
-			}
-	
-			.status__relative-time { color: $primary-lighter1-text-color }
-		}
-	}
-}
-
-.detailed-status {
-	.detailed-status {
-		&__display-name {
-			color: $secondary-text-color;
-	
-			strong { color: $primary-text-color }
-		}
-	
-		&__meta {
-			.detailed-status__datetime { color: $primary-lighter1-text-color }
-	
-			.detailed-status__link {
-				.fa.fa-star { vertical-align: middle }
-			}
-		}
-	}
-	
-	&__wrapper {
-		@include status-shadow;
-		
-		.detailed-status { @extend .detailed-status; }
-		.detailed-status__action-bar {
-			background: $status-actionbar-color;
-			border-color: $base-separation-color;
-		}
-	}
-}
-
-.status,
-.detailed-status {
-	background: $status-color;
-
-	.status__content {
-		color: $primary-text-color;
-
-		a { color: $secondary-text-color }
-
-		.status__content__spoiler-link {
-			color: $primary-text-color;
-			background: $base-color;
-		}
-	}
-}
-
-a.status-card,
-a.status-card.compact {
-	&:hover { background: initial }
-}
-
-.name-tag,
-a.name-tag {
-	color: $secondary-text-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/gplus-theme-for-mastodon/tables.scss b/app/javascript/styles/gplus-theme-for-mastodon/tables.scss
deleted file mode 100644
index e71ce7a38..000000000
--- a/app/javascript/styles/gplus-theme-for-mastodon/tables.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "UTF-8";
-
-@import 'variables';
-
-
-
-.table {
-	thead th { border-bottom-color: $base-separation-color }
-	
-	th,
-	td {
-		color: $primary-text-color;
-		background-color: $base-color;
-		border-top: 0;
-	}
-
-	& > tbody > tr:nth-child(odd) {
-		& > td, & > th { background: darken($base-color, 4%) }
-	}
-
-	a { color: $secondary-text-color }
-}
-
-a.table-action-link,
-button.table-action-link {
-	color: $secondary-text-color;
-
-	&:hover { color: darken($secondary-text-color, 8%) }
-}
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 47a625f28..341effbb2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1190,9 +1190,6 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
-    google-plus: Google+
-    google-plus-dev: Google+ Dev
-    dark-google-plus-dev: Dark Google+ Dev
 
   time:
     formats:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6c79b16cc..7ea6f1f38 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1169,9 +1169,6 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
-    google-plus: Google+
-    google-plus-dev: Google+ Dev
-    dark-google-plus-dev: Dark Google+ Dev
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index ff2639be1..9c21c9459 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,6 +1,3 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
-google-plus: styles/gplus-theme-for-mastodon.scss
-google-plus-dev: styles/gplus-theme-for-mastodon-dev.scss
-dark-google-plus-dev: styles/dark-gplus-theme-for-mastodon-dev.scss

From 2ddeab4c2194642ad68f299b2736f41a88c7994c Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 9 Feb 2020 17:09:12 +0900
Subject: [PATCH 020/200] Update navigation_panel.js

---
 .../mastodon/features/ui/components/navigation_panel.js          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 2c0f63e66..569049bba 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -16,7 +16,6 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/timelines/tag/Yづinfo'><Icon className='colmun-link__icon' id='bullhorn' fixedWidth /><FormattedMessage id='tabs_bar.admin_notifications' defaultMessage='Admin Notification' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='colmun-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmark' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>

From 59c715a3c2cdcf930ce6589a1a76dcf1cffb74d4 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 9 Feb 2020 17:09:59 +0900
Subject: [PATCH 021/200] Update navigation_panel.js

---
 .../mastodon/features/ui/components/navigation_panel.js          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 569049bba..0c12852f5 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -16,7 +16,6 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='colmun-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmark' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>

From 12ed74781185cfd74435bf53181a72bd0d6585f2 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Sun, 8 Mar 2020 21:03:15 +0900
Subject: [PATCH 022/200] Material theme (dev) initial release

---
 .../styles/fonts/MaterialIcons-Regular.woff2  | Bin 0 -> 44300 bytes
 .../styles/mastodon-material-dev.scss         |  15 +
 .../styles/mastodon-material-dev/_mixins.scss |  23 ++
 .../styles/mastodon-material-dev/account.scss | 127 +++++++
 .../styles/mastodon-material-dev/basics.scss  |  20 +
 .../styles/mastodon-material-dev/button.scss  |  59 +++
 .../styles/mastodon-material-dev/cards.scss   |   1 +
 .../mastodon-material-dev/color/dark.scss     |  30 ++
 .../mastodon-material-dev/color/light.scss    |  93 +++++
 .../styles/mastodon-material-dev/columns.scss | 351 ++++++++++++++++++
 .../mastodon-material-dev/components.scss     | 329 ++++++++++++++++
 .../styles/mastodon-material-dev/config.scss  |  21 ++
 .../styles/mastodon-material-dev/control.scss |  59 +++
 .../mastodon-material-dev/emoji-picker.scss   |  88 +++++
 .../styles/mastodon-material-dev/icons.scss   |  36 ++
 .../mastodon-material-dev/material-icons.scss |  88 +++++
 .../styles/mastodon-material-dev/media.scss   |  17 +
 .../styles/mastodon-material-dev/mobile.scss  |   0
 .../profile/material-v1.scss                  |  52 +++
 .../profile/material-v2.scss                  |  66 ++++
 .../mastodon-material-dev/statuses.scss       | 135 +++++++
 .../initializers/content_security_policy.rb   |   2 -
 config/locales/en.yml                         |   3 +-
 config/locales/ja.yml                         |   2 +
 config/themes.yml                             |   3 +
 25 files changed, 1617 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/styles/fonts/MaterialIcons-Regular.woff2
 create mode 100644 app/javascript/styles/mastodon-material-dev.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/_mixins.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/account.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/basics.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/button.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/cards.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/color/dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/color/light.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/columns.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/components.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/config.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/control.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/emoji-picker.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/icons.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/material-icons.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/media.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/mobile.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
 create mode 100644 app/javascript/styles/mastodon-material-dev/statuses.scss

diff --git a/app/javascript/styles/fonts/MaterialIcons-Regular.woff2 b/app/javascript/styles/fonts/MaterialIcons-Regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..9fa211252080046a23b2449dbdced6abc2b0bb34
GIT binary patch
literal 44300
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
QW8}wPUeo^@jR61v08@RD2LJ#7

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/mastodon-material-dev.scss b/app/javascript/styles/mastodon-material-dev.scss
new file mode 100644
index 000000000..9cc10708d
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev.scss
@@ -0,0 +1,15 @@
+@charset "UTF-8";
+
+@import 'mastodon-material-dev/account';
+@import 'mastodon-material-dev/basics';
+@import 'mastodon-material-dev/button';
+// @import 'mastodon-material-dev/cards';
+@import 'mastodon-material-dev/columns';
+@import 'mastodon-material-dev/components';
+@import 'mastodon-material-dev/config';
+@import 'mastodon-material-dev/control';
+@import 'mastodon-material-dev/emoji-picker';
+@import 'mastodon-material-dev/icons';
+@import 'mastodon-material-dev/material-icons';
+@import 'mastodon-material-dev/media';
+@import 'mastodon-material-dev/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/_mixins.scss b/app/javascript/styles/mastodon-material-dev/_mixins.scss
new file mode 100644
index 000000000..798e690e7
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/_mixins.scss
@@ -0,0 +1,23 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
diff --git a/app/javascript/styles/mastodon-material-dev/account.scss b/app/javascript/styles/mastodon-material-dev/account.scss
new file mode 100644
index 000000000..46203b7e4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/account.scss
@@ -0,0 +1,127 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $outlined-chip-color;
+    border: 1px solid $border-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/basics.scss b/app/javascript/styles/mastodon-material-dev/basics.scss
new file mode 100644
index 000000000..fd5abf7a8
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/basics.scss
@@ -0,0 +1,20 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body {
+    background: $background-color;
+}
+
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/button.scss b/app/javascript/styles/mastodon-material-dev/button.scss
new file mode 100644
index 000000000..b1a0b99a3
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/button.scss
@@ -0,0 +1,59 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active { color: $icon-button-active-color }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/cards.scss b/app/javascript/styles/mastodon-material-dev/cards.scss
new file mode 100644
index 000000000..08778d7a8
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/cards.scss
@@ -0,0 +1 @@
+{\rtf1}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/dark.scss b/app/javascript/styles/mastodon-material-dev/color/dark.scss
new file mode 100644
index 000000000..75759126a
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/color/dark.scss
@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #db4437;
+$secondary-color: #ffffff;
+$error-color: #d50000;
+
+// Text color
+$ui-text-color: #ffffff;
+$secondary-text-color: #80868b;
+$info-text-color: #5e5e5e;
+$tips-text-color: #ffffff;
+$disabled-text-color: #ffffff;
+$inverted-text-color: #ffffff;
+$link-text-color: #4285f4;
+
+// Background-color
+$background-color: #121212;
+
+// Icon color
+$icon-color: #757575;
+
+// Button color
+$icon-button-color: #757575;
+$contained-button-color: #4285f4;
+
+// Derived color
+$top-bar-color: lighten($background-color, 10%);
+$search-bar-color: lighten($background-color, 20%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/light.scss b/app/javascript/styles/mastodon-material-dev/color/light.scss
new file mode 100644
index 000000000..c2c47545a
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/color/light.scss
@@ -0,0 +1,93 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$ui-text-color: #202124;
+$ui-inverted-text-color: #ffffff;
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$card-background-color: $background-color;
+$card-background-inactive-color: darken($card-background-color, 6%);
+$list-background-color: $background-color;
+$list-background-inactive-color: darken($list-background-color, 6%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: $disabled-icon-color;
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$top-bar-hover-color: $icon-background-hover-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/columns.scss b/app/javascript/styles/mastodon-material-dev/columns.scss
new file mode 100644
index 000000000..796382d31
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/columns.scss
@@ -0,0 +1,351 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $ui-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $primary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $icon-button-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $icon-button-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $icon-button-active-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $top-bar-color;
+            padding: 16px;
+        }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $menu-background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $menu-background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $menu-background-hover-color }
+
+    &:active,
+    &:focus { background: $menu-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status__content {
+        color: $primary-text-color;
+
+        p { color: $primary-text-color }
+
+        a { color: $secondary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+    
+        button {
+            background: $top-bar-color;
+            color: $secondary-text-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+div.notification.notification-favourite.focusable,
+div.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.notification-favourite .status.status-direct { background: transparent }
+
+.relationship-tag {
+    color: $ui-inverted-text-color;
+    background-color: $media-icon-background-color;
+    font-size: 12px;
+    border-radius: 17px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/components.scss b/app/javascript/styles/mastodon-material-dev/components.scss
new file mode 100644
index 000000000..e2a0d6af8
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/components.scss
@@ -0,0 +1,329 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $top-bar-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 12px auto 12px;
+        padding: 8px;
+        flex: none;
+        height: 16px;
+    
+        &:hover { color: $icon-button-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon {
+            background: $background-color
+        }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $ui-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $ui-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.account__avatar {
+    border-radius: $avater-radius;
+    width: 40px;
+    height: 40px;
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $ui-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $background-color;
+        color: $ui-text-color;
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
new file mode 100644
index 000000000..e733bc8af
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/light';
+
+
+// Profile
+@import 'profile/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in .../fonts folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/control.scss b/app/javascript/styles/mastodon-material-dev/control.scss
new file mode 100644
index 000000000..9048d1228
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/control.scss
@@ -0,0 +1,59 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $disabled-icon-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 24px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss b/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
new file mode 100644
index 000000000..d5eada557
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
@@ -0,0 +1,88 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/icons.scss b/app/javascript/styles/mastodon-material-dev/icons.scss
new file mode 100644
index 000000000..d4cc4ebff
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/icons.scss
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/material-icons.scss b/app/javascript/styles/mastodon-material-dev/material-icons.scss
new file mode 100644
index 000000000..d7c8fcbd7
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/material-icons.scss
@@ -0,0 +1,88 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/media.scss b/app/javascript/styles/mastodon-material-dev/media.scss
new file mode 100644
index 000000000..14b43d4ea
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/media.scss
@@ -0,0 +1,17 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/mobile.scss b/app/javascript/styles/mastodon-material-dev/mobile.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
new file mode 100644
index 000000000..b18ec1b72
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
@@ -0,0 +1,52 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Bar radius settings
+$bar-radius: 2px;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Favorite icon settings
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.notification__favourite-icon-wrapper .star-icon {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
new file mode 100644
index 000000000..3e19b60e4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
@@ -0,0 +1,66 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Bar radius settings
+$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Favorite icon settings
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.notification__favourite-icon-wrapper .star-icon {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/statuses.scss b/app/javascript/styles/mastodon-material-dev/statuses.scss
new file mode 100644
index 000000000..5f1da722f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dev/statuses.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info { font-size: 16px }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: $card-background-color;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: $card-background-color !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index d49fcfa99..f82c25cd1 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -10,8 +10,6 @@ base_host = Rails.configuration.x.web_domain
 
 assets_host   = Rails.configuration.action_controller.asset_host
 assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
-google_font_host = "https://fonts.gstatic.com"
-gplus_theme_host = "https://raw.githubusercontent.com"
 assets_host ||= host_to_url(base_host)
 
 media_host   = host_to_url(ENV['S3_ALIAS_HOST'])
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 44c116dfb..0ec250025 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1192,7 +1192,8 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
-
+    # additional theme
+    mastodon-material-dev: Material Dev (Light)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 24a159e57..2875d4fd7 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1173,6 +1173,8 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
+    # 追加テーマ
+    mastodon-material: Material Dev (ライト)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index 9c21c9459..e93b9f8f1 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,3 +1,6 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+
+# 追加テーマ
+mastodon-material: styles/mastodon-material-dev.scss

From 663b2f91e2d0b86f7ad0c6fd2eaaeec1befb9591 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 11:05:55 +0900
Subject: [PATCH 023/200] fix CSP (#268)

---
 config/initializers/content_security_policy.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index f82c25cd1..af7d16aaf 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -9,7 +9,6 @@ end
 base_host = Rails.configuration.x.web_domain
 
 assets_host   = Rails.configuration.action_controller.asset_host
-assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
 assets_host ||= host_to_url(base_host)
 
 media_host   = host_to_url(ENV['S3_ALIAS_HOST'])
@@ -21,7 +20,7 @@ Rails.application.config.content_security_policy do |p|
   p.base_uri        :none
   p.default_src     :none
   p.frame_ancestors :none
-  p.font_src        :self, assets_host, google_font_host
+  p.font_src        :self, assets_host
   p.img_src         :self, :https, :data, :blob, assets_host
   p.style_src       :self, :unsafe_inline, assets_host
   p.media_src       :self, :https, :data, assets_host

From f864de23f4996013e1b05b529214794e581f0611 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 11:58:06 +0900
Subject: [PATCH 024/200] =?UTF-8?q?=E7=9B=B8=E5=AF=BE=E3=83=91=E3=82=B9?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#269)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix CSP

* fix icon font path
---
 .../styles/mastodon-material-dev/config.scss        |   4 ++--
 .../fonts/MaterialIcons-Regular.woff2               | Bin
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/javascript/styles/{ => mastodon-material-dev}/fonts/MaterialIcons-Regular.woff2 (100%)

diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
index e733bc8af..cf04ac55b 100644
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -10,12 +10,12 @@
 
 
 // Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in .../fonts folder and configure below.
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in 'fonts' folder and configure below.
 @font-face {
     font-family: "Material Icons";
     src:
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/fonts/MaterialIcons-Regular.woff2 b/app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2
similarity index 100%
rename from app/javascript/styles/fonts/MaterialIcons-Regular.woff2
rename to app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2

From 27998a80fe550f3161bf03f76724d01fb56fc2e3 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 12:44:34 +0900
Subject: [PATCH 025/200] =?UTF-8?q?=E7=9B=B8=E5=AF=BE=E3=83=91=E3=82=B9?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#270)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix CSP

* fix icon font path

* fix font path
---
 app/javascript/styles/mastodon-material-dev/config.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
index cf04ac55b..fbd0dd86d 100644
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -10,7 +10,7 @@
 
 
 // Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in 'fonts' folder and configure below.
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../fonts' folder and configure below.
 @font-face {
     font-family: "Material Icons";
     src:

From 8f2dac1d9c6eccfe73966ea123817aa7fe33bf88 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 19:11:50 +0900
Subject: [PATCH 026/200] =?UTF-8?q?Revert=20"=E7=9B=B8=E5=AF=BE=E3=83=91?=
 =?UTF-8?q?=E3=82=B9=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#270)"=20(#271)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 27998a80fe550f3161bf03f76724d01fb56fc2e3.
---
 app/javascript/styles/mastodon-material-dev/config.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
index fbd0dd86d..cf04ac55b 100644
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -10,7 +10,7 @@
 
 
 // Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../fonts' folder and configure below.
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in 'fonts' folder and configure below.
 @font-face {
     font-family: "Material Icons";
     src:

From 088e10354215b5cce7463af8822bb527c339e6f1 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 20:34:06 +0900
Subject: [PATCH 027/200] =?UTF-8?q?Revert=20"=E7=9B=B8=E5=AF=BE=E3=83=91?=
 =?UTF-8?q?=E3=82=B9=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#269)"=20(#272)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f864de23f4996013e1b05b529214794e581f0611.
---
 .../fonts/MaterialIcons-Regular.woff2               | Bin
 .../styles/mastodon-material-dev/config.scss        |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/javascript/styles/{mastodon-material-dev => }/fonts/MaterialIcons-Regular.woff2 (100%)

diff --git a/app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2 b/app/javascript/styles/fonts/MaterialIcons-Regular.woff2
similarity index 100%
rename from app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2
rename to app/javascript/styles/fonts/MaterialIcons-Regular.woff2
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
index cf04ac55b..e733bc8af 100644
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -10,12 +10,12 @@
 
 
 // Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in 'fonts' folder and configure below.
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in .../fonts folder and configure below.
 @font-face {
     font-family: "Material Icons";
     src:
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file

From 0d9aa65dc36a9d0cc859b9b3317a3527801a5092 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 21:44:45 +0900
Subject: [PATCH 028/200] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=83=91=E3=82=B9=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#273)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix CSP

* fix icon font path

* fix relative path
---
 .../{styles => }/fonts/MaterialIcons-Regular.woff2  | Bin
 .../styles/mastodon-material-dev/config.scss        |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/javascript/{styles => }/fonts/MaterialIcons-Regular.woff2 (100%)

diff --git a/app/javascript/styles/fonts/MaterialIcons-Regular.woff2 b/app/javascript/fonts/MaterialIcons-Regular.woff2
similarity index 100%
rename from app/javascript/styles/fonts/MaterialIcons-Regular.woff2
rename to app/javascript/fonts/MaterialIcons-Regular.woff2
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
index e733bc8af..3095407d8 100644
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ b/app/javascript/styles/mastodon-material-dev/config.scss
@@ -10,7 +10,7 @@
 
 
 // Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in .../fonts folder and configure below.
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
 @font-face {
     font-family: "Material Icons";
     src:

From 047567a657353b51712a54cc8180f3720174ee90 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 9 Mar 2020 22:36:11 +0900
Subject: [PATCH 029/200] =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=89=E8=A8=AD=E5=AE=9A=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#274)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix CSP

* fix icon font path

* fix relative path

* fix override settings
---
 app/javascript/styles/mastodon-material-dev.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon-material-dev.scss b/app/javascript/styles/mastodon-material-dev.scss
index 9cc10708d..18935348a 100644
--- a/app/javascript/styles/mastodon-material-dev.scss
+++ b/app/javascript/styles/mastodon-material-dev.scss
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 
+@import 'application';
 @import 'mastodon-material-dev/account';
 @import 'mastodon-material-dev/basics';
 @import 'mastodon-material-dev/button';

From 5cf087ebf0a2ad25d37936edd064c4fc36705499 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 5 Apr 2020 23:30:06 +0900
Subject: [PATCH 030/200] 3.1.3 (#275)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix announcements with fully-qualified mention to local user crashing WebUI (#13164)

* [Security] Bump puma from 4.3.1 to 4.3.2 (#13167)

Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix installation failing when Redis password contains special characters (#13156)

* Add support for special characters in Redis passwords

Fixes #13154

* Refactor

* Fix elasticsearch-api and faraday incompatibilities (#13166)

* Bump puma from 4.3.2 to 4.3.3 (#13177)

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132

* Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump oj from 3.10.1 to 3.10.3 (#13187)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/core from 7.8.4 to 7.8.6 (#13185)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Add tooltips to audio/video player buttons (#13203)

* Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170)

Fixes #13168

* Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)

Blocking a domain is closer to blocking all its users than to a mute
action.

* Remove useless `respond_to` calls (#13208)

* Change GIF label to be displayed even when autoplay is enabled in web UI (#13209)

* Fix too large announcements not being scrollable in web UI (#13211)

* Add specific rate limits for posting and following (#13172)

* Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148)

* Add sorting by username, creation and last activity in moderation view (#13076)

* Add ability to order accounts in moderation view

* Display last status date in “Most recent activity” for remote users

* Fix error when searching for URLs that contain the mention syntax (#13151)

Fixes #13150

* Set BUNDLE_PATH in CircleCI (#13214)

* Change description of privacy levels to be more intuitive in web UI (#13197)

* Improve description of privacy levels in compose interface

* Change strings in defaultMessage and source as well as english

Co-authored-by: Thibaut Girka <thib@sitedethib.com>

* Add ability to delete files uploaded for settings in admin UI (#13192)

* Allow deleting site uploads

* Refactor and move links into hints

* Fix i18n tests

* Fix HTML output of site_upload_delete_hint

* Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)

* Add skip_media_remove option to tootctl statuses remove

* Add skip_media_remove option to tootctl statuses remove

Co-authored-by: tateisu <tateisu@juggler.jp>

* Code style improvements in JavaScript (#13159)

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

* Add submit button to the top of preferences pages (#13068)

* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec

* Update nginx.conf (#13066)

* Change wording of media display preferences to be more intuitive (#13198)

* Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)

* Add support for links to statuses in announcements to be opened in web UI (#13212)

* Add support for links to public statuses in announcements to be opened in WebUI

* Please CodeClimate

* Fix public posts from silenced accounts not being changed to unlisted visibility (#13096)

* Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change local media attachments to perform heavy processing asynchronously (#13210)

Fix #9106

* Add federation support for the "hide network" preference (#11673)

* Change ActivityPub follower/following collections to not link first page

* Add support for hiding followers and following of remote users

* Switch to using a single `hide_collections` column

* Address code style remarks

* Bump cld3 from 3.2.6 to 3.3.0 (#13107)

* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Change video uploads to enforce certain limits (#13218)

- Dimensions at most 1920x1200
- Frame rate at most 60

* Change video uploads to always be converted to H264/MP4 (#13220)

Even if the container format is the same (.mp4), the codec could
be different and not playable in web browsers

* Change the string "hidden" to "blocked" in WebUI (#13221)

* Change the string "hidden" to "blocked" in WebUI.

* update

* Bump file-loader from 5.0.2 to 5.1.0 (#13225)

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump wicg-inert from 3.0.0 to 3.0.2 (#13226)

Bumps [wicg-inert](https://github.com/WICG/inert) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/WICG/inert/releases)
- [Commits](https://github.com/WICG/inert/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump cross-env from 6.0.3 to 7.0.2 (#13228)

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump eslint-plugin-react from 7.17.0 to 7.19.0 (#13224)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.17.0 to 7.19.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.17.0...v7.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)

* Fix videos with unsupported colorspace not being transcoded (#13242)

* Fix regression in “Edit media” modal in web UI (#13243)

* [Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235)

* Update Dockerfile

* Update Dockerfile

* Fix detailed view of direct messages displaying a 0 boost count (#13244)

The boost count is already removed from private toots,
do the same with direct messages.

* Add titles to warning presets in admin UI (#13252)

* Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)

* Add shortcuts to blacklist a user's e-mail domain in admin UI

* Add option to blacklist resolved MX and IP records for e-mail domains

* Fix some timeouts when searching URLs by limiting some database queries (#13253)

Only look up private toots from database if the request failed because of 401,
403 or 404 errors, as those may indicate a private toot, rather than something
that isn't a toot or cannot be processed.

* Fix WebUI crash in single-column mode on prehistoric browsers (#13267)

Fixes #13266

* Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)

Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases)
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 24.9.0 to 25.1.0 (#12973)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-dom from 16.12.0 to 16.13.0 (#13181)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sass from 1.25.0 to 1.26.3 (#13263)

Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.25.0...1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump mkdirp from 0.5.1 to 1.0.3 (#12979)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump redis from 2.8.0 to 3.0.2 (#13102)

Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.0 to 3.1.1 (#13230)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simple_form from 5.0.1 to 5.0.2 (#13231)

Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webmock from 3.8.0 to 3.8.3 (#13265)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump capistrano from 3.11.2 to 3.12.1 (#13264)

* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

* Decommission support for Ruby 2.4 (#13287)

* Update Gemfile

* Update README.md

* Fix frontend crash when deleting announcements (#13283)

This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)

As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.

This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present.

* Make bookmarks also searchable (#13271)

* Add link to bookmarks in web UI dropdown (#13273)

* Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)

* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js

* [Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Sidekiq::Logger.logger -> Sidekiq.logger

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix bookmarks also searchable (#13293)

* Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)

* Change poll option hover/active styling to be less confusing (#13313)

* Fix frontend crash when deleting announcements (#13312)

Refactor and fix #13283, which only worked in some cases.

* Fix media not being marked sensitive when client sets a CW but no text (#13277)

Mastodon enforces the “sensitive” flag on media attachments whenever a toot
is posted with a Content Warning. However, it does so *after* potentially
converting the Content Warning to toot text (when there is no toot text),
which leads to inconsistent and surprising behavior for API clients.
This commit fixes this inconsistency.

* Bump browser from 3.0.3 to 4.0.0 (#13307)

Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simplecov from 0.18.2 to 0.18.5 (#13310)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump discard from 1.1.0 to 1.2.0 (#13308)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* New Crowdin translations (#13064)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations devise.en.yml (Icelandic)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations activerecord.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

* Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/core from 7.8.6 to 7.9.0 (#13303)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change `tootctl media remove-orphans` to work for all classes (#13316)

Change `tootctl media lookup` to not use an interactive prompt

* Bump react-select from 3.0.8 to 3.1.0 (#13296)

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack from 4.41.5 to 4.42.1 (#13319)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix Paperclip using deprecated URI.escape function (#13320)

Monkey-patch Paperclip to perform URL escaping in a slightly more
appropriate way, and get rid of runtime deprecation warnings.

* Bump brakeman from 4.7.2 to 4.8.0 (#13309)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix OCR not working on Safari because of unsupported worker-src CSP (#13323)

Fixes #13321

* Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors

* Fix incorrect deletion of local accounts imported by overwriting (#13350)

* Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)

* Bump pg from 1.2.2 to 1.2.3 (#13344)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.2...v1.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump oj from 3.10.3 to 3.10.5 (#13345)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump iso-639 from 0.2.8 to 0.3.5 (#13343)

Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases)
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump ox from 2.12.1 to 2.13.2 (#13342)

Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump better_errors from 2.5.1 to 2.6.0 (#13340)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix ImportsController param to permit :mode (#13347)

* Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump uuid from 3.4.0 to 7.0.2 (#13295)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)

* Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react from 16.12.0 to 16.13.1 (#13337)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump stringz from 2.0.0 to 2.1.0 (#13331)

Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 25.1.0 to 25.2.4 (#13332)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump yargs from 15.1.0 to 15.3.1 (#13334)

Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-loader from 8.0.6 to 8.1.0 (#13333)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix re-sending of e-mail confirmation not being rate limited (#13360)

Fix #13330

* Improve toot clicking areas (#13327)

* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI

* Fix background jobs not using locks like they are supposed to (#13361)

Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349

* Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump faker from 2.10.1 to 2.11.0 (#13363)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump bootsnap from 1.4.5 to 1.4.6 (#13369)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.1 to 3.1.2 (#13368)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix pinning a column in web UI sometimes redirecting out of web UI (#13376)

Fix #13216

* Fix returning results when searching for URL with non-zero offset (#13377)

Fix #13083

* Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)

Fix #13371

* Improve polls: option lengths & redesign (#13257)

This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.

* Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Add ability to filter audit log in admin UI (#13381)

* Update Vagrant box to Bionic (#13384)

* Update config.yml (#13379)

* Add explanation as to why unlocked accounts may have follow requests (#13385)

* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”

* Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)

* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3

* Bump version to 3.1.3 (#13389)

* Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review

* [Security] Update Dockerfile for Ruby 2.6.6 (#13393)

* Update .ruby-version (#13395)

* Fix “Show more” not switching to “Show less” on public pages (#13174)

* Fix “Show more” not switching to “Show less” on public pages

Fixes #13169

* Fix initial text of CW button on public pages when CW are unfolded by default

* Add rate limit for reporting (#13390)

* New Crowdin translations (#13317)

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Georgian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations simple_form.en.yml (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Hebrew)
[ci skip]

* New translations devise.en.yml (Hebrew)
[ci skip]

* New translations doorkeeper.en.yml (Hebrew)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Vietnamese)
[ci skip]

* New translations devise.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (German)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations devise.en.yml (Galician)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Albanian)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.json (Ido)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.json (Icelandic)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Latvian)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Bulgarian)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (Corsican)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Danish)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.json (Romanian)
[ci skip]

* New translations en.json (Serbian (Cyrillic))
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations activerecord.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations doorkeeper.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

* Update CHANGELOG.md (#13397)

Co-authored-by: ThibG <thib@sitedethib.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: koyu <me@koyu.space>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: David Cook <divergentdave@gmail.com>
Co-authored-by: tateisu <tateisu@gmail.com>
Co-authored-by: tateisu <tateisu@juggler.jp>
Co-authored-by: Bèr Kessels <ber@berk.es>
Co-authored-by: guigeekz <pattusg@gmail.com>
Co-authored-by: Shlee <github@shl.ee>
Co-authored-by: mayaeh <mayaeh@marimo-net.org>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Daniel Sockwell <dsockwell@gmail.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Takeshi Umeda <noel.yoshiba@gmail.com>
Co-authored-by: Sasha Sorokin <dafri.nochiterov8@gmail.com>
Co-authored-by: fuyu <54523771+mfmfuyu@users.noreply.github.com>
---
 .circleci/config.yml                          |   13 +-
 .ruby-version                                 |    2 +-
 CHANGELOG.md                                  |   73 +
 Dockerfile                                    |    6 +-
 Gemfile                                       |   32 +-
 Gemfile.lock                                  |  258 +--
 README.md                                     |    4 +-
 Vagrantfile                                   |    2 +-
 app/chewy/statuses_index.rb                   |    5 +
 app/controllers/account_follow_controller.rb  |    2 +-
 .../admin/action_logs_controller.rb           |   14 +-
 .../admin/email_domain_blocks_controller.rb   |   28 +-
 .../admin/site_uploads_controller.rb          |   21 +
 .../admin/warning_presets_controller.rb       |    6 +-
 app/controllers/api/base_controller.rb        |    4 +
 .../accounts/follower_accounts_controller.rb  |    4 +-
 .../accounts/following_accounts_controller.rb |    4 +-
 .../v1/accounts/identity_proofs_controller.rb |    2 -
 .../api/v1/accounts/lists_controller.rb       |    2 -
 .../api/v1/accounts/pins_controller.rb        |    2 -
 .../v1/accounts/relationships_controller.rb   |    2 -
 .../api/v1/accounts/search_controller.rb      |    2 -
 .../api/v1/accounts/statuses_controller.rb    |    2 -
 app/controllers/api/v1/accounts_controller.rb |    4 +-
 .../api/v1/apps/credentials_controller.rb     |    2 -
 app/controllers/api/v1/blocks_controller.rb   |    2 -
 .../api/v1/bookmarks_controller.rb            |    2 -
 .../api/v1/conversations_controller.rb        |    2 -
 .../api/v1/custom_emojis_controller.rb        |    2 -
 .../api/v1/domain_blocks_controller.rb        |    2 -
 .../api/v1/endorsements_controller.rb         |    2 -
 .../api/v1/favourites_controller.rb           |    2 -
 .../featured_tags/suggestions_controller.rb   |    3 -
 app/controllers/api/v1/filters_controller.rb  |    2 -
 .../api/v1/instances/activity_controller.rb   |    2 -
 .../api/v1/instances/peers_controller.rb      |    2 -
 .../api/v1/instances_controller.rb            |    2 -
 app/controllers/api/v1/media_controller.rb    |   31 +-
 app/controllers/api/v1/mutes_controller.rb    |    2 -
 .../api/v1/notifications_controller.rb        |    2 -
 .../api/v1/polls/votes_controller.rb          |    2 -
 app/controllers/api/v1/polls_controller.rb    |    2 -
 .../api/v1/preferences_controller.rb          |    2 -
 app/controllers/api/v1/reports_controller.rb  |    2 +-
 .../api/v1/statuses/bookmarks_controller.rb   |    2 -
 .../favourited_by_accounts_controller.rb      |    2 -
 .../api/v1/statuses/favourites_controller.rb  |    2 -
 .../api/v1/statuses/mutes_controller.rb       |    2 -
 .../api/v1/statuses/pins_controller.rb        |    2 -
 .../reblogged_by_accounts_controller.rb       |    2 -
 .../api/v1/statuses/reblogs_controller.rb     |    3 +-
 app/controllers/api/v1/statuses_controller.rb |   14 +-
 .../api/v1/streaming_controller.rb            |    2 -
 .../api/v1/suggestions_controller.rb          |    2 -
 .../api/v1/timelines/home_controller.rb       |    2 -
 .../api/v1/timelines/public_controller.rb     |    2 -
 .../api/v1/timelines/tag_controller.rb        |    2 -
 app/controllers/api/v1/trends_controller.rb   |    2 -
 app/controllers/api/v2/media_controller.rb    |   12 +
 app/controllers/api/v2/search_controller.rb   |    2 -
 app/controllers/api/web/embeds_controller.rb  |    2 -
 .../api/web/push_subscriptions_controller.rb  |    2 -
 .../api/web/settings_controller.rb            |    2 -
 app/controllers/application_controller.rb     |    5 +
 .../authorize_interactions_controller.rb      |    2 +-
 .../concerns/rate_limit_headers.rb            |   16 +-
 .../follower_accounts_controller.rb           |   11 +-
 .../following_accounts_controller.rb          |   11 +-
 .../settings/imports_controller.rb            |    2 +-
 app/helpers/admin/action_logs_helper.rb       |   75 +-
 app/helpers/admin/filter_helper.rb            |    1 +
 app/helpers/admin/settings_helper.rb          |   11 +
 app/javascript/mastodon/actions/accounts.js   |    5 +-
 app/javascript/mastodon/actions/alerts.js     |    4 +-
 app/javascript/mastodon/actions/compose.js    |   23 +-
 .../mastodon/actions/identity_proofs.js       |    1 +
 app/javascript/mastodon/actions/timelines.js  |    1 +
 app/javascript/mastodon/common.js             |    2 +-
 .../mastodon/components/column_header.js      |    3 +-
 app/javascript/mastodon/components/domain.js  |    2 +-
 .../intersection_observer_article.js          |    2 +-
 .../mastodon/components/media_gallery.js      |    2 +-
 app/javascript/mastodon/components/poll.js    |   28 +-
 .../mastodon/components/scrollable_list.js    |   20 +-
 app/javascript/mastodon/components/status.js  |    8 +-
 .../mastodon/components/status_action_bar.js  |    4 +-
 .../mastodon/components/status_content.js     |   14 +
 .../mastodon/containers/domain_container.js   |    2 +-
 .../features/account/components/header.js     |    8 +-
 .../mastodon/features/audio/index.js          |    6 +-
 .../mastodon/features/blocks/index.js         |    2 +-
 .../features/compose/components/action_bar.js |    2 +
 .../features/compose/components/poll_form.js  |    5 +-
 .../compose/components/privacy_dropdown.js    |    8 +-
 .../components/conversation.js                |    2 +-
 .../mastodon/features/domain_blocks/index.js  |    8 +-
 .../mastodon/features/favourites/index.js     |    2 +-
 .../features/follow_requests/index.js         |   19 +-
 .../mastodon/features/followers/index.js      |    2 +-
 .../mastodon/features/following/index.js      |    2 +-
 .../components/announcements.js               |   19 +
 .../features/getting_started/index.js         |    2 +-
 .../mastodon/features/lists/index.js          |    2 +-
 .../mastodon/features/mutes/index.js          |    2 +-
 .../mastodon/features/reblogs/index.js        |    2 +-
 .../features/status/components/action_bar.js  |    4 +-
 .../features/status/components/card.js        |    2 +-
 .../status/components/detailed_status.js      |    2 +-
 .../ui/components/__tests__/column-test.js    |    2 +-
 .../mastodon/features/video/index.js          |   14 +-
 app/javascript/mastodon/locales/ast.json      |    4 +-
 app/javascript/mastodon/locales/bg.json       |    2 +-
 app/javascript/mastodon/locales/br.json       |  486 ++---
 app/javascript/mastodon/locales/cs.json       |    6 +-
 app/javascript/mastodon/locales/de.json       |   14 +-
 .../mastodon/locales/defaultMessages.json     |   46 +-
 app/javascript/mastodon/locales/el.json       |   12 +-
 app/javascript/mastodon/locales/en.json       |   25 +-
 app/javascript/mastodon/locales/eo.json       |    4 +-
 app/javascript/mastodon/locales/es-AR.json    |    4 +-
 app/javascript/mastodon/locales/eu.json       |   18 +-
 app/javascript/mastodon/locales/fa.json       |   10 +-
 app/javascript/mastodon/locales/fi.json       |   40 +-
 app/javascript/mastodon/locales/fr.json       |  166 +-
 app/javascript/mastodon/locales/ga.json       |    2 +-
 app/javascript/mastodon/locales/gl.json       |   36 +-
 app/javascript/mastodon/locales/hi.json       |    2 +-
 app/javascript/mastodon/locales/hu.json       |    2 +-
 app/javascript/mastodon/locales/hy.json       |  124 +-
 app/javascript/mastodon/locales/it.json       |    4 +-
 app/javascript/mastodon/locales/ja.json       |   24 +-
 app/javascript/mastodon/locales/kab.json      |  124 +-
 app/javascript/mastodon/locales/kn.json       |    2 +-
 app/javascript/mastodon/locales/ko.json       |   12 +-
 app/javascript/mastodon/locales/lt.json       |    2 +-
 app/javascript/mastodon/locales/lv.json       |    2 +-
 app/javascript/mastodon/locales/mk.json       |    2 +-
 app/javascript/mastodon/locales/ml.json       |    2 +-
 app/javascript/mastodon/locales/mr.json       |    2 +-
 app/javascript/mastodon/locales/ms.json       |    2 +-
 app/javascript/mastodon/locales/nl.json       |   32 +-
 app/javascript/mastodon/locales/nn.json       |   16 +-
 app/javascript/mastodon/locales/pt-BR.json    |   20 +-
 app/javascript/mastodon/locales/pt-PT.json    |   34 +-
 app/javascript/mastodon/locales/ru.json       |   18 +-
 app/javascript/mastodon/locales/sk.json       |   12 +-
 app/javascript/mastodon/locales/sr.json       |  130 +-
 app/javascript/mastodon/locales/sv.json       |    6 +-
 app/javascript/mastodon/locales/th.json       |   40 +-
 app/javascript/mastodon/locales/ur.json       |    2 +-
 app/javascript/mastodon/locales/zh-CN.json    |    2 +-
 app/javascript/mastodon/locales/zh-HK.json    |   14 +-
 app/javascript/mastodon/locales/zh-TW.json    |   14 +-
 app/javascript/mastodon/middleware/errors.js  |    2 +-
 app/javascript/mastodon/reducers/compose.js   |    1 -
 .../mastodon/reducers/notifications.js        |    4 +-
 app/javascript/mastodon/reducers/timelines.js |    4 +-
 app/javascript/mastodon/selectors/index.js    |    2 +-
 .../service_worker/web_push_notifications.js  |    2 +-
 .../mastodon/store/configureStore.js          |    2 +-
 app/javascript/mastodon/utils/log_out.js      |    2 +-
 app/javascript/packs/admin.js                 |    6 +-
 app/javascript/packs/public.js                |   38 +-
 .../styles/mastodon-light/diff.scss           |    2 +-
 app/javascript/styles/mastodon/admin.scss     |   68 +-
 .../styles/mastodon/components.scss           |   39 +-
 app/javascript/styles/mastodon/polls.scss     |   42 +-
 app/lib/activitypub/tag_manager.rb            |    2 +
 app/lib/entity_cache.rb                       |    4 +
 app/lib/exceptions.rb                         |    1 +
 app/lib/language_detector.rb                  |    4 +-
 app/lib/rate_limiter.rb                       |   64 +
 app/models/account.rb                         |   21 +-
 app/models/account_filter.rb                  |   27 +-
 app/models/account_warning_preset.rb          |    3 +
 app/models/admin/account_action.rb            |   12 -
 app/models/admin/action_log_filter.rb         |   81 +
 app/models/announcement.rb                    |   11 +
 app/models/concerns/account_interactions.rb   |   16 +-
 app/models/concerns/attachmentable.rb         |    2 +-
 app/models/concerns/rate_limitable.rb         |   36 +
 app/models/email_domain_block.rb              |   14 +
 app/models/follow.rb                          |    3 +
 app/models/follow_request.rb                  |    3 +
 app/models/media_attachment.rb                |  142 +-
 app/models/report.rb                          |   11 +
 app/models/status.rb                          |   20 +
 app/policies/settings_policy.rb               |    4 +
 .../rest/announcement_serializer.rb           |   13 +
 .../rest/media_attachment_serializer.rb       |    4 +-
 app/services/account_search_service.rb        |    2 +-
 .../activitypub/process_account_service.rb    |   25 +-
 app/services/fetch_resource_service.rb        |    3 +
 app/services/follow_service.rb                |   74 +-
 app/services/import_service.rb                |    3 +-
 app/services/post_status_service.rb           |   17 +-
 app/services/reblog_service.rb                |   16 +-
 app/services/resolve_url_service.rb           |   10 +-
 app/services/search_service.rb                |    4 +-
 app/validators/poll_validator.rb              |    2 +-
 app/views/admin/account_actions/new.html.haml |    2 +-
 app/views/admin/accounts/_account.html.haml   |    2 +
 app/views/admin/accounts/index.html.haml      |    6 +
 app/views/admin/accounts/show.html.haml       |   15 +-
 .../admin/action_logs/_action_log.html.haml   |    6 -
 app/views/admin/action_logs/index.html.haml   |   24 +-
 .../_email_domain_block.html.haml             |   10 +
 .../admin/email_domain_blocks/new.html.haml   |    5 +-
 app/views/admin/settings/edit.html.haml       |   11 +-
 .../warning_presets/_warning_preset.html.haml |   10 +
 .../admin/warning_presets/edit.html.haml      |    3 +
 .../admin/warning_presets/index.html.haml     |   24 +-
 app/views/errors/429.html.haml                |    5 +
 .../preferences/appearance/show.html.haml     |    5 +-
 .../preferences/notifications/show.html.haml  |    8 +-
 .../settings/preferences/other/show.html.haml |    5 +-
 app/views/settings/profiles/show.html.haml    |    5 +-
 app/views/statuses/_poll.html.haml            |   10 +-
 .../distribute_poll_update_worker.rb          |    2 +-
 .../synchronize_featured_collection_worker.rb |    2 +-
 .../after_remote_follow_request_worker.rb     |    9 -
 app/workers/after_remote_follow_worker.rb     |    9 -
 app/workers/backup_worker.rb                  |    8 +-
 app/workers/notification_worker.rb            |    9 -
 app/workers/poll_expiration_notify_worker.rb  |    2 +-
 app/workers/post_process_media_worker.rb      |   34 +
 app/workers/processing_worker.rb              |    9 -
 .../publish_scheduled_announcement_worker.rb  |   15 +-
 .../publish_scheduled_status_worker.rb        |    2 +-
 .../pubsubhubbub/confirmation_worker.rb       |    9 -
 app/workers/pubsubhubbub/delivery_worker.rb   |    9 -
 .../pubsubhubbub/distribution_worker.rb       |    9 -
 .../pubsubhubbub/raw_distribution_worker.rb   |    9 -
 app/workers/pubsubhubbub/subscribe_worker.rb  |    9 -
 .../pubsubhubbub/unsubscribe_worker.rb        |    9 -
 app/workers/regeneration_worker.rb            |    2 +-
 app/workers/remote_profile_update_worker.rb   |    9 -
 app/workers/resolve_account_worker.rb         |    2 +-
 app/workers/salmon_worker.rb                  |    9 -
 .../scheduler/backup_cleanup_scheduler.rb     |    2 +-
 .../scheduler/doorkeeper_cleanup_scheduler.rb |    2 +-
 app/workers/scheduler/email_scheduler.rb      |    2 +-
 .../scheduler/feed_cleanup_scheduler.rb       |    2 +-
 app/workers/scheduler/ip_cleanup_scheduler.rb |    2 +-
 .../scheduler/media_cleanup_scheduler.rb      |    2 +-
 app/workers/scheduler/pghero_scheduler.rb     |    2 +-
 .../scheduler/scheduled_statuses_scheduler.rb |    2 +-
 .../subscriptions_cleanup_scheduler.rb        |    9 -
 .../scheduler/subscriptions_scheduler.rb      |    9 -
 .../scheduler/trending_tags_scheduler.rb      |    2 +-
 .../scheduler/user_cleanup_scheduler.rb       |    2 +-
 app/workers/verify_account_links_worker.rb    |    2 +-
 config/application.rb                         |    2 +
 config/deploy.rb                              |    2 +-
 .../initializers/content_security_policy.rb   |    2 +
 config/initializers/kaminari_config.rb        |    2 +-
 config/initializers/rack_attack.rb            |    2 +-
 config/initializers/sidekiq.rb                |    7 +-
 config/locales/activerecord.br.yml            |    6 +-
 config/locales/activerecord.hy.yml            |   16 +
 config/locales/activerecord.kab.yml           |    5 +
 config/locales/activerecord.zh-HK.yml         |    4 +
 config/locales/ar.yml                         |   70 +-
 config/locales/ast.yml                        |    3 +-
 config/locales/bg.yml                         |    2 +-
 config/locales/bn.yml                         |    2 +-
 config/locales/br.yml                         |  219 ++-
 config/locales/ca.yml                         |   50 +-
 config/locales/co.yml                         |   50 +-
 config/locales/cs.yml                         |    4 +-
 config/locales/cy.yml                         |    6 +-
 config/locales/da.yml                         |    1 -
 config/locales/de.yml                         |   50 +-
 config/locales/devise.br.yml                  |    8 +
 config/locales/devise.fr.yml                  |   20 +-
 config/locales/devise.hy.yml                  |    6 +
 config/locales/devise.is.yml                  |    4 +-
 config/locales/devise.kab.yml                 |    9 +-
 config/locales/devise.nn.yml                  |   62 +-
 config/locales/devise.pt-BR.yml               |  106 +-
 config/locales/devise.pt-PT.yml               |    4 +-
 config/locales/devise.ru.yml                  |   24 +-
 config/locales/devise.zh-HK.yml               |   16 +
 config/locales/doorkeeper.br.yml              |   51 +
 config/locales/doorkeeper.fr.yml              |   10 +-
 config/locales/doorkeeper.kab.yml             |   10 +-
 config/locales/doorkeeper.ko.yml              |    4 +-
 config/locales/doorkeeper.nn.yml              |   24 +-
 config/locales/doorkeeper.pt-BR.yml           |    2 +-
 config/locales/doorkeeper.sk.yml              |    4 +-
 config/locales/doorkeeper.th.yml              |    2 +-
 config/locales/el.yml                         |   60 +-
 config/locales/en.yml                         |   51 +-
 config/locales/en_GB.yml                      |    1 -
 config/locales/eo.yml                         |   13 +-
 config/locales/es-AR.yml                      |   52 +-
 config/locales/es.yml                         |   50 +-
 config/locales/et.yml                         |    1 -
 config/locales/eu.yml                         |   21 +-
 config/locales/fa.yml                         |   59 +-
 config/locales/fi.yml                         |   19 +
 config/locales/fr.yml                         |  194 +-
 config/locales/gl.yml                         |   50 +-
 config/locales/hi.yml                         |    2 +-
 config/locales/hr.yml                         |    2 +-
 config/locales/hu.yml                         |   88 +-
 config/locales/hy.yml                         |    7 +-
 config/locales/id.yml                         |   31 +-
 config/locales/io.yml                         |    2 +-
 config/locales/is.yml                         |   54 +-
 config/locales/it.yml                         |   52 +-
 config/locales/ja.yml                         |   50 +-
 config/locales/kab.yml                        |  105 +-
 config/locales/kk.yml                         |    1 -
 config/locales/kn.yml                         |    2 +-
 config/locales/ko.yml                         |   50 +-
 config/locales/lt.yml                         |    1 -
 config/locales/lv.yml                         |    2 +-
 config/locales/mk.yml                         |    2 +-
 config/locales/ml.yml                         |    2 +-
 config/locales/mr.yml                         |    2 +-
 config/locales/ms.yml                         |    2 +-
 config/locales/nl.yml                         |    5 +-
 config/locales/nn.yml                         |    5 +-
 config/locales/no.yml                         |    1 -
 config/locales/oc.yml                         |   31 +-
 config/locales/pl.yml                         |  212 ++-
 config/locales/pt-BR.yml                      |   76 +-
 config/locales/pt-PT.yml                      |   84 +-
 config/locales/ru.yml                         |   81 +-
 config/locales/simple_form.ar.yml             |    2 +
 config/locales/simple_form.ast.yml            |    2 +
 config/locales/simple_form.br.yml             |   22 +
 config/locales/simple_form.ca.yml             |    7 +
 config/locales/simple_form.co.yml             |    7 +
 config/locales/simple_form.cy.yml             |    2 +
 config/locales/simple_form.de.yml             |    9 +-
 config/locales/simple_form.el.yml             |   20 +-
 config/locales/simple_form.en.yml             |   11 +-
 config/locales/simple_form.eo.yml             |    6 +-
 config/locales/simple_form.es-AR.yml          |    7 +
 config/locales/simple_form.es.yml             |    7 +
 config/locales/simple_form.eu.yml             |   25 +-
 config/locales/simple_form.fa.yml             |   13 +-
 config/locales/simple_form.fr.yml             |   43 +-
 config/locales/simple_form.gl.yml             |    7 +
 config/locales/simple_form.hu.yml             |    7 +
 config/locales/simple_form.id.yml             |    7 +
 config/locales/simple_form.is.yml             |    7 +
 config/locales/simple_form.it.yml             |    9 +
 config/locales/simple_form.ja.yml             |   13 +-
 config/locales/simple_form.kab.yml            |   20 +-
 config/locales/simple_form.ko.yml             |    7 +
 config/locales/simple_form.nl.yml             |    2 +-
 config/locales/simple_form.oc.yml             |    4 +
 config/locales/simple_form.pl.yml             |   24 +
 config/locales/simple_form.pt-BR.yml          |   13 +-
 config/locales/simple_form.pt-PT.yml          |   17 +-
 config/locales/simple_form.ru.yml             |    9 +-
 config/locales/simple_form.sk.yml             |    8 +-
 config/locales/simple_form.sv.yml             |    3 +
 config/locales/simple_form.ta.yml             |    9 +
 config/locales/simple_form.th.yml             |   20 +-
 config/locales/simple_form.zh-CN.yml          |    7 +
 config/locales/simple_form.zh-HK.yml          |   33 +
 config/locales/simple_form.zh-TW.yml          |   33 +
 config/locales/sk.yml                         |   29 +-
 config/locales/sl.yml                         |    1 -
 config/locales/sq.yml                         |    1 -
 config/locales/sr.yml                         |    1 -
 config/locales/sv.yml                         |    9 +-
 config/locales/ta.yml                         |   15 +-
 config/locales/te.yml                         |    2 +-
 config/locales/th.yml                         |   67 +-
 config/locales/tr.yml                         |    1 -
 config/locales/uk.yml                         |    1 -
 config/locales/ur.yml                         |    2 +-
 config/locales/vi.yml                         |    1 -
 config/locales/zh-CN.yml                      |   17 +-
 config/locales/zh-HK.yml                      |   89 +-
 config/locales/zh-TW.yml                      |   89 +-
 config/routes.rb                              |    6 +-
 config/webpack/development.js                 |    2 +-
 config/webpack/shared.js                      |    4 +-
 ...163405_add_hide_collections_to_accounts.rb |    5 +
 ...625_add_processing_to_media_attachments.rb |    5 +
 ...58_add_title_to_account_warning_presets.rb |   15 +
 ...2162302_add_status_ids_to_announcements.rb |    6 +
 ...43_add_parent_id_to_email_domain_blocks.rb |    5 +
 db/schema.rb                                  |    8 +-
 dist/nginx.conf                               |   12 +-
 lib/mastodon/media_cli.rb                     |  113 +-
 lib/mastodon/redis_config.rb                  |    4 +-
 lib/mastodon/statuses_cli.rb                  |    8 +-
 lib/mastodon/version.rb                       |    2 +-
 lib/paperclip/attachment_extensions.rb        |   43 +
 lib/paperclip/url_generator_extensions.rb     |   17 +
 lib/paperclip/video_transcoder.rb             |   18 +-
 lib/tasks/mastodon.rake                       |   15 +-
 package.json                                  |   61 +-
 .../account_follow_controller_spec.rb         |    2 +-
 .../admin/reports_controller_spec.rb          |   20 +
 .../api/v1/statuses_controller_spec.rb        |   46 +-
 spec/features/profile_spec.rb                 |    2 +-
 spec/helpers/admin/action_log_helper_spec.rb  |  238 ---
 spec/rails_helper.rb                          |    2 +-
 spec/services/import_service_spec.rb          |    8 -
 spec/services/post_status_service_spec.rb     |    7 +
 yarn.lock                                     | 1611 +++++++++++------
 409 files changed, 6155 insertions(+), 3050 deletions(-)
 create mode 100644 app/controllers/admin/site_uploads_controller.rb
 create mode 100644 app/controllers/api/v2/media_controller.rb
 create mode 100644 app/helpers/admin/settings_helper.rb
 create mode 100644 app/lib/rate_limiter.rb
 create mode 100644 app/models/admin/action_log_filter.rb
 create mode 100644 app/models/concerns/rate_limitable.rb
 create mode 100644 app/views/admin/warning_presets/_warning_preset.html.haml
 create mode 100644 app/views/errors/429.html.haml
 delete mode 100644 app/workers/after_remote_follow_request_worker.rb
 delete mode 100644 app/workers/after_remote_follow_worker.rb
 delete mode 100644 app/workers/notification_worker.rb
 create mode 100644 app/workers/post_process_media_worker.rb
 delete mode 100644 app/workers/processing_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/confirmation_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/delivery_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/distribution_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/raw_distribution_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/subscribe_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/unsubscribe_worker.rb
 delete mode 100644 app/workers/remote_profile_update_worker.rb
 delete mode 100644 app/workers/salmon_worker.rb
 delete mode 100644 app/workers/scheduler/subscriptions_cleanup_scheduler.rb
 delete mode 100644 app/workers/scheduler/subscriptions_scheduler.rb
 create mode 100644 db/migrate/20191212163405_add_hide_collections_to_accounts.rb
 create mode 100644 db/migrate/20200306035625_add_processing_to_media_attachments.rb
 create mode 100644 db/migrate/20200312144258_add_title_to_account_warning_presets.rb
 create mode 100644 db/migrate/20200312162302_add_status_ids_to_announcements.rb
 create mode 100644 db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
 create mode 100644 lib/paperclip/attachment_extensions.rb
 create mode 100644 lib/paperclip/url_generator_extensions.rb

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ba027d95..dd943e327 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ aliases:
       - image: circleci/ruby:2.7-buster-node
         environment: &ruby_environment
           BUNDLE_APP_CONFIG: ./.bundle/
+          BUNDLE_PATH: ./vendor/bundle/
           DB_HOST: localhost
           DB_USER: root
           RAILS_ENV: test
@@ -138,9 +139,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.7-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     steps:
       - *attach_workspace
@@ -157,9 +159,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.7-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
@@ -168,9 +171,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.6-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
@@ -179,9 +183,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.5-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
diff --git a/.ruby-version b/.ruby-version
index 57cf282eb..338a5b5d8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.5
+2.6.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33663c2ad..ad353e2ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,79 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [v3.1.3] - 2020-04-05
+### Added
+
+- Add ability to filter audit log in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13381))
+- Add titles to warning presets in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13252))
+- Add option to include resolved DNS records when blacklisting e-mail domains in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13254))
+- Add ability to delete files uploaded for settings in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13192))
+- Add sorting by username, creation and last activity in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13076))
+- Add explanation as to why unlocked accounts may have follow requests in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13385))
+- Add link to bookmarks to dropdown in web UI ([mayaeh](https://github.com/tootsuite/mastodon/pull/13273))
+- Add support for links to statuses in announcements to be opened in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13212), [ThibG](https://github.com/tootsuite/mastodon/pull/13250))
+- Add tooltips to audio/video player buttons in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13203))
+- Add submit button to the top of preferences pages ([guigeekz](https://github.com/tootsuite/mastodon/pull/13068))
+- Add specific rate limits for posting, following and reporting ([Gargron](https://github.com/tootsuite/mastodon/pull/13172), [Gargron](https://github.com/tootsuite/mastodon/pull/13390))
+  - 300 posts every 3 hours
+  - 400 follows or follow requests every 24 hours
+  - 400 reports every 24 hours
+- Add federation support for the "hide network" preference ([ThibG](https://github.com/tootsuite/mastodon/pull/11673))
+- Add `--skip-media-remove` option to `tootctl statuses remove` ([tateisu](https://github.com/tootsuite/mastodon/pull/13080))
+
+### Changed
+
+- **Change design of polls in web UI** ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/13257), [ThibG](https://github.com/tootsuite/mastodon/pull/13313))
+- Change status click areas in web UI to be bigger ([ariasuni](https://github.com/tootsuite/mastodon/pull/13327))
+- **Change `tootctl media remove-orphans` to work for all classes** ([Gargron](https://github.com/tootsuite/mastodon/pull/13316))
+- **Change local media attachments to perform heavy processing asynchronously** ([Gargron](https://github.com/tootsuite/mastodon/pull/13210))
+- Change video uploads to always be converted to H264/MP4 ([Gargron](https://github.com/tootsuite/mastodon/pull/13220), [ThibG](https://github.com/tootsuite/mastodon/pull/13239), [ThibG](https://github.com/tootsuite/mastodon/pull/13242))
+- Change video uploads to enforce certain limits ([Gargron](https://github.com/tootsuite/mastodon/pull/13218))
+  - Dimensions smaller than 1920x1200px
+  - Frame rate at most 60fps
+- Change the tooltip "Toggle visibility" to "Hide media" in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13199))
+- Change description of privacy levels to be more intuitive in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13197))
+- Change GIF label to be displayed even when autoplay is enabled in web UI ([koyuawsmbrtn](https://github.com/tootsuite/mastodon/pull/13209))
+- Change the string "Hide everything from …" to "Block domain …" in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13178), [mayaeh](https://github.com/tootsuite/mastodon/pull/13221))
+- Change wording of media display preferences to be more intuitive ([ariasuni](https://github.com/tootsuite/mastodon/pull/13198))
+
+### Deprecated
+
+- `POST /api/v1/media` → `POST /api/v2/media` ([Gargron](https://github.com/tootsuite/mastodon/pull/13210))
+
+### Fixed
+
+- Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` ([Gargron](https://github.com/tootsuite/mastodon/pull/13375))
+- Fix returning results when searching for URL with non-zero offset ([Gargron](https://github.com/tootsuite/mastodon/pull/13377))
+- Fix pinning a column in web UI sometimes redirecting out of web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13376))
+- Fix background jobs not using locks like they are supposed to ([Gargron](https://github.com/tootsuite/mastodon/pull/13361))
+- Fix content warning being unnecessarily cleared when hiding content warning input in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13348))
+- Fix "Show more" not switching to "Show less" on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/13174))
+- Fix import overwrite option not being selectable ([noellabo](https://github.com/tootsuite/mastodon/pull/13347))
+- Fix wrong color for ellipsis in boost confirmation dialog in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13355))
+- Fix unnecessary unfollowing when importing follows with overwrite option ([noellabo](https://github.com/tootsuite/mastodon/pull/13350))
+- Fix 404 and 410 API errors being silently discarded in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13279))
+- Fix OCR not working on Safari because of unsupported worker-src CSP ([ThibG](https://github.com/tootsuite/mastodon/pull/13323))
+- Fix media not being marked sensitive when a content warning is set with no text ([ThibG](https://github.com/tootsuite/mastodon/pull/13277))
+- Fix crash after deleting announcements in web UI ([codesections](https://github.com/tootsuite/mastodon/pull/13283), [ThibG](https://github.com/tootsuite/mastodon/pull/13312))
+- Fix bookmarks not being searchable ([Kjwon15](https://github.com/tootsuite/mastodon/pull/13271), [noellabo](https://github.com/tootsuite/mastodon/pull/13293))
+- Fix reported accounts not being whitelisted from further spam checks when resolving a spam check report ([ThibG](https://github.com/tootsuite/mastodon/pull/13289))
+- Fix web UI crash in single-column mode on prehistoric browsers ([ThibG](https://github.com/tootsuite/mastodon/pull/13267))
+- Fix some timeouts when searching for URLs ([ThibG](https://github.com/tootsuite/mastodon/pull/13253))
+- Fix detailed view of direct messages displaying a 0 boost count in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13244))
+- Fix regression in “Edit media” modal in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13243))
+- Fix public posts from silenced accounts not being changed to unlisted visibility ([ThibG](https://github.com/tootsuite/mastodon/pull/13096))
+- Fix error when searching for URLs that contain the mention syntax ([ThibG](https://github.com/tootsuite/mastodon/pull/13151))
+- Fix text area above/right of emoji picker being accidentally clickable in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13148))
+- Fix too large announcements not being scrollable in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13211))
+- Fix `tootctl media remove-orphans` crashing when encountering invalid media ([ThibG](https://github.com/tootsuite/mastodon/pull/13170))
+- Fix installation failing when Redis password contains special characters ([ThibG](https://github.com/tootsuite/mastodon/pull/13156))
+- Fix announcements with fully-qualified mentions to local users crashing web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13164))
+
+### Security
+
+- Fix re-sending of e-mail confirmation not being rate limited ([Gargron](https://github.com/tootsuite/mastodon/pull/13360))
+
 ## [v3.1.2] - 2020-02-27
 ### Added
 
diff --git a/Dockerfile b/Dockerfile
index a22efe672..0537d8fac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:18.04 as build-dep
 SHELL ["bash", "-c"]
 
 # Install Node v12 (LTS)
-ENV NODE_VER="12.14.0"  
+ENV NODE_VER="12.16.1"
 RUN	ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \
@@ -38,8 +38,8 @@ RUN apt update && \
 	make -j$(nproc) > /dev/null && \
 	make install_bin install_include install_lib
 
-# Install ruby
-ENV RUBY_VER="2.6.5"
+# Install Ruby
+ENV RUBY_VER="2.6.6"
 ENV CPPFLAGS="-I/opt/jemalloc/include"
 ENV LDFLAGS="-L/opt/jemalloc/lib/"
 RUN apt update && \
diff --git a/Gemfile b/Gemfile
index c35b21be4..57bf27183 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 2.4.0', '< 3.0.0'
+ruby '>= 2.5.0', '< 3.0.0'
 
 gem 'pkg-config', '~> 1.4'
 
 gem 'puma', '~> 4.3'
-gem 'rails', '~> 5.2.4'
+gem 'rails', '~> 5.2.4.2'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 0.20'
 gem 'rack', '~> 2.2.2'
@@ -20,7 +20,7 @@ gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.4'
 gem 'dotenv-rails', '~> 2.7'
 
-gem 'aws-sdk-s3', '~> 1.60', require: false
+gem 'aws-sdk-s3', '~> 1.61', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
@@ -35,7 +35,7 @@ gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'iso-639'
 gem 'chewy', '~> 5.1'
-gem 'cld3', '~> 3.2.6'
+gem 'cld3', '~> 3.3.0'
 gem 'devise', '~> 4.7'
 gem 'devise-two-factor', '~> 3.1'
 
@@ -48,8 +48,8 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.9'
 
-gem 'discard', '~> 1.1'
-gem 'doorkeeper', '~> 5.2'
+gem 'discard', '~> 1.2'
+gem 'doorkeeper', '~> 5.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
@@ -69,7 +69,7 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b
 gem 'nokogiri', '~> 1.10'
 gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.10'
-gem 'ox', '~> 2.12'
+gem 'ox', '~> 2.13'
 gem 'parslet'
 gem 'parallel', '~> 1.19'
 gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c'
@@ -84,7 +84,7 @@ gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 1.1'
 gem 'ruby-progressbar', '~> 1.10'
 gem 'sanitize', '~> 5.1'
-gem 'sidekiq', '~> 5.2'
+gem 'sidekiq', '~> 6.0'
 gem 'sidekiq-scheduler', '~> 3.0'
 gem 'sidekiq-unique-jobs', '~> 6.0'
 gem 'sidekiq-bulk', '~>0.2.0'
@@ -92,9 +92,9 @@ gem 'simple-navigation', '~> 4.1'
 gem 'simple_form', '~> 5.0'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'stoplight', '~> 2.2.0'
-gem 'strong_migrations', '~> 0.5'
+gem 'strong_migrations', '~> 0.6'
 gem 'tty-command', '~> 0.9', require: false
-gem 'tty-prompt', '~> 0.20', require: false
+gem 'tty-prompt', '~> 0.21', require: false
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2019'
 gem 'webpacker', '~> 4.2'
@@ -112,7 +112,7 @@ group :development, :test do
   gem 'i18n-tasks', '~> 0.9', require: false
   gem 'pry-byebug', '~> 3.8'
   gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 3.9'
+  gem 'rspec-rails', '~> 4.0'
 end
 
 group :production, :test do
@@ -122,19 +122,19 @@ end
 group :test do
   gem 'capybara', '~> 3.31'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.10'
+  gem 'faker', '~> 2.11'
   gem 'microformats', '~> 4.2'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
   gem 'simplecov', '~> 0.18', require: false
   gem 'webmock', '~> 3.8'
-  gem 'parallel_tests', '~> 2.30'
+  gem 'parallel_tests', '~> 2.32'
 end
 
 group :development do
   gem 'active_record_query_trace', '~> 1.7'
   gem 'annotate', '~> 3.0'
-  gem 'better_errors', '~> 2.5'
+  gem 'better_errors', '~> 2.6'
   gem 'binding_of_caller', '~> 0.7'
   gem 'bullet', '~> 6.1'
   gem 'letter_opener', '~> 1.7'
@@ -142,10 +142,10 @@ group :development do
   gem 'memory_profiler'
   gem 'rubocop', '~> 0.79', require: false
   gem 'rubocop-rails', '~> 2.4', require: false
-  gem 'brakeman', '~> 4.7', require: false
+  gem 'brakeman', '~> 4.8', require: false
   gem 'bundler-audit', '~> 0.6', require: false
 
-  gem 'capistrano', '~> 3.11'
+  gem 'capistrano', '~> 3.12'
   gem 'capistrano-rails', '~> 1.4'
   gem 'capistrano-rbenv', '~> 2.1'
   gem 'capistrano-yarn', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d0b75f91..3ac0a06ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,25 +31,25 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.1)
-      actionpack (= 5.2.4.1)
+    actioncable (5.2.4.2)
+      actionpack (= 5.2.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
+    actionmailer (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionpack (5.2.4.2)
+      actionview (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionview (5.2.4.2)
+      activesupport (= 5.2.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -60,20 +60,20 @@ GEM
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_query_trace (1.7)
-    activejob (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activejob (5.2.4.2)
+      activesupport (= 5.2.4.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       arel (>= 9.0)
-    activestorage (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
+    activestorage (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.1)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -92,23 +92,23 @@ GEM
     av (0.9.0)
       cocaine (~> 0.5.3)
     aws-eventstream (1.0.3)
-    aws-partitions (1.261.0)
-    aws-sdk-core (3.86.0)
+    aws-partitions (1.286.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.27.0)
+    aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.1)
+    aws-sdk-s3 (1.61.1)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
     bcrypt (3.1.12)
-    better_errors (2.5.1)
+    better_errors (2.6.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -116,10 +116,10 @@ GEM
       debug_inspector (>= 0.0.1)
     blurhash (0.1.4)
       ffi (~> 1.10.0)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
-    brakeman (4.7.2)
-    browser (3.0.3)
+    brakeman (4.8.0)
+    browser (4.0.0)
     builder (3.2.4)
     bullet (6.1.0)
       activesupport (>= 3.0.0)
@@ -128,7 +128,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     byebug (11.1.1)
-    capistrano (3.11.2)
+    capistrano (3.12.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -160,13 +160,13 @@ GEM
       elasticsearch (>= 2.0.0)
       elasticsearch-dsl
     chunky_png (1.3.11)
-    cld3 (3.2.6)
+    cld3 (3.3.0)
       ffi (>= 1.1.0, < 1.12.0)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -190,37 +190,37 @@ GEM
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
     diff-lcs (1.3)
-    discard (1.1.0)
+    discard (1.2.0)
       activerecord (>= 4.2, < 7)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.2.3)
+    doorkeeper (5.3.1)
       railties (>= 5)
     dotenv (2.7.5)
     dotenv-rails (2.7.5)
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     e2mmap (0.1.0)
-    elasticsearch (7.3.0)
-      elasticsearch-api (= 7.3.0)
-      elasticsearch-transport (= 7.3.0)
-    elasticsearch-api (7.3.0)
+    elasticsearch (7.5.0)
+      elasticsearch-api (= 7.5.0)
+      elasticsearch-transport (= 7.5.0)
+    elasticsearch-api (7.5.0)
       multi_json
     elasticsearch-dsl (0.1.8)
-    elasticsearch-transport (7.3.0)
-      faraday
+    elasticsearch-transport (7.5.0)
+      faraday (>= 0.14, < 1)
       multi_json
     encryptor (3.0.0)
     equatable (0.6.1)
     erubi (1.9.0)
-    et-orbi (1.1.6)
+    et-orbi (1.2.3)
       tzinfo
     excon (0.71.0)
     fabrication (2.21.0)
-    faker (2.10.1)
+    faker (2.11.0)
       i18n (>= 1.6, < 2)
-    faraday (1.0.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
     fastimage (2.1.7)
@@ -241,8 +241,8 @@ GEM
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     formatador (0.2.5)
-    fugit (1.1.6)
-      et-orbi (~> 1.1, >= 1.1.6)
+    fugit (1.3.3)
+      et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
@@ -265,8 +265,8 @@ GEM
       railties (>= 4.0.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashdiff (1.0.0)
-    hashie (3.6.0)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
     highline (2.0.3)
     hiredis (0.6.3)
     hkdf (0.3.0)
@@ -287,7 +287,7 @@ GEM
       rainbow (>= 2.0.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.30)
+    i18n-tasks (0.9.31)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -299,19 +299,19 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.0)
     ipaddress (0.8.3)
-    iso-639 (0.2.8)
+    iso-639 (0.3.5)
     jaro_winkler (1.5.4)
     jmespath (1.4.0)
     json (2.3.0)
     json-canonicalization (0.2.0)
-    json-ld (3.1.0)
+    json-ld (3.1.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.1)
+      json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.14)
       rack (~> 2.0)
       rdf (~> 3.1)
-    json-ld-preloaded (3.1.0)
+    json-ld-preloaded (3.1.2)
       json-ld (~> 3.1)
       rdf (~> 3.1)
     jsonapi-renderer (0.2.2)
@@ -361,11 +361,11 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.3)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.1)
@@ -374,7 +374,7 @@ GEM
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -383,9 +383,9 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.10.1)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    oj (3.10.5)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-cas (1.1.1)
       addressable (~> 2.3)
@@ -395,7 +395,7 @@ GEM
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.7)
     orm_adapter (0.5.0)
-    ox (2.12.1)
+    ox (2.13.2)
     paperclip (6.0.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -406,15 +406,15 @@ GEM
       av (~> 0.9.0)
       paperclip (>= 2.5.2)
     parallel (1.19.1)
-    parallel_tests (2.30.1)
+    parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.2)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.3)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    pg (1.2.2)
+    pg (1.2.3)
     pghero (2.4.1)
       activerecord (>= 5)
     pkg-config (1.4.1)
@@ -435,7 +435,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.1)
+    puma (4.3.3)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -445,24 +445,24 @@ GEM
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (2.0.7)
+    rack-protection (2.0.8.1)
       rack
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.1)
-      actioncable (= 5.2.4.1)
-      actionmailer (= 5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      activestorage (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    rails (5.2.4.2)
+      actioncable (= 5.2.4.2)
+      actionmailer (= 5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      activestorage (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.1)
+      railties (= 5.2.4.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -478,9 +478,9 @@ GEM
       railties (>= 5.0, < 6)
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -523,26 +523,26 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
     rqrcode_core (0.1.1)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
     rspec-sidekiq (3.0.3)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -556,38 +556,40 @@ GEM
     ruby-progressbar (1.10.1)
     ruby-saml (1.9.0)
       nokogiri (>= 1.5.10)
-    rufus-scheduler (3.5.2)
-      fugit (~> 1.1, >= 1.1.5)
+    rufus-scheduler (3.6.0)
+      fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
     sanitize (5.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.0.4)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (3.0.0)
+    sidekiq-scheduler (3.0.1)
+      e2mmap
       redis (>= 3, < 5)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 3)
+      thwait
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (6.0.18)
+    sidekiq-unique-jobs (6.0.21)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 4.0, < 7.0)
       thor (~> 0)
     simple-navigation (4.1.0)
       activesupport (>= 2.3.2)
-    simple_form (5.0.1)
+    simple_form (5.0.2)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.18.2)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.0)
+    simplecov-html (0.12.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -595,7 +597,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.20.0)
+    sshkit (1.21.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.15)
@@ -603,7 +605,7 @@ GEM
     stoplight (2.2.0)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
-    strong_migrations (0.5.1)
+    strong_migrations (0.6.2)
       activerecord (>= 5)
     temple (0.8.2)
     terminal-table (1.8.0)
@@ -614,11 +616,11 @@ GEM
     thread_safe (0.3.6)
     thwait (0.1.0)
     tilt (2.0.10)
-    tty-color (0.5.0)
+    tty-color (0.5.1)
     tty-command (0.9.0)
       pastel (~> 0.7.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.20.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.21.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
       tty-reader (~> 0.7.0)
@@ -626,10 +628,10 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
@@ -640,7 +642,7 @@ GEM
     uniform_notifier (1.13.0)
     warden (1.2.8)
       rack (>= 2.0.6)
-    webmock (3.8.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -666,35 +668,35 @@ DEPENDENCIES
   active_record_query_trace (~> 1.7)
   addressable (~> 2.7)
   annotate (~> 3.0)
-  aws-sdk-s3 (~> 1.60)
-  better_errors (~> 2.5)
+  aws-sdk-s3 (~> 1.61)
+  better_errors (~> 2.6)
   binding_of_caller (~> 0.7)
   blurhash (~> 0.1)
   bootsnap (~> 1.4)
-  brakeman (~> 4.7)
+  brakeman (~> 4.8)
   browser
   bullet (~> 6.1)
   bundler-audit (~> 0.6)
-  capistrano (~> 3.11)
+  capistrano (~> 3.12)
   capistrano-rails (~> 1.4)
   capistrano-rbenv (~> 2.1)
   capistrano-yarn (~> 2.0)
   capybara (~> 3.31)
   charlock_holmes (~> 0.7.7)
   chewy (~> 5.1)
-  cld3 (~> 3.2.6)
+  cld3 (~> 3.3.0)
   climate_control (~> 0.2)
   concurrent-ruby
   connection_pool
   devise (~> 4.7)
   devise-two-factor (~> 3.1)
   devise_pam_authenticatable2 (~> 9.2)
-  discard (~> 1.1)
-  doorkeeper (~> 5.2)
+  discard (~> 1.2)
+  doorkeeper (~> 5.3)
   dotenv-rails (~> 2.7)
   e2mmap (~> 0.1.0)
   fabrication (~> 2.21)
-  faker (~> 2.10)
+  faker (~> 2.11)
   fast_blank (~> 1.0)
   fastimage
   fog-core (<= 2.1.0)
@@ -732,11 +734,11 @@ DEPENDENCIES
   omniauth (~> 1.9)
   omniauth-cas (~> 1.1)
   omniauth-saml (~> 1.10)
-  ox (~> 2.12)
+  ox (~> 2.13)
   paperclip (~> 6.0)
   paperclip-av-transcoder (~> 0.6)
   parallel (~> 1.19)
-  parallel_tests (~> 2.30)
+  parallel_tests (~> 2.32)
   parslet
   pg (~> 1.2)
   pghero (~> 2.4)
@@ -751,7 +753,7 @@ DEPENDENCIES
   rack (~> 2.2.2)
   rack-attack (~> 6.2)
   rack-cors (~> 1.1)
-  rails (~> 5.2.4)
+  rails (~> 5.2.4.2)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 5.1)
   rails-settings-cached (~> 0.6)
@@ -761,13 +763,13 @@ DEPENDENCIES
   redis-namespace (~> 1.7)
   redis-rails (~> 5.0)
   rqrcode (~> 1.1)
-  rspec-rails (~> 3.9)
+  rspec-rails (~> 4.0)
   rspec-sidekiq (~> 3.0)
   rubocop (~> 0.79)
   rubocop-rails (~> 2.4)
   ruby-progressbar (~> 1.10)
   sanitize (~> 5.1)
-  sidekiq (~> 5.2)
+  sidekiq (~> 6.0)
   sidekiq-bulk (~> 0.2.0)
   sidekiq-scheduler (~> 3.0)
   sidekiq-unique-jobs (~> 6.0)
@@ -779,11 +781,11 @@ DEPENDENCIES
   stackprof
   stoplight (~> 2.2.0)
   streamio-ffmpeg (~> 3.0)
-  strong_migrations (~> 0.5)
+  strong_migrations (~> 0.6)
   thor (~> 0.20)
   thwait (~> 0.1.0)
   tty-command (~> 0.9)
-  tty-prompt (~> 0.20)
+  tty-prompt (~> 0.21)
   twitter-text (~> 1.14)
   tzinfo-data (~> 1.2019)
   webmock (~> 3.8)
diff --git a/README.md b/README.md
index 7db66abfa..9ef4acb17 100644
--- a/README.md
+++ b/README.md
@@ -68,8 +68,8 @@ Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Strea
 **Requirements:**
 
 - **PostgreSQL** 9.5+
-- **Redis**
-- **Ruby** 2.4+
+- **Redis** 4+
+- **Ruby** 2.5+
 - **Node.js** 10.13+
 
 The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
diff --git a/Vagrantfile b/Vagrantfile
index 79af1dc5d..7d0f7b3de 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -91,7 +91,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index f5735421c..bec9ed88b 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -47,6 +47,11 @@ class StatusesIndex < Chewy::Index
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
+    crutch :bookmarks do |collection|
+      data = ::Bookmark.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id)
+      data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
+    end
+
     root date_detection: false do
       field :id, type: 'long'
       field :account_id, type: 'long'
diff --git a/app/controllers/account_follow_controller.rb b/app/controllers/account_follow_controller.rb
index 185a355f8..33394074d 100644
--- a/app/controllers/account_follow_controller.rb
+++ b/app/controllers/account_follow_controller.rb
@@ -6,7 +6,7 @@ class AccountFollowController < ApplicationController
   before_action :authenticate_user!
 
   def create
-    FollowService.new.call(current_user.account, @account.acct)
+    FollowService.new.call(current_user.account, @account, with_rate_limit: true)
     redirect_to account_path(@account)
   end
 end
diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index e273dfeae..2d77620df 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -2,8 +2,18 @@
 
 module Admin
   class ActionLogsController < BaseController
-    def index
-      @action_logs = Admin::ActionLog.page(params[:page])
+    before_action :set_action_logs
+
+    def index; end
+
+    private
+
+    def set_action_logs
+      @action_logs = Admin::ActionLogFilter.new(filter_params).results.page(params[:page])
+    end
+
+    def filter_params
+      params.slice(:page, *Admin::ActionLogFilter::KEYS).permit(:page, *Admin::ActionLogFilter::KEYS)
     end
   end
 end
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index 9fe85064e..c25919726 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -6,12 +6,12 @@ module Admin
 
     def index
       authorize :email_domain_block, :index?
-      @email_domain_blocks = EmailDomainBlock.page(params[:page])
+      @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page])
     end
 
     def new
       authorize :email_domain_block, :create?
-      @email_domain_block = EmailDomainBlock.new
+      @email_domain_block = EmailDomainBlock.new(domain: params[:_domain])
     end
 
     def create
@@ -21,6 +21,28 @@ module Admin
 
       if @email_domain_block.save
         log_action :create, @email_domain_block
+
+        if @email_domain_block.with_dns_records?
+          hostnames = []
+          ips       = []
+
+          Resolv::DNS.open do |dns|
+            dns.timeouts = 1
+
+            hostnames = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+
+            ([@email_domain_block.domain] + hostnames).uniq.each do |hostname|
+              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
+              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
+            end
+          end
+
+          (hostnames + ips).each do |hostname|
+            another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: @email_domain_block)
+            log_action :create, another_email_domain_block if another_email_domain_block.save
+          end
+        end
+
         redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg')
       else
         render :new
@@ -41,7 +63,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:email_domain_block).permit(:domain)
+      params.require(:email_domain_block).permit(:domain, :with_dns_records)
     end
   end
 end
diff --git a/app/controllers/admin/site_uploads_controller.rb b/app/controllers/admin/site_uploads_controller.rb
new file mode 100644
index 000000000..cacecedb0
--- /dev/null
+++ b/app/controllers/admin/site_uploads_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Admin
+  class SiteUploadsController < BaseController
+    before_action :set_site_upload
+
+    def destroy
+      authorize :settings, :destroy?
+
+      @site_upload.destroy!
+
+      redirect_to edit_admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
+    end
+
+    private
+
+    def set_site_upload
+      @site_upload = SiteUpload.find(params[:id])
+    end
+  end
+end
diff --git a/app/controllers/admin/warning_presets_controller.rb b/app/controllers/admin/warning_presets_controller.rb
index 37be842c5..b376f8d9b 100644
--- a/app/controllers/admin/warning_presets_controller.rb
+++ b/app/controllers/admin/warning_presets_controller.rb
@@ -7,7 +7,7 @@ module Admin
     def index
       authorize :account_warning_preset, :index?
 
-      @warning_presets = AccountWarningPreset.all
+      @warning_presets = AccountWarningPreset.alphabetic
       @warning_preset  = AccountWarningPreset.new
     end
 
@@ -19,7 +19,7 @@ module Admin
       if @warning_preset.save
         redirect_to admin_warning_presets_path
       else
-        @warning_presets = AccountWarningPreset.all
+        @warning_presets = AccountWarningPreset.alphabetic
         render :index
       end
     end
@@ -52,7 +52,7 @@ module Admin
     end
 
     def warning_preset_params
-      params.require(:account_warning_preset).permit(:text)
+      params.require(:account_warning_preset).permit(:title, :text)
     end
   end
 end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 68bf425f4..153ade253 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -44,6 +44,10 @@ class Api::BaseController < ApplicationController
     render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
   end
 
+  rescue_from Mastodon::RateLimitExceededError do
+    render json: { error: I18n.t('errors.429') }, status: 429
+  end
+
   rescue_from ActionController::ParameterMissing do |e|
     render json: { error: e.to_s }, status: 400
   end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index e360b8a92..1daa1ed0d 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   before_action :set_account
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
@@ -27,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    (@account.hides_followers? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index a405b365f..6fc23cf75 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   before_action :set_account
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
@@ -27,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    (@account.hides_following? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/identity_proofs_controller.rb b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
index bea51ae11..8dad6fee9 100644
--- a/app/controllers/api/v1/accounts/identity_proofs_controller.rb
+++ b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::IdentityProofsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def index
     @proofs = @account.identity_proofs.active
     render json: @proofs, each_serializer: REST::IdentityProofSerializer
diff --git a/app/controllers/api/v1/accounts/lists_controller.rb b/app/controllers/api/v1/accounts/lists_controller.rb
index 72392453c..ccb751f8f 100644
--- a/app/controllers/api/v1/accounts/lists_controller.rb
+++ b/app/controllers/api/v1/accounts/lists_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::ListsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def index
     @lists = @account.lists.where(account: current_account)
     render json: @lists, each_serializer: REST::ListSerializer
diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb
index 0a0239c42..3915b5669 100644
--- a/app/controllers/api/v1/accounts/pins_controller.rb
+++ b/app/controllers/api/v1/accounts/pins_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Accounts::PinsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def create
     AccountPin.create!(account: current_account, target_account: @account)
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index ab8a0461f..1d3992a28 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:follows' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     accounts = Account.where(id: account_ids).select('id')
     # .where doesn't guarantee that our results are in the same order
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index 4217b527a..3061fcb7e 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::SearchController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
   before_action :require_user!
 
-  respond_to :json
-
   def show
     @accounts = account_search
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 333db9618..114ee0a82 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
 
   after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index d68d2715f..0080faf33 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::AccountsController < Api::BaseController
 
   skip_before_action :require_authenticated_user!, only: :create
 
-  respond_to :json
+  override_rate_limit_headers :follow, family: :follows
 
   def show
     render json: @account, serializer: REST::AccountSerializer
@@ -31,7 +31,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def follow
-    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs))
+    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs), with_rate_limit: true)
 
     options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
 
diff --git a/app/controllers/api/v1/apps/credentials_controller.rb b/app/controllers/api/v1/apps/credentials_controller.rb
index 8b63d0490..0475b2d4a 100644
--- a/app/controllers/api/v1/apps/credentials_controller.rb
+++ b/app/controllers/api/v1/apps/credentials_controller.rb
@@ -3,8 +3,6 @@
 class Api::V1::Apps::CredentialsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read }
 
-  respond_to :json
-
   def show
     render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key)
   end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 4cff04cad..a2baeef90 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::BlocksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index e1b244e76..c15212f0a 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::BookmarksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index b19f27ebf..bc8013379 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -9,8 +9,6 @@ class Api::V1::ConversationsController < Api::BaseController
   before_action :set_conversation, except: :index
   after_action :insert_pagination_headers, only: :index
 
-  respond_to :json
-
   def index
     @conversations = paginated_conversations
     render json: @conversations, each_serializer: REST::ConversationSerializer
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index 4e6d5d7c6..08b3474cc 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::CustomEmojisController < Api::BaseController
-  respond_to :json
-
   skip_before_action :set_cache_headers
 
   def index
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index af9e7a20f..5bb02d834 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -8,8 +8,6 @@ class Api::V1::DomainBlocksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers, only: :show
 
-  respond_to :json
-
   def show
     @blocks = load_domain_blocks
     render json: @blocks.map(&:domain)
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 2770c7aef..c87dbc4ce 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::EndorsementsController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index db827f9d4..3e242905d 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::FavouritesController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index fb27ef88b..8c1b81a0f 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -2,12 +2,9 @@
 
 class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
-
   before_action :require_user!
   before_action :set_most_used_tags, only: :index
 
-  respond_to :json
-
   def index
     render json: @most_used_tags, each_serializer: REST::TagSerializer
   end
diff --git a/app/controllers/api/v1/filters_controller.rb b/app/controllers/api/v1/filters_controller.rb
index e5ebaff4d..b0ace3af0 100644
--- a/app/controllers/api/v1/filters_controller.rb
+++ b/app/controllers/api/v1/filters_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::FiltersController < Api::BaseController
   before_action :set_filters, only: :index
   before_action :set_filter, only: [:show, :update, :destroy]
 
-  respond_to :json
-
   def index
     render json: @filters, each_serializer: REST::FilterSerializer
   end
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb
index b30e8464c..4f6b4bcbf 100644
--- a/app/controllers/api/v1/instances/activity_controller.rb
+++ b/app/controllers/api/v1/instances/activity_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Instances::ActivityController < Api::BaseController
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
-  respond_to :json
-
   def show
     expires_in 1.day, public: true
     render_with_cache json: :activity, expires_in: 1.day
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index cc00d8a6b..9fa440935 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Instances::PeersController < Api::BaseController
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
-  respond_to :json
-
   def index
     expires_in 1.day, public: true
     render_with_cache(expires_in: 1.day) { Account.remote.domains }
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index c323b60b4..5b5058a7b 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::InstancesController < Api::BaseController
-  respond_to :json
-
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index 81825db15..0bb3d0d27 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -3,27 +3,42 @@
 class Api::V1::MediaController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:media' }
   before_action :require_user!
-
-  respond_to :json
+  before_action :set_media_attachment, except: [:create]
+  before_action :check_processing, except: [:create]
 
   def create
-    @media = current_account.media_attachments.create!(media_params)
-    render json: @media, serializer: REST::MediaAttachmentSerializer
+    @media_attachment = current_account.media_attachments.create!(media_attachment_params)
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     render json: file_type_error, status: 422
   rescue Paperclip::Error
     render json: processing_error, status: 500
   end
 
+  def show
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
+  end
+
   def update
-    @media = current_account.media_attachments.where(status_id: nil).find(params[:id])
-    @media.update!(media_params)
-    render json: @media, serializer: REST::MediaAttachmentSerializer
+    @media_attachment.update!(media_attachment_params)
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
   end
 
   private
 
-  def media_params
+  def status_code_for_media_attachment
+    @media_attachment.not_processed? ? 206 : 200
+  end
+
+  def set_media_attachment
+    @media_attachment = current_account.media_attachments.unattached.find(params[:id])
+  end
+
+  def check_processing
+    render json: processing_error, status: 422 if @media_attachment.processing_failed?
+  end
+
+  def media_attachment_params
     params.permit(:file, :description, :focus)
   end
 
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index df6c8e86c..65439fe9b 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::MutesController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index bf3002e79..8ac227765 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::NotificationsController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers, only: :index
 
-  respond_to :json
-
   DEFAULT_NOTIFICATIONS_LIMIT = 15
 
   def index
diff --git a/app/controllers/api/v1/polls/votes_controller.rb b/app/controllers/api/v1/polls/votes_controller.rb
index 3fa0b6a76..e1d26106a 100644
--- a/app/controllers/api/v1/polls/votes_controller.rb
+++ b/app/controllers/api/v1/polls/votes_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Polls::VotesController < Api::BaseController
   before_action :require_user!
   before_action :set_poll
 
-  respond_to :json
-
   def create
     VoteService.new.call(current_account, @poll, vote_params[:choices])
     render json: @poll, serializer: REST::PollSerializer
diff --git a/app/controllers/api/v1/polls_controller.rb b/app/controllers/api/v1/polls_controller.rb
index 031e6d42d..744baf7bb 100644
--- a/app/controllers/api/v1/polls_controller.rb
+++ b/app/controllers/api/v1/polls_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::PollsController < Api::BaseController
   before_action :set_poll
   before_action :refresh_poll
 
-  respond_to :json
-
   def show
     render json: @poll, serializer: REST::PollSerializer, include_results: true
   end
diff --git a/app/controllers/api/v1/preferences_controller.rb b/app/controllers/api/v1/preferences_controller.rb
index 077d39f5d..1640a8224 100644
--- a/app/controllers/api/v1/preferences_controller.rb
+++ b/app/controllers/api/v1/preferences_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::PreferencesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     render json: current_account, serializer: REST::PreferencesSerializer
   end
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 1b0b4b05b..e10083d45 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::ReportsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:reports' }, only: [:create]
   before_action :require_user!
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :reports
 
   def create
     @report = ReportService.new.call(
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
index a7f1eed00..3954af3c9 100644
--- a/app/controllers/api/v1/statuses/bookmarks_controller.rb
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     current_account.bookmarks.find_or_create_by!(account: current_account, status: @status)
     render json: @status, serializer: REST::StatusSerializer
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 05f4acc33..8229786d6 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
   before_action :set_status
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb
index f18ace996..7afa822ed 100644
--- a/app/controllers/api/v1/statuses/favourites_controller.rb
+++ b/app/controllers/api/v1/statuses/favourites_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     FavouriteService.new.call(current_account, @status)
     render json: @status, serializer: REST::StatusSerializer
diff --git a/app/controllers/api/v1/statuses/mutes_controller.rb b/app/controllers/api/v1/statuses/mutes_controller.rb
index b02469b4f..43c7a525a 100644
--- a/app/controllers/api/v1/statuses/mutes_controller.rb
+++ b/app/controllers/api/v1/statuses/mutes_controller.rb
@@ -8,8 +8,6 @@ class Api::V1::Statuses::MutesController < Api::BaseController
   before_action :set_status
   before_action :set_conversation
 
-  respond_to :json
-
   def create
     current_account.mute_conversation!(@conversation)
     @mutes_map = { @conversation.id => true }
diff --git a/app/controllers/api/v1/statuses/pins_controller.rb b/app/controllers/api/v1/statuses/pins_controller.rb
index 4118a8ce4..51b1621b6 100644
--- a/app/controllers/api/v1/statuses/pins_controller.rb
+++ b/app/controllers/api/v1/statuses/pins_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::PinsController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     StatusPin.create!(account: current_account, status: @status)
     distribute_add_activity!
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index fa60e7d84..6c9e49d90 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
   before_action :set_status
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/statuses/reblogs_controller.rb b/app/controllers/api/v1/statuses/reblogs_controller.rb
index 67106ccbe..7fa774a4d 100644
--- a/app/controllers/api/v1/statuses/reblogs_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogs_controller.rb
@@ -7,10 +7,11 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
   before_action :require_user!
   before_action :set_reblog
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :statuses
 
   def create
     @status = ReblogService.new.call(current_account, @reblog, reblog_params)
+
     render json: @status, serializer: REST::StatusSerializer
   end
 
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index bba3c0651..93a253cbb 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -7,8 +7,9 @@ class Api::V1::StatusesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :destroy]
   before_action :require_user!, except:  [:show, :context]
   before_action :set_status, only:       [:show, :context]
+  before_action :set_thread, only:       [:create]
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :statuses
 
   # This API was originally unlimited, pagination cannot be introduced without
   # breaking backwards-compatibility. Arbitrarily high number to cover most
@@ -36,7 +37,7 @@ class Api::V1::StatusesController < Api::BaseController
   def create
     @status = PostStatusService.new.call(current_user.account,
                                          text: status_params[:status],
-                                         thread: status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id]),
+                                         thread: @thread,
                                          media_ids: status_params[:media_ids],
                                          sensitive: status_params[:sensitive],
                                          spoiler_text: status_params[:spoiler_text],
@@ -44,7 +45,8 @@ class Api::V1::StatusesController < Api::BaseController
                                          scheduled_at: status_params[:scheduled_at],
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
-                                         idempotency: request.headers['Idempotency-Key'])
+                                         idempotency: request.headers['Idempotency-Key'],
+                                         with_rate_limit: true)
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
@@ -68,6 +70,12 @@ class Api::V1::StatusesController < Api::BaseController
     raise ActiveRecord::RecordNotFound
   end
 
+  def set_thread
+    @thread = status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id])
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
+  end
+
   def status_params
     params.permit(
       :status,
diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb
index ebb17608c..7cd60615a 100644
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::StreamingController < Api::BaseController
-  respond_to :json
-
   def index
     if Rails.configuration.x.streaming_api_base_url != request.host
       redirect_to streaming_api_url, status: 301
diff --git a/app/controllers/api/v1/suggestions_controller.rb b/app/controllers/api/v1/suggestions_controller.rb
index 9da2b60ae..52054160d 100644
--- a/app/controllers/api/v1/suggestions_controller.rb
+++ b/app/controllers/api/v1/suggestions_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::SuggestionsController < Api::BaseController
   before_action :require_user!
   before_action :set_accounts
 
-  respond_to :json
-
   def index
     render json: @accounts, each_serializer: REST::AccountSerializer
   end
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ff5ede138..ae6dbcb8b 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   before_action :require_user!, only: [:show]
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
 
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index ccc10f966..581befef1 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   before_action :require_user!, only: [:show], if: :require_auth?
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 9adc4ad29..2d6ad5a80 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
   before_action :load_tag
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/trends_controller.rb b/app/controllers/api/v1/trends_controller.rb
index bcea9857e..c875e9041 100644
--- a/app/controllers/api/v1/trends_controller.rb
+++ b/app/controllers/api/v1/trends_controller.rb
@@ -3,8 +3,6 @@
 class Api::V1::TrendsController < Api::BaseController
   before_action :set_tags
 
-  respond_to :json
-
   def index
     render json: @tags, each_serializer: REST::TagSerializer
   end
diff --git a/app/controllers/api/v2/media_controller.rb b/app/controllers/api/v2/media_controller.rb
new file mode 100644
index 000000000..0c1baf01d
--- /dev/null
+++ b/app/controllers/api/v2/media_controller.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Api::V2::MediaController < Api::V1::MediaController
+  def create
+    @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: 202
+  rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+    render json: file_type_error, status: 422
+  rescue Paperclip::Error
+    render json: processing_error, status: 500
+  end
+end
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index cbd9b551d..f17431dd1 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -8,8 +8,6 @@ class Api::V2::SearchController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:search' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     @search = Search.new(search_results)
     render json: @search, serializer: REST::SearchSerializer
diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb
index 4aa31695c..741ba910f 100644
--- a/app/controllers/api/web/embeds_controller.rb
+++ b/app/controllers/api/web/embeds_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::EmbedsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def create
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index f388b17e5..7916b82fa 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::PushSubscriptionsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def create
diff --git a/app/controllers/api/web/settings_controller.rb b/app/controllers/api/web/settings_controller.rb
index e3178bf48..3d65e46ed 100644
--- a/app/controllers/api/web/settings_controller.rb
+++ b/app/controllers/api/web/settings_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::SettingsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def update
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0cfa2b386..973db6aca 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,6 +29,7 @@ class ApplicationController < ActionController::Base
   rescue_from Mastodon::NotPermittedError, with: :forbidden
   rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error
   rescue_from Mastodon::RaceConditionError, with: :service_unavailable
+  rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests
 
   before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
   before_action :require_functional!, if: :user_signed_in?
@@ -111,6 +112,10 @@ class ApplicationController < ActionController::Base
     respond_with_error(503)
   end
 
+  def too_many_requests
+    respond_with_error(429)
+  end
+
   def single_user_mode?
     @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.where('id > 0').exists?
   end
diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb
index e27366ea3..29c0288d0 100644
--- a/app/controllers/authorize_interactions_controller.rb
+++ b/app/controllers/authorize_interactions_controller.rb
@@ -20,7 +20,7 @@ class AuthorizeInteractionsController < ApplicationController
   end
 
   def create
-    if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource)
+    if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource, with_rate_limit: true)
       render :success
     else
       render :error
diff --git a/app/controllers/concerns/rate_limit_headers.rb b/app/controllers/concerns/rate_limit_headers.rb
index b79c558d8..86fe58a71 100644
--- a/app/controllers/concerns/rate_limit_headers.rb
+++ b/app/controllers/concerns/rate_limit_headers.rb
@@ -3,6 +3,20 @@
 module RateLimitHeaders
   extend ActiveSupport::Concern
 
+  class_methods do
+    def override_rate_limit_headers(method_name, options = {})
+      around_action(only: method_name, if: :current_account) do |_controller, block|
+        begin
+          block.call
+        ensure
+          rate_limiter = RateLimiter.new(current_account, options)
+          rate_limit_headers = rate_limiter.to_headers
+          response.headers.merge!(rate_limit_headers) unless response.headers['X-RateLimit-Remaining'].present? && rate_limit_headers['X-RateLimit-Remaining'].to_i > response.headers['X-RateLimit-Remaining'].to_i
+        end
+      end
+    end
+  end
+
   included do
     before_action :set_rate_limit_headers, if: :rate_limited_request?
   end
@@ -44,7 +58,7 @@ module RateLimitHeaders
   end
 
   def api_throttle_data
-    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] }
+    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] - v[:count] }
     request.env['rack.attack.throttle_data'][most_limited_type]
   end
 
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 7103749ad..14e22dd1e 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -28,7 +28,8 @@ class FollowerAccountsController < ApplicationController
         render json: collection_presenter,
                serializer: ActivityPub::CollectionSerializer,
                adapter: ActivityPub::Adapter,
-               content_type: 'application/activity+json'
+               content_type: 'application/activity+json',
+               fields: restrict_fields_to
       end
     end
   end
@@ -71,4 +72,12 @@ class FollowerAccountsController < ApplicationController
       )
     end
   end
+
+  def restrict_fields_to
+    if page_requested? || !@account.user_hides_network?
+      # Return all fields
+    else
+      %i(id type totalItems)
+    end
+  end
 end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 6c8fb84d8..95849ffb9 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -28,7 +28,8 @@ class FollowingAccountsController < ApplicationController
         render json: collection_presenter,
                serializer: ActivityPub::CollectionSerializer,
                adapter: ActivityPub::Adapter,
-               content_type: 'application/activity+json'
+               content_type: 'application/activity+json',
+               fields: restrict_fields_to
       end
     end
   end
@@ -71,4 +72,12 @@ class FollowingAccountsController < ApplicationController
       )
     end
   end
+
+  def restrict_fields_to
+    if page_requested? || !@account.user_hides_network?
+      # Return all fields
+    else
+      %i(id type totalItems)
+    end
+  end
 end
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 38f2e39c1..7b8c4ae23 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -29,6 +29,6 @@ class Settings::ImportsController < Settings::BaseController
   end
 
   def import_params
-    params.require(:import).permit(:data, :type)
+    params.require(:import).permit(:data, :type, :mode)
   end
 end
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 6bc75aa56..88d6e4580 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -9,79 +9,8 @@ module Admin::ActionLogsHelper
     end
   end
 
-  def relevant_log_changes(log)
-    if log.target_type == 'CustomEmoji' && [:enable, :disable, :destroy].include?(log.action)
-      log.recorded_changes.slice('domain')
-    elsif log.target_type == 'CustomEmoji' && log.action == :update
-      log.recorded_changes.slice('domain', 'visible_in_picker')
-    elsif log.target_type == 'User' && [:promote, :demote].include?(log.action)
-      log.recorded_changes.slice('moderator', 'admin')
-    elsif log.target_type == 'User' && [:change_email].include?(log.action)
-      log.recorded_changes.slice('email', 'unconfirmed_email')
-    elsif log.target_type == 'DomainBlock'
-      log.recorded_changes.slice('severity', 'reject_media')
-    elsif log.target_type == 'Status' && log.action == :update
-      log.recorded_changes.slice('sensitive')
-    elsif log.target_type == 'Announcement' && log.action == :update
-      log.recorded_changes.slice('text', 'starts_at', 'ends_at', 'all_day')
-    end
-  end
-
-  def log_extra_attributes(hash)
-    safe_join(hash.to_a.map { |key, value| safe_join([content_tag(:span, key, class: 'diff-key'), '=', log_change(value)]) }, ' ')
-  end
-
-  def log_change(val)
-    return content_tag(:span, val, class: 'diff-neutral') unless val.is_a?(Array)
-    safe_join([content_tag(:span, val.first, class: 'diff-old'), content_tag(:span, val.last, class: 'diff-new')], '→')
-  end
-
-  def icon_for_log(log)
-    case log.target_type
-    when 'Account', 'User'
-      'user'
-    when 'CustomEmoji'
-      'file'
-    when 'Report'
-      'flag'
-    when 'DomainBlock'
-      'lock'
-    when 'DomainAllow'
-      'plus-circle'
-    when 'EmailDomainBlock'
-      'envelope'
-    when 'Status'
-      'pencil'
-    when 'AccountWarning'
-      'warning'
-    when 'Announcement'
-      'bullhorn'
-    end
-  end
-
-  def class_for_log_icon(log)
-    case log.action
-    when :enable, :unsuspend, :unsilence, :confirm, :promote, :resolve
-      'positive'
-    when :create
-      opposite_verbs?(log) ? 'negative' : 'positive'
-    when :update, :reset_password, :disable_2fa, :memorialize, :change_email
-      'neutral'
-    when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen
-      'negative'
-    when :destroy
-      opposite_verbs?(log) ? 'positive' : 'negative'
-    else
-      ''
-    end
-  end
-
   private
 
-  def opposite_verbs?(log)
-    %w(DomainBlock EmailDomainBlock AccountWarning).include?(log.target_type)
-  end
-
   def linkable_log_target(record)
     case record.class.name
     when 'Account'
@@ -99,7 +28,7 @@ module Admin::ActionLogsHelper
     when 'AccountWarning'
       link_to record.target_account.acct, admin_account_path(record.target_account_id)
     when 'Announcement'
-      link_to "##{record.id}", edit_admin_announcement_path(record.id)
+      link_to truncate(record.text), edit_admin_announcement_path(record.id)
     end
   end
 
@@ -118,7 +47,7 @@ module Admin::ActionLogsHelper
         I18n.t('admin.action_logs.deleted_status')
       end
     when 'Announcement'
-      "##{attributes['id']}"
+      truncate(attributes['text'])
     end
   end
 end
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 6ab92939d..ba0ca9638 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -10,6 +10,7 @@ module Admin::FilterHelper
     InviteFilter::KEYS,
     RelationshipFilter::KEYS,
     AnnouncementFilter::KEYS,
+    Admin::ActionLogFilter::KEYS,
   ].flatten.freeze
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb
new file mode 100644
index 000000000..baf14ab25
--- /dev/null
+++ b/app/helpers/admin/settings_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Admin::SettingsHelper
+  def site_upload_delete_hint(hint, var)
+    upload = SiteUpload.find_by(var: var.to_s)
+    return hint unless upload
+
+    link = link_to t('admin.site_uploads.delete'), admin_site_upload_path(upload), data: { method: :delete }
+    safe_join([hint, link], '<br/>'.html_safe)
+  end
+end
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index d4a824e2c..cb2c682a4 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -106,7 +106,7 @@ export function fetchAccount(id) {
       dispatch,
       getState,
       db.transaction('accounts', 'read').objectStore('accounts').index('id'),
-      id
+      id,
     ).then(() => db.close(), error => {
       db.close();
       throw error;
@@ -396,6 +396,7 @@ export function fetchFollowersFail(id, error) {
     type: FOLLOWERS_FETCH_FAIL,
     id,
     error,
+    skipNotFound: true,
   };
 };
 
@@ -482,6 +483,7 @@ export function fetchFollowingFail(id, error) {
     type: FOLLOWING_FETCH_FAIL,
     id,
     error,
+    skipNotFound: true,
   };
 };
 
@@ -571,6 +573,7 @@ export function fetchRelationshipsFail(error) {
     type: RELATIONSHIPS_FETCH_FAIL,
     error,
     skipLoading: true,
+    skipNotFound: true,
   };
 };
 
diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js
index cd36d8007..1670f9c10 100644
--- a/app/javascript/mastodon/actions/alerts.js
+++ b/app/javascript/mastodon/actions/alerts.js
@@ -34,11 +34,11 @@ export function showAlert(title = messages.unexpectedTitle, message = messages.u
   };
 };
 
-export function showAlertForError(error) {
+export function showAlertForError(error, skipNotFound = false) {
   if (error.response) {
     const { data, status, statusText, headers } = error.response;
 
-    if (status === 404 || status === 410) {
+    if (skipNotFound && (status === 404 || status === 410)) {
       // Skip these errors as they are reflected in the UI
       return { type: ALERT_NOOP };
     }
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index c3c6ff1a1..6b73fc90e 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -230,12 +230,31 @@ export function uploadCompose(files) {
         // Account for disparity in size of original image and resized data
         total += file.size - f.size;
 
-        return api(getState).post('/api/v1/media', data, {
+        return api(getState).post('/api/v2/media', data, {
           onUploadProgress: function({ loaded }){
             progress[i] = loaded;
             dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
           },
-        }).then(({ data }) => dispatch(uploadComposeSuccess(data, f)));
+        }).then(({ status, data }) => {
+          // If server-side processing of the media attachment has not completed yet,
+          // poll the server until it is, before showing the media attachment as uploaded
+
+          if (status === 200) {
+            dispatch(uploadComposeSuccess(data, f));
+          } else if (status === 202) {
+            const poll = () => {
+              api(getState).get(`/api/v1/media/${data.id}`).then(response => {
+                if (response.status === 200) {
+                  dispatch(uploadComposeSuccess(response.data, f));
+                } else if (response.status === 206) {
+                  setTimeout(() => poll(), 1000);
+                }
+              }).catch(error => dispatch(uploadComposeFail(error)));
+            };
+
+            poll();
+          }
+        });
       }).catch(error => dispatch(uploadComposeFail(error)));
     };
   };
diff --git a/app/javascript/mastodon/actions/identity_proofs.js b/app/javascript/mastodon/actions/identity_proofs.js
index 449debf61..103983956 100644
--- a/app/javascript/mastodon/actions/identity_proofs.js
+++ b/app/javascript/mastodon/actions/identity_proofs.js
@@ -27,4 +27,5 @@ export const fetchAccountIdentityProofsFail = (accountId, err) => ({
   type: IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL,
   accountId,
   err,
+  skipNotFound: true,
 });
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 054668655..cdd2111f8 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -149,6 +149,7 @@ export function expandTimelineFail(timeline, error, isLoadingMore) {
     timeline,
     error,
     skipLoading: !isLoadingMore,
+    skipNotFound: timeline.startsWith('account:'),
   };
 };
 
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index fba21316a..6818aa5d5 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -1,4 +1,4 @@
-import Rails from 'rails-ujs';
+import Rails from '@rails/ujs';
 
 export function start() {
   require('font-awesome/css/font-awesome.css');
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index ea82f9ef9..1bb583583 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -76,8 +76,9 @@ class ColumnHeader extends React.PureComponent {
 
   handlePin = () => {
     if (!this.props.pinned) {
-      this.historyBack();
+      this.context.router.history.replace('/');
     }
+
     this.props.onPin();
   }
 
diff --git a/app/javascript/mastodon/components/domain.js b/app/javascript/mastodon/components/domain.js
index 85729ca94..697065d87 100644
--- a/app/javascript/mastodon/components/domain.js
+++ b/app/javascript/mastodon/components/domain.js
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 export default @injectIntl
diff --git a/app/javascript/mastodon/components/intersection_observer_article.js b/app/javascript/mastodon/components/intersection_observer_article.js
index e453730ba..124b34b02 100644
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@@ -44,7 +44,7 @@ export default class IntersectionObserverArticle extends React.Component {
     intersectionObserverWrapper.observe(
       id,
       this.node,
-      this.handleIntersection
+      this.handleIntersection,
     );
 
     this.componentMounted = true;
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index cfe164a50..283d7e0a5 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -10,7 +10,7 @@ import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_s
 import { decode } from 'blurhash';
 
 const messages = defineMessages({
-  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
+  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Hide media' },
 });
 
 class Item extends React.PureComponent {
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 3a17e80e7..7525a1030 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -127,15 +127,7 @@ class Poll extends ImmutablePureComponent {
 
     return (
       <li key={option.get('title')}>
-        {showResults && (
-          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
-            {({ width }) =>
-              <span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
-            }
-          </Motion>
-        )}
-
-        <label className={classNames('poll__text', { selectable: !showResults })}>
+        <label className={classNames('poll__option', { selectable: !showResults })}>
           <input
             name='vote-options'
             type={poll.get('multiple') ? 'checkbox' : 'radio'}
@@ -157,12 +149,26 @@ class Poll extends ImmutablePureComponent {
             />
           )}
           {showResults && <span className='poll__number'>
-            {!!voted && <Icon id='check' className='poll__vote__mark' title={intl.formatMessage(messages.voted)} />}
             {Math.round(percent)}%
           </span>}
 
-          <span dangerouslySetInnerHTML={{ __html: titleEmojified }} />
+          <span
+            className='poll__option__text'
+            dangerouslySetInnerHTML={{ __html: titleEmojified }}
+          />
+
+          {!!voted && <span className='poll__voted'>
+            <Icon id='check' className='poll__voted__mark' title={intl.formatMessage(messages.voted)} />
+          </span>}
         </label>
+
+        {showResults && (
+          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
+            {({ width }) =>
+              <span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
+            }
+          </Motion>
+        )}
       </li>
     );
   }
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 3a490e78e..65ca43911 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -82,15 +82,19 @@ export default class ScrollableList extends PureComponent {
   lastScrollWasSynthetic = false;
   scrollToTopOnMouseIdle = false;
 
+  _getScrollingElement = () => {
+    if (this.props.bindToDocument) {
+      return (document.scrollingElement || document.body);
+    } else {
+      return this.node;
+    }
+  }
+
   setScrollTop = newScrollTop => {
     if (this.getScrollTop() !== newScrollTop) {
       this.lastScrollWasSynthetic = true;
 
-      if (this.props.bindToDocument) {
-        document.scrollingElement.scrollTop = newScrollTop;
-      } else {
-        this.node.scrollTop = newScrollTop;
-      }
+      this._getScrollingElement().scrollTop = newScrollTop;
     }
   };
 
@@ -151,15 +155,15 @@ export default class ScrollableList extends PureComponent {
   }
 
   getScrollTop = () => {
-    return this.props.bindToDocument ? document.scrollingElement.scrollTop : this.node.scrollTop;
+    return this._getScrollingElement().scrollTop;
   }
 
   getScrollHeight = () => {
-    return this.props.bindToDocument ? document.scrollingElement.scrollHeight : this.node.scrollHeight;
+    return this._getScrollingElement().scrollHeight;
   }
 
   getClientHeight = () => {
-    return this.props.bindToDocument ? document.scrollingElement.clientHeight : this.node.clientHeight;
+    return this._getScrollingElement().clientHeight;
   }
 
   updateScrollBottom = (snapshot) => {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 0dc00cb98..075ee1b87 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -432,16 +432,10 @@ class Status extends ImmutablePureComponent {
               </a>
             </div>
 
-            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
+            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
 
             {media}
 
-            {showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && (
-              <button className='status__content__read-more-button' onClick={this.handleClick}>
-                <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
-              </button>
-            )}
-
             <StatusActionBar status={status} account={account} {...other} />
           </div>
         </div>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index ea303a58b..c3fc6c853 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -36,8 +36,8 @@ const messages = defineMessages({
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
 });
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5d921fd41..3200f2d82 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -20,6 +20,7 @@ export default class StatusContent extends React.PureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     expanded: PropTypes.bool,
+    showThread: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
@@ -181,6 +182,7 @@ export default class StatusContent extends React.PureComponent {
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
+    const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
@@ -195,6 +197,12 @@ export default class StatusContent extends React.PureComponent {
       directionStyle.direction = 'rtl';
     }
 
+    const showThreadButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick}>
+        <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
+      </button>
+    );
+
     const readMoreButton = (
       <button className='status__content__read-more-button' onClick={this.props.onClick} key='read-more'>
         <FormattedMessage id='status.read_more' defaultMessage='Read more' /><Icon id='angle-right' fixedWidth />
@@ -229,6 +237,8 @@ export default class StatusContent extends React.PureComponent {
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>
       );
     } else if (this.props.onClick) {
@@ -237,6 +247,8 @@ export default class StatusContent extends React.PureComponent {
           <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>,
       ];
 
@@ -251,6 +263,8 @@ export default class StatusContent extends React.PureComponent {
           <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>
       );
     }
diff --git a/app/javascript/mastodon/containers/domain_container.js b/app/javascript/mastodon/containers/domain_container.js
index 813178bbf..8a8ba1df1 100644
--- a/app/javascript/mastodon/containers/domain_container.js
+++ b/app/javascript/mastodon/containers/domain_container.js
@@ -6,7 +6,7 @@ import Domain from '../components/domain';
 import { openModal } from '../actions/modal';
 
 const messages = defineMessages({
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
+  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
 });
 
 const makeMapStateToProps = () => {
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 8bd7f2db5..92780a70b 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -29,8 +29,8 @@ const messages = defineMessages({
   report: { id: 'account.report', defaultMessage: 'Report @{name}' },
   share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
   media: { id: 'account.media', defaultMessage: 'Media' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
@@ -39,7 +39,7 @@ const messages = defineMessages({
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
-  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
+  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Blocked domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
   unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
@@ -142,7 +142,7 @@ class Header extends ImmutablePureComponent {
     if (me !== account.get('id') && account.getIn(['relationship', 'muting'])) {
       info.push(<span key='muted' className='relationship-tag'><FormattedMessage id='account.muted' defaultMessage='Muted' /></span>);
     } else if (me !== account.get('id') && account.getIn(['relationship', 'domain_blocking'])) {
-      info.push(<span key='domain_blocked' className='relationship-tag'><FormattedMessage id='account.domain_blocked' defaultMessage='Domain hidden' /></span>);
+      info.push(<span key='domain_blocked' className='relationship-tag'><FormattedMessage id='account.domain_blocked' defaultMessage='Domain blocked' /></span>);
     }
 
     if (me !== account.get('id')) {
diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index fda5a074f..95c9c7751 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -214,8 +214,8 @@ class Audio extends React.PureComponent {
         <div className='video-player__controls active'>
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className='video-player__volume' onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
                 &nbsp;
@@ -236,7 +236,7 @@ class Audio extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
-              <button type='button' aria-label={intl.formatMessage(messages.download)}>
+              <button type='button' title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)}>
                 <a className='video-player__download__icon' href={this.props.src} download>
                   <Icon id={'download'} fixedWidth />
                 </a>
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index 051431ed2..870c0de09 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -68,7 +68,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />
+            <AccountContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index dd2632796..07d92bb7e 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -16,6 +16,7 @@ const messages = defineMessages({
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
+  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
 });
 
 export default @injectIntl
@@ -42,6 +43,7 @@ class ActionBar extends React.PureComponent {
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
     menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
     menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index 01df31d3a..2f37ce64b 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -75,7 +75,7 @@ class Option extends React.PureComponent {
 
     return (
       <li>
-        <label className='poll__text editable'>
+        <label className='poll__option editable'>
           <span
             className={classNames('poll__input', { checkbox: isPollMultiple })}
             onClick={this.handleToggleMultiple}
@@ -88,7 +88,7 @@ class Option extends React.PureComponent {
 
           <AutosuggestInput
             placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={25}
+            maxLength={50}
             value={title}
             onChange={this.handleOptionTitleChange}
             suggestions={this.props.suggestions}
@@ -155,6 +155,7 @@ class PollForm extends ImmutablePureComponent {
         <div className='poll__footer'>
           <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 
+          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={expiresIn} onChange={this.handleSelectDuration}>
             <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
             <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 7cbfe463a..de030b7a2 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -11,13 +11,13 @@ import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Post to public timelines' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all, shown in public timelines' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Do not show in public timelines' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but not in public timelines' },
   private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
 
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 235cb7ad8..f9e45067f 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -160,7 +160,7 @@ class Conversation extends ImmutablePureComponent {
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex='0'>
-          <div className='conversation__avatar'>
+          <div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
             <AvatarComposite accounts={accounts} size={48} />
           </div>
 
diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js
index 482245c86..a6d988912 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.js
+++ b/app/javascript/mastodon/features/domain_blocks/index.js
@@ -13,8 +13,8 @@ import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_bloc
 import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
-  heading: { id: 'column.domain_blocks', defaultMessage: 'Hidden domains' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 const mapStateToProps = state => ({
@@ -55,7 +55,7 @@ class Blocks extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
+    const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no blocked domains yet.' />;
 
     return (
       <Column bindToDocument={!multiColumn} icon='minus-circle' heading={intl.formatMessage(messages.heading)}>
@@ -69,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {domains.map(domain =>
-            <DomainContainer key={domain} domain={domain} />
+            <DomainContainer key={domain} domain={domain} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index 249e6a044..75cb00c0e 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -79,7 +79,7 @@ class Favourites extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 57ef44145..7078e4e6c 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -11,6 +11,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountAuthorizeContainer from './containers/account_authorize_container';
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
+import { me } from '../../initial_state';
 
 const messages = defineMessages({
   heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
@@ -19,6 +20,8 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
   hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
+  locked: !!state.getIn(['accounts', me, 'locked']),
+  domain: state.getIn(['meta', 'domain']),
 });
 
 export default @connect(mapStateToProps)
@@ -31,6 +34,8 @@ class FollowRequests extends ImmutablePureComponent {
     shouldUpdateScroll: PropTypes.func,
     hasMore: PropTypes.bool,
     accountIds: ImmutablePropTypes.list,
+    locked: PropTypes.bool,
+    domain: PropTypes.string,
     intl: PropTypes.object.isRequired,
     multiColumn: PropTypes.bool,
   };
@@ -44,7 +49,7 @@ class FollowRequests extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn } = this.props;
+    const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn, locked, domain } = this.props;
 
     if (!accountIds) {
       return (
@@ -55,6 +60,15 @@ class FollowRequests extends ImmutablePureComponent {
     }
 
     const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
+    const unlockedPrependMessage = locked ? null : (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='follow_requests.unlocked_explanation'
+          defaultMessage='Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.'
+          values={{ domain: domain }}
+        />
+      </div>
+    );
 
     return (
       <Column bindToDocument={!multiColumn} icon='user-plus' heading={intl.formatMessage(messages.heading)}>
@@ -66,9 +80,10 @@ class FollowRequests extends ImmutablePureComponent {
           shouldUpdateScroll={shouldUpdateScroll}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
+          prepend={unlockedPrependMessage}
         >
           {accountIds.map(id =>
-            <AccountAuthorizeContainer key={id} id={id} />
+            <AccountAuthorizeContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 9e635d250..f8723e055 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -93,7 +93,7 @@ class Followers extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {blockedBy ? [] : accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 284ae2c11..5112bfa9d 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -93,7 +93,7 @@ class Following extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {blockedBy ? [] : accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js
index 91cf6215e..1896994da 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@@ -95,6 +95,10 @@ class Content extends ImmutablePureComponent {
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
       } else {
+        let status = this.props.announcement.get('statuses').find(item => link.href === item.get('url'));
+        if (status) {
+          link.addEventListener('click', this.onStatusClick.bind(this, status), false);
+        }
         link.setAttribute('title', link.href);
         link.classList.add('unhandled-link');
       }
@@ -120,6 +124,13 @@ class Content extends ImmutablePureComponent {
     }
   }
 
+  onStatusClick = (status, e) => {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      this.context.router.history.push(`/statuses/${status.get('id')}`);
+    }
+  }
+
   handleEmojiMouseEnter = ({ target }) => {
     target.src = target.getAttribute('data-original');
   }
@@ -367,6 +378,14 @@ class Announcements extends ImmutablePureComponent {
     index: 0,
   };
 
+  static getDerivedStateFromProps(props, state) {
+    if (props.announcements.size > 0 && state.index >= props.announcements.size) {
+      return { index: props.announcements.size - 1 };
+    } else {
+      return null;
+    }
+  }
+
   componentDidMount () {
     this._markAnnouncementAsRead();
   }
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 405093037..411c726ec 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -132,7 +132,7 @@ class GettingStarted extends ImmutablePureComponent {
       <ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
       <ColumnLink key={i++} icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
       <ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
+      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
     );
 
     height += 48*4;
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js
index 7f7f5009c..ca1fa1f5e 100644
--- a/app/javascript/mastodon/features/lists/index.js
+++ b/app/javascript/mastodon/features/lists/index.js
@@ -74,7 +74,7 @@ class Lists extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {lists.map(list =>
-            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
+            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index 91dd268c1..3f58a62d2 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -68,7 +68,7 @@ class Mutes extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />
+            <AccountContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 9179e51db..4becb5fb7 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -79,7 +79,7 @@ class Reblogs extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 959774da4..ba62d7b10 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -32,8 +32,8 @@ const messages = defineMessages({
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
 });
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 2993fe29a..b8344a667 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -98,7 +98,7 @@ export default class Card extends React.PureComponent {
           },
         },
       ]),
-      0
+      0,
     );
   };
 
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 2fec247c1..7a82fa13a 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -166,7 +166,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
       reblogIcon = 'lock';
     }
 
-    if (status.get('visibility') === 'private') {
+    if (['private', 'direct'].includes(status.get('visibility'))) {
       reblogLink = <Icon id={reblogIcon} />;
     } else if (this.context.router) {
       reblogLink = (
diff --git a/app/javascript/mastodon/features/ui/components/__tests__/column-test.js b/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
index 11cc1b6e8..89cb2458d 100644
--- a/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
+++ b/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
@@ -19,7 +19,7 @@ describe('<Column />', () => {
       const wrapper = mount(
         <Column heading='notifications'>
           <div className='scrollable' />
-        </Column>
+        </Column>,
       );
       wrapper.find(ColumnHeader).find('button').simulate('click');
       expect(global.requestAnimationFrame.mock.calls.length).toEqual(1);
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 8ac9c8db7..42ded9d21 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -492,8 +492,8 @@ class Video extends React.PureComponent {
 
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className='video-player__volume' onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
                 &nbsp;
@@ -517,11 +517,11 @@ class Video extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
-              {(!onCloseVideo && !editable && !fullscreen) && <button type='button' aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
-              {(!fullscreen && onOpenVideo) && <button type='button' aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
-              {onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
-              <button type='button' aria-label={intl.formatMessage(messages.download)}><a className='video-player__download__icon' href={this.props.src} download><Icon id={'download'} fixedWidth /></a></button>
-              <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
+              {(!onCloseVideo && !editable && !fullscreen) && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
+              {(!fullscreen && onOpenVideo) && <button type='button' title={intl.formatMessage(messages.expand)} aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
+              {onCloseVideo && <button type='button' title={intl.formatMessage(messages.close)} aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
+              <button type='button' title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)}><a className='video-player__download__icon' href={this.props.src} download><Icon id={'download'} fixedWidth /></a></button>
+              <button type='button' title={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
             </div>
           </div>
         </div>
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 8006a1306..38653e0fe 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -123,7 +123,7 @@
   "directory.federated": "Dende'l fediversu",
   "directory.local": "Dende {domain} namái",
   "directory.new_arrivals": "Cuentes nueves",
-  "directory.recently_active": "Recently active",
+  "directory.recently_active": "Actividá recién",
   "embed.instructions": "Empotra esti estáu nun sitiu web copiando'l códigu d'embaxo.",
   "embed.preview": "Asina ye cómo va vese:",
   "emoji_button.activity": "Actividaes",
@@ -154,7 +154,7 @@
   "empty_column.home": "¡Tienes la llinia temporal balera! Visita {public} o usa la gueta pa entamar y conocer a otros usuarios.",
   "empty_column.home.public_timeline": "la llinia temporal pública",
   "empty_column.list": "Entá nun hai nada nesta llista. Cuando los miembros d'esta llista espublicen estaos nuevos, van apaecer equí.",
-  "empty_column.lists": "Entá nun tienes nunenguna llista. Cuando crees una, va amosase equí.",
+  "empty_column.lists": "Entá nun tienes nenguna llista. Cuando crees una, va amosase equí.",
   "empty_column.mutes": "Entá nun silenciesti a nunengún usuariu.",
   "empty_column.notifications": "Entá nun tienes nunengún avisu. Interactúa con otros p'aniciar la conversación.",
   "empty_column.public": "¡Equí nun hai nada! Escribi daqué público o sigui a usuarios d'otros sirvidores pa rellenar esto",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 5429f358f..c1a7bb533 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Зареждане...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 96092457f..19a091fa0 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -1,64 +1,64 @@
 {
-  "account.add_or_remove_from_list": "Ouzhpenn pe lemel ag ar listennadoù",
+  "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
-  "account.block": "Stankañ @{name}",
-  "account.block_domain": "Kuzh kement tra a {domain}",
+  "account.block": "Berzañ @{name}",
+  "account.block_domain": "Berzañ pep tra eus {domain}",
   "account.blocked": "Stanket",
-  "account.cancel_follow_request": "Nullañ ar pedad heuliañ",
-  "account.direct": "Kas ur c'hemennad da @{name}",
-  "account.domain_blocked": "Domani kuzhet",
+  "account.cancel_follow_request": "Nullañ ar bedadenn heuliañ",
+  "account.direct": "Kas ur gemennadenn da @{name}",
+  "account.domain_blocked": "Domani berzet",
   "account.edit_profile": "Aozañ ar profil",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.follow": "Heuliañ",
-  "account.followers": "Heilour·ezed·ion",
-  "account.followers.empty": "Den na heul an implijour-mañ c'hoazh.",
+  "account.followers": "Heulier·ezed·ien",
+  "account.followers.empty": "Den na heul an implijer-mañ c'hoazh.",
   "account.follows": "Koumanantoù",
-  "account.follows.empty": "An implijer-mañ na heul ket den ebet.",
+  "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
   "account.follows_you": "Ho heul",
-  "account.hide_reblogs": "Kuzh toudoù skignet gant @{name}",
+  "account.hide_reblogs": "Kuzh toudoù rannet gant @{name}",
   "account.last_status": "Oberiantiz zivezhañ",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.link_verified_on": "Gwiriet eo bet perc'hennidigezh al liamm d'an deiziad-mañ : {date}",
+  "account.locked_info": "Prennet eo ar gon-mañ. Dibab a ra ar perc'henn ar re a c'hall heuliañ anezhi pe anezhañ.",
   "account.media": "Media",
   "account.mention": "Menegiñ @{name}",
-  "account.moved_to": "Dilojet en·he deus {name} da:",
+  "account.moved_to": "Dilojet en·he deus {name} da :",
   "account.mute": "Kuzhat @{name}",
-  "account.mute_notifications": "Kuzh kemennoù a @{name}",
+  "account.mute_notifications": "Kuzh kemennoù eus @{name}",
   "account.muted": "Kuzhet",
   "account.never_active": "Birviken",
-  "account.posts": "Toudoù",
+  "account.posts": "a doudoù",
   "account.posts_with_replies": "Toudoù ha respontoù",
   "account.report": "Disklêriañ @{name}",
-  "account.requested": "É c'hortoz bout aprouet. Clikit da nullañ ar pedad heuliañ",
+  "account.requested": "O c'hortoz an asant. Klikit evit nullañ ar goulenn heuliañ",
   "account.share": "Skignañ profil @{name}",
-  "account.show_reblogs": "Diskouez toudoù a @{name}",
-  "account.unblock": "Distankañ @{name}",
-  "account.unblock_domain": "Diguzh {domain}",
+  "account.show_reblogs": "Diskouez skignadennoù @{name}",
+  "account.unblock": "Diverzañ @{name}",
+  "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unendorse": "Paouez da lakaat war-wel war ar profil",
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
   "account.unmute_notifications": "Diguzhat kemennoù a @{name}",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
-  "alert.unexpected.title": "C'hem !",
+  "alert.unexpected.title": "Hopala!",
   "announcement.announcement": "Kemenn",
   "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Klask endro",
+  "bundle_column_error.body": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
+  "bundle_column_error.retry": "Klask en-dro",
   "bundle_column_error.title": "Fazi rouedad",
   "bundle_modal_error.close": "Serriñ",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Klask endro",
-  "column.blocks": "Implijour·ezed·ion stanket",
+  "bundle_modal_error.message": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
+  "bundle_modal_error.retry": "Klask en-dro",
+  "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
   "column.direct": "Kemennadoù prevez",
   "column.directory": "Mont a-dreuz ar profiloù",
-  "column.domain_blocks": "Domani kuzhet",
-  "column.favourites": "Ar re vuiañ-karet",
+  "column.domain_blocks": "Domani berzet",
+  "column.favourites": "Muiañ-karet",
   "column.follow_requests": "Pedadoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
@@ -68,150 +68,150 @@
   "column.public": "Red-amzer kevreet",
   "column_back_button.label": "Distro",
   "column_header.hide_settings": "Kuzhat an arventennoù",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
+  "column_header.moveRight_settings": "Dilec'hiañ ar bannad a-zehou",
   "column_header.pin": "Spilhennañ",
   "column_header.show_settings": "Diskouez an arventennoù",
   "column_header.unpin": "Dispilhennañ",
   "column_subheading.settings": "Arventennoù",
   "community.column_settings.media_only": "Nemet Mediaoù",
-  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ion·ezed meneget.",
-  "compose_form.direct_message_warning_learn_more": "Gouiet hiroc'h",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ezed·ien meneget.",
+  "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
+  "compose_form.hashtag_warning": "Ne vo ket lakaet an toud-mañ er rolloù gerioù-klik dre mard eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
+  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal heuliañ ac'hanoc'h evit gwelout ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra eh oc'h é soñjal a-barzh ?",
   "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
-  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.duration": "Pad ar sontadeg",
   "compose_form.poll.option_placeholder": "Dibab {number}",
   "compose_form.poll.remove_option": "Lemel an dibab-mañ",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
+  "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
   "compose_form.publish": "Toudañ",
   "compose_form.publish_loud": "{publish} !",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
+  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
+  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
+  "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Skrivit ho kemenn amañ",
   "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
+  "confirmations.block.confirm": "Stankañ",
+  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
-  "confirmations.domain_block.confirm": "Kuzhat an domani a-bezh",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
+  "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.logout.confirm": "Digevreañ",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "Kuzhat a raio an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met aotren a raio anezhañ·i da welet ho todoù ha a heuliañ ac'hanoc'h.",
   "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.redraft.message": "Ha sur oc'h e fell deoc'h dilemel ar statud-mañ hag adlakaat anezhañ er bouilhoñs? Kollet e vo ar merkoù muiañ-karet hag ar skignadennoù hag emzivat e vo ar respontoù d'an toud orin.",
   "confirmations.reply.confirm": "Respont",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
+  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name}?",
+  "conversation.delete": "Dilemel ar gaozeadenn",
+  "conversation.mark_as_read": "Merkañ evel lennet",
+  "conversation.open": "Gwelout ar gaozeadenn",
+  "conversation.with": "Gant {names}",
+  "directory.federated": "Eus ar c'hevrebed anavezet",
+  "directory.local": "Eus {domain} hepken",
+  "directory.new_arrivals": "Degouezhet a-nevez",
+  "directory.recently_active": "Oberiant nevez zo",
+  "embed.instructions": "Enkorfit ar statud war ho lec'hienn en ur eilañ ar c'hod dindan.",
+  "embed.preview": "Setu penaos e vo diskouezet:",
+  "emoji_button.activity": "Obererezh",
+  "emoji_button.custom": "Kempennet",
+  "emoji_button.flags": "Bannieloù",
+  "emoji_button.food": "Boued hag Evaj",
+  "emoji_button.label": "Enlakaat un emoji",
+  "emoji_button.nature": "Natur",
+  "emoji_button.not_found": "Emoji ebet !! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.objects": "Traoù",
+  "emoji_button.people": "Tud",
+  "emoji_button.recent": "Implijet alies",
+  "emoji_button.search": "O klask...",
+  "emoji_button.search_results": "Disoc'hoù an enklask",
+  "emoji_button.symbols": "Arouezioù",
+  "emoji_button.travel": "Lec'hioù ha Beajoù",
+  "empty_column.account_timeline": "Toud ebet amañ!",
+  "empty_column.account_unavailable": "Profil dihegerz",
+  "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
+  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
+  "empty_column.direct": "N'ho peus kemennad prevez ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
+  "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
+  "empty_column.favourites": "Den ebet n'eus lakaet an toud-mañ en e reoù muiañ-karet. Pa vo graet gant unan bennak e vo diskouezet amañ.",
+  "empty_column.follow_requests": "N'ho peus goulenn heuliañ ebet c'hoazh. Pa resevot reoù e vo diskouezet amañ.",
+  "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.",
+  "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.",
+  "empty_column.home.public_timeline": "ar red-amzer publik",
+  "empty_column.list": "Goullo eo ar roll-mañ evit ar poent. Pa vo toudet gant e izili e vo diskouezet amañ.",
+  "empty_column.lists": "N'ho peus roll ebet c'hoazh. Pa vo krouet unan ganeoc'h e vo diskouezet amañ.",
+  "empty_column.mutes": "N'ho peus kuzhet implijer ebet c'hoazh.",
+  "empty_column.notifications": "N'ho peus kemenn ebet c'hoazh. Grit gant implijer·ezed·ien all evit loc'hañ ar gomz.",
+  "empty_column.public": "N'eus netra amañ! Skrivit un dra bennak foran pe heuilhit implijer·ien·ezed eus dafariadoù all evit leuniañ",
+  "error.unexpected_crash.explanation": "Abalamour d'ur beug en hor c'hod pe d'ur gudenn geverlec'hded n'hallomp ket skrammañ ar bajenn-mañ en un doare dereat.",
+  "error.unexpected_crash.next_steps": "Klaskit azbevaat ar bajenn. Ma n'a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheñvel pe dre an arload genidik.",
+  "errors.unexpected_crash.copy_stacktrace": "Eilañ ar roudoù diveugañ er golver",
+  "errors.unexpected_crash.report_issue": "Danevellañ ur fazi",
+  "follow_request.authorize": "Aotren",
+  "follow_request.reject": "Nac'hañ",
+  "getting_started.developers": "Diorroerien",
+  "getting_started.directory": "Roll ar profiloù",
+  "getting_started.documentation": "Teuliadur",
+  "getting_started.heading": "Loc'hañ",
+  "getting_started.invite": "Pediñ tud",
   "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
+  "getting_started.security": "Arventennoù ar gont",
+  "getting_started.terms": "Divizoù gwerzhañ hollek",
+  "hashtag.column_header.tag_mode.all": "ha {additional}",
+  "hashtag.column_header.tag_mode.any": "pe {additional}",
+  "hashtag.column_header.tag_mode.none": "hep {additional}",
+  "hashtag.column_settings.select.no_options_message": "N'eus bet kavet ali ebet",
+  "hashtag.column_settings.select.placeholder": "Ouzhpennañ gerioù-klik…",
+  "hashtag.column_settings.tag_mode.all": "An holl elfennoù-mañ",
+  "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
+  "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
+  "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
+  "home.column_settings.basic": "Diazez",
+  "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
+  "home.column_settings.show_replies": "Diskouez ar respontoù",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
+  "intervals.full.days": "{number, plural, one {# devezh} other{# a zevezhioù}}",
+  "intervals.full.hours": "{number, plural, one {# eurvezh} other{# eurvezh}}",
+  "intervals.full.minutes": "{number, plural, one {# munut} other{# a vunutoù}}",
+  "introduction.federation.action": "Da-heul",
+  "introduction.federation.federated.headline": "Kevreet",
   "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.headline": "Degemer",
   "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
-  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.headline": "Lec'hel",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
   "introduction.interactions.action": "Finish toot-orial!",
-  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.headline": "Muiañ-karet",
   "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
-  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.headline": "Skignañ",
   "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
-  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.headline": "Respont",
   "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
-  "introduction.welcome.action": "Let's go!",
-  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.action": "Bec'h dezhi!",
+  "introduction.welcome.headline": "Pazennoù kentañ",
   "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "da skignañ",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.description": "Deskrivadur",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
@@ -230,7 +230,7 @@
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.reply": "da respont",
   "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.start": "to open \"get started\" column",
@@ -239,48 +239,48 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
+  "lightbox.close": "Serriñ",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
   "lightbox.view_context": "View context",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
+  "lists.account.add": "Ouzhpennañ d'al listenn",
+  "lists.account.remove": "Lemel kuit eus al listenn",
+  "lists.delete": "Dilemel al listenn",
+  "lists.edit": "Aozañ al listenn",
+  "lists.edit.submit": "Cheñch an titl",
+  "lists.new.create": "Ouzhpennañ ul listenn",
+  "lists.new.title_placeholder": "Titl nevez al listenn",
   "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "O kargañ...",
   "media_gallery.toggle_visible": "Toggle visibility",
-  "missing_indicator.label": "Not found",
+  "missing_indicator.label": "Digavet",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.apps": "Arloadoù pellgomz",
+  "navigation_bar.blocks": "Implijer·ezed·ien berzet",
+  "navigation_bar.bookmarks": "Sinedoù",
+  "navigation_bar.community_timeline": "Red-amzer lec'hel",
+  "navigation_bar.compose": "Skrivañ un toud nevez",
+  "navigation_bar.direct": "Kemennadoù prevez",
+  "navigation_bar.discover": "Dizoleiñ",
+  "navigation_bar.domain_blocks": "Domanioù kuzhet",
+  "navigation_bar.edit_profile": "Aozañ ar profil",
+  "navigation_bar.favourites": "Ar re vuiañ-karet",
+  "navigation_bar.filters": "Gerioù kuzhet",
+  "navigation_bar.follow_requests": "Pedadoù heuliañ",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
+  "navigation_bar.info": "Diwar-benn an dafariad-mañ",
+  "navigation_bar.keyboard_shortcuts": "Berradurioù",
+  "navigation_bar.lists": "Listennoù",
+  "navigation_bar.logout": "Digennaskañ",
+  "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
+  "navigation_bar.personal": "Personel",
+  "navigation_bar.pins": "Toudoù spilhennet",
+  "navigation_bar.preferences": "Gwellvezioù",
+  "navigation_bar.public_timeline": "Red-amzer kevreet",
+  "navigation_bar.security": "Diogelroez",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -291,135 +291,135 @@
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.favourite": "Ar re vuiañ-karet:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
+  "notifications.column_settings.filter_bar.show": "Diskouez",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
-  "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.mention": "Menegoù:",
+  "notifications.column_settings.poll": "Disoc'hoù ar sontadeg:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
+  "notifications.column_settings.reblog": "Skignadennoù:",
+  "notifications.column_settings.show": "Diskouez er bann",
+  "notifications.column_settings.sound": "Seniñ",
+  "notifications.filter.all": "Pep tra",
+  "notifications.filter.boosts": "Skignadennoù",
+  "notifications.filter.favourites": "Muiañ-karet",
   "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.group": "{count} notifications",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
+  "notifications.filter.mentions": "Menegoù",
+  "notifications.filter.polls": "Disoc'hoù ar sontadegoù",
+  "notifications.group": "{count} a gemennoù",
+  "poll.closed": "Serret",
+  "poll.refresh": "Azbevaat",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
   "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
-  "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "poll.vote": "Mouezhiañ",
+  "poll.voted": "Mouezhiet ho peus evit ar respont-mañ",
+  "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
+  "poll_button.remove_poll": "Dilemel ar sontadeg",
+  "privacy.change": "Kemmañ gwelidigezh ar statud",
+  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
+  "privacy.direct.short": "War-eeun",
+  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
+  "privacy.private.short": "Ar re a heuilh ac'hanon hepken",
+  "privacy.public.long": "Embann war ar redoù-amzer foran",
+  "privacy.public.short": "Publik",
+  "privacy.unlisted.long": "Na embann war ar redoù-amzer foran",
+  "privacy.unlisted.short": "Anlistennet",
+  "refresh": "Freskaat",
+  "regeneration_indicator.label": "O kargañ…",
+  "regeneration_indicator.sublabel": "War brientiñ emañ ho red degemer!",
   "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.hours": "{number}e",
+  "relative_time.just_now": "bremañ",
   "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
-  "report.forward": "Forward to {target}",
+  "relative_time.seconds": "{number}eil",
+  "relative_time.today": "hiziv",
+  "reply_indicator.cancel": "Nullañ",
+  "report.forward": "Treuzkas da: {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
   "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Report {target}",
-  "search.placeholder": "Search",
+  "search.placeholder": "Klask",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.hashtag": "ger-klik",
+  "search_popout.tips.status": "statud",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_popout.tips.user": "implijer·ez",
+  "search_results.accounts": "Tud",
+  "search_results.hashtags": "Gerioù-klik",
+  "search_results.statuses": "a doudoù",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to status",
-  "status.delete": "Delete",
+  "status.delete": "Dilemel",
   "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
+  "status.direct": "Kas ur c'hemennad da @{name}",
+  "status.embed": "Enframmañ",
+  "status.favourite": "Muiañ-karet",
   "status.filtered": "Filtered",
-  "status.load_more": "Load more",
-  "status.media_hidden": "Media hidden",
-  "status.mention": "Mention @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
+  "status.load_more": "Kargañ muioc'h",
+  "status.media_hidden": "Media kuzhet",
+  "status.mention": "Menegiñ @{name}",
+  "status.more": "Muioc'h",
+  "status.mute": "Kuzhat @{name}",
+  "status.mute_conversation": "Kuzhat ar gaozeadenn",
   "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
+  "status.pin": "Spilhennañ d'ar profil",
+  "status.pinned": "Toud spilhennet",
+  "status.read_more": "Lenn muioc'h",
+  "status.reblog": "Skignañ",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
+  "status.reply": "Respont",
   "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
+  "status.report": "Disklêriañ @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
+  "status.share": "Rannañ",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
+  "status.unmute_conversation": "Diguzhat ar gaozeadenn",
+  "status.unpin": "Dispilhennañ eus ar profil",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
+  "tabs_bar.home": "Degemer",
+  "tabs_bar.local_timeline": "Lec'hel",
+  "tabs_bar.notifications": "Kemennoù",
+  "tabs_bar.search": "Klask",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
-  "trends.trending_now": "Trending now",
+  "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media ({formats})",
+  "upload_button.label": "Ouzhpennañ ur media ({formats})",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.undo": "Delete",
+  "upload_form.edit": "Aozañ",
+  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
@@ -428,9 +428,9 @@
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
   "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading…",
+  "upload_progress.label": "O pellgargañ...",
   "video.close": "Close video",
-  "video.download": "Download file",
+  "video.download": "Pellgargañ ar restr",
   "video.exit_fullscreen": "Exit full screen",
   "video.expand": "Expand video",
   "video.fullscreen": "Full screen",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 7b427c3f0..9df1e0c65 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Skrýt oznámení",
+  "home.show_announcements": "Zobrazit oznámení",
   "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodin} other {# hodin}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "teď",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
-  "relative_time.today": "today",
+  "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušit",
   "report.forward": "Přeposlat na {target}",
   "report.forward_hint": "Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii?",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cd4ba01a5..cf28408c4 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -3,7 +3,7 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "@{name} blockieren",
-  "account.block_domain": "Alles von {domain} verstecken",
+  "account.block_domain": "Alles von {domain} blockieren",
   "account.blocked": "Blockiert",
   "account.cancel_follow_request": "Folgeanfrage abbrechen",
   "account.direct": "Direktnachricht an @{name}",
@@ -34,7 +34,7 @@
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Von @{name} geteilte Beiträge anzeigen",
   "account.unblock": "@{name} entblocken",
-  "account.unblock_domain": "{domain} wieder anzeigen",
+  "account.unblock_domain": "Blockieren von {domain} beenden",
   "account.unendorse": "Nicht auf Profil hervorheben",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
@@ -86,7 +86,7 @@
   "compose_form.poll.option_placeholder": "Wahl {number}",
   "compose_form.poll.remove_option": "Wahl entfernen",
   "compose_form.poll.switch_to_multiple": "Umfrage ändern, um mehrere Optionen zu erlauben",
-  "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu ermöglichen",
+  "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu erlauben",
   "compose_form.publish": "Tröt",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Medien als heikel markieren",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Keine Beiträge!",
   "empty_column.account_unavailable": "Konto nicht verfügbar",
   "empty_column.blocks": "Du hast keine Profile blockiert.",
-  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Toots gespeichert. Wenn du einen Beitrag als Toot speicherst, wird er hier erscheinen.",
+  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
   "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
   "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
   "empty_column.domain_blocks": "Es ist noch keine versteckten Domains.",
@@ -158,7 +158,7 @@
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
   "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufüllen",
-  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browsereinkompatibilität konnte diese Seite nicht korrekt angezeigt werden.",
+  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browser-Inkompatibilität konnte diese Seite nicht korrekt angezeigt werden.",
   "error.unexpected_crash.next_steps": "Versuche die Seite zu aktualisieren. Wenn das nicht hilft, kannst du Mastodon über einen anderen Browser oder eine native App verwenden.",
   "errors.unexpected_crash.copy_stacktrace": "Fehlerlog in die Zwischenablage kopieren",
   "errors.unexpected_crash.report_issue": "Problem melden",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
   "notifications.column_settings.filter_bar.show": "Anzeigen",
   "notifications.column_settings.follow": "Neue Folgende:",
-  "notifications.column_settings.follow_request": "Neue Folge-Anfragen:",
+  "notifications.column_settings.follow_request": "Neue Folgeanfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
   "notifications.column_settings.poll": "Ergebnisse von Umfragen:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
@@ -321,7 +321,7 @@
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Wird an erwähnte Profile gesendet",
   "privacy.direct.short": "Direktnachricht",
-  "privacy.private.long": "Wird nur für deine Folgende sichtbar sein",
+  "privacy.private.long": "Beitrag nur an Folgende",
   "privacy.private.short": "Nur für Folgende",
   "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
   "privacy.public.short": "Öffentlich",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 0eb054acd..284232c20 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -142,7 +142,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       }
     ],
@@ -217,7 +217,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Toggle visibility",
+        "defaultMessage": "Hide media",
         "id": "media_gallery.toggle_visible"
       },
       {
@@ -451,11 +451,11 @@
         "id": "status.copy"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -523,7 +523,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Hide entire domain",
+        "defaultMessage": "Block entire domain",
         "id": "confirmations.domain_block.confirm"
       },
       {
@@ -697,11 +697,11 @@
         "id": "account.media"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -737,7 +737,7 @@
         "id": "navigation_bar.blocks"
       },
       {
-        "defaultMessage": "Hidden domains",
+        "defaultMessage": "Blocked domains",
         "id": "navigation_bar.domain_blocks"
       },
       {
@@ -773,7 +773,7 @@
         "id": "account.muted"
       },
       {
-        "defaultMessage": "Domain hidden",
+        "defaultMessage": "Domain blocked",
         "id": "account.domain_blocked"
       },
       {
@@ -917,6 +917,10 @@
       {
         "defaultMessage": "Logout",
         "id": "navigation_bar.logout"
+      },
+      {
+        "defaultMessage": "Bookmarks",
+        "id": "navigation_bar.bookmarks"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/action_bar.json"
@@ -1073,7 +1077,7 @@
         "id": "privacy.public.short"
       },
       {
-        "defaultMessage": "Post to public timelines",
+        "defaultMessage": "Visible for all, shown in public timelines",
         "id": "privacy.public.long"
       },
       {
@@ -1081,7 +1085,7 @@
         "id": "privacy.unlisted.short"
       },
       {
-        "defaultMessage": "Do not show in public timelines",
+        "defaultMessage": "Visible for all, but not in public timelines",
         "id": "privacy.unlisted.long"
       },
       {
@@ -1089,7 +1093,7 @@
         "id": "privacy.private.short"
       },
       {
-        "defaultMessage": "Post to followers only",
+        "defaultMessage": "Visible for followers only",
         "id": "privacy.private.long"
       },
       {
@@ -1097,7 +1101,7 @@
         "id": "privacy.direct.short"
       },
       {
-        "defaultMessage": "Post to mentioned users only",
+        "defaultMessage": "Visible for mentioned users only",
         "id": "privacy.direct.long"
       },
       {
@@ -1466,15 +1470,15 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Hidden domains",
+        "defaultMessage": "Blocked domains",
         "id": "column.domain_blocks"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
-        "defaultMessage": "There are no hidden domains yet.",
+        "defaultMessage": "There are no blocked domains yet.",
         "id": "empty_column.domain_blocks"
       }
     ],
@@ -1528,6 +1532,10 @@
       {
         "defaultMessage": "You don't have any follow requests yet. When you receive one, it will show up here.",
         "id": "empty_column.follow_requests"
+      },
+      {
+        "defaultMessage": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+        "id": "follow_requests.unlocked_explanation"
       }
     ],
     "path": "app/javascript/mastodon/features/follow_requests/index.json"
@@ -2384,11 +2392,11 @@
         "id": "status.copy"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -2944,4 +2952,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
\ No newline at end of file
+]
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 5b0067acb..d92a0e35a 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -150,7 +150,7 @@
   "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.favourites": "Κανείς δεν έχει αγαπήσει αυτό το τουτ ακόμα. Μόλις το κάνει κάποια, θα εμφανιστούν εδώ.",
   "empty_column.follow_requests": "Δεν έχεις κανένα αίτημα παρακολούθησης ακόμα. Μόλις λάβεις κάποιο, θα εμφανιστεί εδώ.",
-  "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ταμπέλα.",
+  "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.",
   "empty_column.home": "Η τοπική σου ροή είναι κενή! Πήγαινε στο {public} ή κάνε αναζήτηση για να ξεκινήσεις και να γνωρίσεις άλλους χρήστες.",
   "empty_column.home.public_timeline": "η δημόσια ροή",
   "empty_column.list": "Δεν υπάρχει τίποτα σε αυτή τη λίστα ακόμα. Όταν τα μέλη της δημοσιεύσουν νέες καταστάσεις, θα εμφανιστούν εδώ.",
@@ -176,7 +176,7 @@
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
   "hashtag.column_settings.select.no_options_message": "Δεν βρέθηκαν προτάσεις",
-  "hashtag.column_settings.select.placeholder": "Γράψε μερικές ταμπέλες…",
+  "hashtag.column_settings.select.placeholder": "Γράψε μερικές ετικέτες…",
   "hashtag.column_settings.tag_mode.all": "Όλα αυτά",
   "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
   "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
@@ -345,13 +345,13 @@
   "report.target": "Καταγγελία {target}",
   "search.placeholder": "Αναζήτηση",
   "search_popout.search_format": "Προχωρημένη αναζήτηση",
-  "search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, σημειώσει ως αγαπημένες, προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ταμπέλες ταιριάζουν.",
-  "search_popout.tips.hashtag": "ταμπέλα",
+  "search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, έχεις σημειώσει ως αγαπημένες, έχεις προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ετικέτες ταιριάζουν.",
+  "search_popout.tips.hashtag": "ετικέτα",
   "search_popout.tips.status": "κατάσταση",
-  "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ταμπέλες που ταιριάζουν",
+  "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ετικέτες που ταιριάζουν",
   "search_popout.tips.user": "χρήστης",
   "search_results.accounts": "Άνθρωποι",
-  "search_results.hashtags": "Ταμπέλες",
+  "search_results.hashtags": "Ετικέτες",
   "search_results.statuses": "Τουτ",
   "search_results.statuses_fts_disabled": "Η αναζήτηση τουτ βάσει του περιεχόμενού τους δεν είναι ενεργοποιημένη σε αυτό τον κόμβο.",
   "search_results.total": "{count, number} {count, plural, zero {αποτελέσματα} one {αποτέλεσμα} other {αποτελέσματα}}",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5927aeb6c..616780785 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
   "account.block": "Block @{name}",
-  "account.block_domain": "Hide everything from {domain}",
+  "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
-  "account.domain_blocked": "Domain hidden",
+  "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
@@ -34,7 +34,7 @@
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_domain": "Unblock domain {domain}",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
@@ -57,7 +57,7 @@
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
+  "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
   "column.follow_requests": "Follow requests",
   "column.home": "Home",
@@ -103,7 +103,7 @@
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "Block entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
@@ -146,7 +146,7 @@
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
@@ -164,6 +164,7 @@
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "getting_started.developers": "Developers",
   "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
@@ -254,7 +255,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
@@ -265,7 +266,7 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -319,13 +320,13 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.long": "Visible for mentioned users only",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
+  "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all, shown in public timelines",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not post to public timelines",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a315c9226..5138b85a0 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -374,7 +374,7 @@
   "status.more": "Pli",
   "status.mute": "Silentigi @{name}",
   "status.mute_conversation": "Silentigi konversacion",
-  "status.open": "Grandigi",
+  "status.open": "Grandigi ĉi tiun mesaĝon",
   "status.pin": "Alpingli profile",
   "status.pinned": "Alpinglita mesaĝo",
   "status.read_more": "Legi pli",
@@ -392,7 +392,7 @@
   "status.show_less": "Malgrandigi",
   "status.show_less_all": "Malgrandigi ĉiujn",
   "status.show_more": "Grandigi",
-  "status.show_more_all": "Grandigi ĉiujn",
+  "status.show_more_all": "Malfoldi ĉiun",
   "status.show_thread": "Montri la fadenon",
   "status.uncached_media_warning": "Nedisponebla",
   "status.unmute_conversation": "Malsilentigi la konversacion",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 8e1f84ab8..4f7a9e59f 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -375,7 +375,7 @@
   "status.mute": "Silenciar a @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir este estado",
-  "status.pin": "Pin en el perfil",
+  "status.pin": "Fijar en el perfil",
   "status.pinned": "Toot fijado",
   "status.read_more": "Leer más",
   "status.reblog": "Retootear",
@@ -396,7 +396,7 @@
   "status.show_thread": "Mostrar hilo",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
-  "status.unpin": "Desmarcar del perfil",
+  "status.unpin": "Dejar de fijar",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te interese…",
   "tabs_bar.federated_timeline": "Federado",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 5dc4e60c2..3a44dceb5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -27,8 +27,8 @@
   "account.mute_notifications": "Mututu @{name}(r)en jakinarazpenak",
   "account.muted": "Mutututa",
   "account.never_active": "Inoiz ez",
-  "account.posts": "Tootak",
-  "account.posts_with_replies": "Toot-ak eta erantzunak",
+  "account.posts": "Toot",
+  "account.posts_with_replies": "Tootak eta erantzunak",
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
   "account.share": "@{name}(e)ren profila elkarbanatu",
@@ -64,7 +64,7 @@
   "column.lists": "Zerrendak",
   "column.mutes": "Mutututako erabiltzaileak",
   "column.notifications": "Jakinarazpenak",
-  "column.pins": "Finkatutako toot-ak",
+  "column.pins": "Finkatutako tootak",
   "column.public": "Federatutako denbora-lerroa",
   "column_back_button.label": "Atzera",
   "column_header.hide_settings": "Ezkutatu ezarpenak",
@@ -140,7 +140,7 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
-  "empty_column.account_timeline": "Ez dago toot-ik hemen!",
+  "empty_column.account_timeline": "Ez dago tootik hemen!",
   "empty_column.account_unavailable": "Profila ez dago eskuragarri",
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
   "empty_column.bookmarked_statuses": "Oraindik ez dituzu toot laster-markatutarik. Bat laster-markatzerakoan, hemen agertuko da.",
@@ -228,7 +228,7 @@
   "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
   "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
   "keyboard_shortcuts.open_media": "media zabaltzeko",
-  "keyboard_shortcuts.pinned": "finkatutako toot-en zerrenda irekitzeko",
+  "keyboard_shortcuts.pinned": "finkatutako tooten zerrenda irekitzeko",
   "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "erantzutea",
   "keyboard_shortcuts.requests": "jarraitzeko eskarien zerrenda irekitzeko",
@@ -277,7 +277,7 @@
   "navigation_bar.logout": "Amaitu saioa",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.personal": "Pertsonala",
-  "navigation_bar.pins": "Finkatutako toot-ak",
+  "navigation_bar.pins": "Finkatutako tootak",
   "navigation_bar.preferences": "Hobespenak",
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.security": "Segurtasuna",
@@ -352,8 +352,8 @@
   "search_popout.tips.user": "erabiltzailea",
   "search_results.accounts": "Jendea",
   "search_results.hashtags": "Traolak",
-  "search_results.statuses": "Toot-ak",
-  "search_results.statuses_fts_disabled": "Mastodon zerbitzari honek ez du Toot-en edukiaren bilaketa gaitu.",
+  "search_results.statuses": "Tootak",
+  "search_results.statuses_fts_disabled": "Mastodon zerbitzari honek ez du tooten edukiaren bilaketa gaitu.",
   "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitza}}",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_status": "Ireki mezu hau moderazio interfazean",
@@ -376,7 +376,7 @@
   "status.mute_conversation": "Mututu elkarrizketa",
   "status.open": "Hedatu mezu hau",
   "status.pin": "Finkatu profilean",
-  "status.pinned": "Finkatutako toot-a",
+  "status.pinned": "Finkatutako toota",
   "status.read_more": "Irakurri gehiago",
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 0fc39b16d..f2e7f300a 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -254,7 +254,7 @@
   "lists.subheading": "فهرست‌های شما",
   "load_pending": "{count, plural, one {# مورد تازه} other {# مورد تازه}}",
   "loading_indicator.label": "بارگیری...",
-  "media_gallery.toggle_visible": "تغییر پیدایی",
+  "media_gallery.toggle_visible": "تغییر وضعیت نمایانی",
   "missing_indicator.label": "پیدا نشد",
   "missing_indicator.sublabel": "این منبع پیدا نشد",
   "mute_modal.hide_notifications": "اعلان‌های این کاربر پنهان شود؟",
@@ -319,13 +319,13 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "حذف نظرسنجی",
   "privacy.change": "تنظیم محرمانگی نوشته",
-  "privacy.direct.long": "تنها به کاربران نام‌برده‌شده نشان بده",
+  "privacy.direct.long": "ارسال فقط به کاربران اشاره‌شده",
   "privacy.direct.short": "خصوصی",
-  "privacy.private.long": "تنها به پیگیران نشان بده",
+  "privacy.private.long": "ارسال فقط به پی‌گیران",
   "privacy.private.short": "خصوصی",
-  "privacy.public.long": "نمایش در فهرست عمومی",
+  "privacy.public.long": "ارسال به خط‌زمانی عمومی",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
+  "privacy.unlisted.long": "ارسال نکردن به خط‌زمانی عمومی",
   "privacy.unlisted.short": "فهرست‌نشده",
   "refresh": "به‌روزرسانی",
   "regeneration_indicator.label": "در حال باز شدن…",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b46083477..32bc8de49 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
-  "account.badges.group": "Group",
+  "account.badges.group": "Ryhmä",
   "account.block": "Estä @{name}",
   "account.block_domain": "Piilota kaikki sisältö verkkotunnuksesta {domain}",
   "account.blocked": "Estetty",
@@ -34,7 +34,7 @@
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä buustaukset käyttäjältä @{name}",
   "account.unblock": "Salli @{name}",
-  "account.unblock_domain": "Näytä {domain}",
+  "account.unblock_domain": "Salli {domain}",
   "account.unendorse": "Poista suosittelu profiilistasi",
   "account.unfollow": "Lakkaa seuraamasta",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "Määrää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Ilmoitus",
   "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.body": "Jokin meni vikaan komponenttia ladattaessa.",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Äänestyksen kesto",
   "compose_form.poll.option_placeholder": "Valinta numero",
   "compose_form.poll.remove_option": "Poista tämä valinta",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
+  "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
   "compose_form.publish": "Tuuttaa",
   "compose_form.publish_loud": "Julkista!",
   "compose_form.sensitive.hide": "Valitse tämä arkaluontoisena",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Ei ole 'toots' täällä!",
   "empty_column.account_unavailable": "Profiilia ei löydy",
   "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Et ole vielä lisännyt tuuttauksia kirjanmerkkeihisi. Kun teet niin, tuuttaus näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Homma lähtee käyntiin, kun kirjoitat jotain julkista!",
   "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
   "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä piilotettu.",
@@ -160,7 +160,7 @@
   "empty_column.public": "Täällä ei ole mitään! Saat sisältöä, kun kirjoitat jotain julkisesti tai käyt seuraamassa muiden instanssien käyttäjiä",
   "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
   "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos tämä ei auta, saatat yhä pystyä käyttämään Mastodonia toisen selaimen tai sovelluksen kautta.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.copy_stacktrace": "Kopioi stacktrace leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Piilota ilmoitukset",
+  "home.show_announcements": "Näytä ilmoitukset",
   "intervals.full.days": "Päivä päiviä",
   "intervals.full.hours": "Tunti tunteja",
   "intervals.full.minutes": "Minuuti minuuteja",
@@ -215,7 +215,7 @@
   "keyboard_shortcuts.direct": "avaa pikaviestisarake",
   "keyboard_shortcuts.down": "siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "avaa tilapäivitys",
-  "keyboard_shortcuts.favourite": "tykkää",
+  "keyboard_shortcuts.favourite": "lisää suosikkeihin",
   "keyboard_shortcuts.favourites": "avaa lista suosikeista",
   "keyboard_shortcuts.federated": "avaa yleinen aikajana",
   "keyboard_shortcuts.heading": "Näppäinkomennot",
@@ -227,7 +227,7 @@
   "keyboard_shortcuts.muted": "avaa lista mykistetyistä käyttäjistä",
   "keyboard_shortcuts.my_profile": "avaa profiilisi",
   "keyboard_shortcuts.notifications": "avaa ilmoitukset-sarake",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "median avaus",
   "keyboard_shortcuts.pinned": "avaa lista kiinnitetyistä tuuttauksista",
   "keyboard_shortcuts.profile": "avaa kirjoittajan profiili",
   "keyboard_shortcuts.reply": "vastaa",
@@ -260,7 +260,7 @@
   "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
   "navigation_bar.apps": "Mobiilisovellukset",
   "navigation_bar.blocks": "Estetyt käyttäjät",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Kirjoita uusi tuuttaus",
   "navigation_bar.direct": "Viestit",
@@ -283,9 +283,9 @@
   "navigation_bar.security": "Tunnukset",
   "notification.favourite": "{name} tykkäsi tilastasi",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} haluaa seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
-  "notification.own_poll": "Your poll has ended",
+  "notification.own_poll": "Kyselysi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} buustasi tilaasi",
   "notifications.clear": "Tyhjennä ilmoitukset",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
   "notifications.column_settings.filter_bar.show": "Näytä",
   "notifications.column_settings.follow": "Uudet seuraajat:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.poll": "Kyselyn tulokset:",
   "notifications.column_settings.push": "Push-ilmoitukset",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "nyt",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
-  "relative_time.today": "today",
+  "relative_time.today": "tänään",
   "reply_indicator.cancel": "Peruuta",
   "report.forward": "Välitä kohteeseen {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
@@ -358,7 +358,7 @@
   "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}",
   "status.admin_status": "Avaa tilapäivitys moderaattorinäkymässä",
   "status.block": "Estä @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Tallenna kirjanmerkki",
   "status.cancel_reblog_private": "Peru buustaus",
   "status.cannot_reblog": "Tätä julkaisua ei voi buustata",
   "status.copy": "Kopioi linkki tilapäivitykseen",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name} buustasi",
   "status.reblogs.empty": "Kukaan ei ole vielä buustannut tätä tuuttausta. Kun joku tekee niin, näkyy kyseinen henkilö tässä.",
   "status.redraft": "Poista & palauta muokattavaksi",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "Poista kirjanmerkki",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
   "status.report": "Raportoi @{name}",
@@ -416,11 +416,11 @@
   "upload_button.label": "Lisää mediaa",
   "upload_error.limit": "Tiedostolatauksien raja ylitetty.",
   "upload_error.poll": "Tiedon lataaminen ei ole sallittua kyselyissä.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Kuvaile kuulovammaisille",
   "upload_form.description": "Anna kuvaus näkörajoitteisia varten",
   "upload_form.edit": "Muokkaa",
   "upload_form.undo": "Peru",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Kuvaile kuulo- tai näkövammaisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
   "upload_modal.description_placeholder": "Eräänä jäätävänä ja pimeänä yönä gorilla ratkaisi sudokun kahdessa minuutissa",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index f61c15d57..cf07cd3db 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -3,29 +3,29 @@
   "account.badges.bot": "Robot",
   "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
-  "account.block_domain": "Tout masquer venant de {domain}",
+  "account.block_domain": "Bloquer le domaine {domain}",
   "account.blocked": "Bloqué·e",
   "account.cancel_follow_request": "Annuler la demande de suivi",
   "account.direct": "Envoyer un message direct à @{name}",
-  "account.domain_blocked": "Domaine caché",
+  "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
   "account.endorse": "Recommander sur le profil",
   "account.follow": "Suivre",
-  "account.followers": "Abonné⋅e⋅s",
-  "account.followers.empty": "Personne ne suit cet utilisateur·rice pour l’instant.",
+  "account.followers": "Abonné·e·s",
+  "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.follows": "Abonnements",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.last_status": "Dernière activité",
   "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
-  "account.locked_info": "Ce compte est verrouillé. Son propriétaire approuve manuellement qui peut le ou la suivre.",
-  "account.media": "Média",
+  "account.locked_info": "Ce compte est verrouillé. Son ou sa propriétaire approuve manuellement qui peut le suivre.",
+  "account.media": "Médias",
   "account.mention": "Mentionner @{name}",
   "account.moved_to": "{name} a déménagé vers :",
   "account.mute": "Masquer @{name}",
   "account.mute_notifications": "Ignorer les notifications de @{name}",
-  "account.muted": "Silencé·e",
+  "account.muted": "Masqué·e",
   "account.never_active": "Jamais",
   "account.posts": "Pouets",
   "account.posts_with_replies": "Pouets et réponses",
@@ -38,14 +38,14 @@
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer @{name}",
-  "account.unmute_notifications": "Réactiver les notifications de @{name}",
+  "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Débit limité",
+  "alert.rate_limited.title": "Taux limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
   "announcement.announcement": "Annonce",
   "autosuggest_hashtag.per_week": "{count} par semaine",
-  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci, la prochaine fois",
+  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.body": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_column_error.retry": "Réessayer",
   "bundle_column_error.title": "Erreur réseau",
@@ -55,7 +55,7 @@
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
   "column.community": "Fil public local",
-  "column.direct": "Messages privés",
+  "column.direct": "Messages directs",
   "column.directory": "Parcourir les profils",
   "column.domain_blocks": "Domaines cachés",
   "column.favourites": "Favoris",
@@ -67,7 +67,7 @@
   "column.pins": "Pouets épinglés",
   "column.public": "Fil public global",
   "column_back_button.label": "Retour",
-  "column_header.hide_settings": "Masquer les paramètres",
+  "column_header.hide_settings": "Cacher les paramètres",
   "column_header.moveLeft_settings": "Déplacer la colonne vers la gauche",
   "column_header.moveRight_settings": "Déplacer la colonne vers la droite",
   "column_header.pin": "Épingler",
@@ -94,39 +94,39 @@
   "compose_form.sensitive.unmarked": "Le média n’est pas marqué comme sensible",
   "compose_form.spoiler.marked": "Le texte est caché derrière un avertissement",
   "compose_form.spoiler.unmarked": "Le texte n’est pas caché",
-  "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
+  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Confirmez-vous le blocage de {name} ?",
+  "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.delete.confirm": "Supprimer",
-  "confirmations.delete.message": "Confirmez-vous la suppression de ce pouet ?",
+  "confirmations.delete.message": "Voulez-vous vraiment supprimer ce pouet ?",
   "confirmations.delete_list.confirm": "Supprimer",
-  "confirmations.delete_list.message": "Êtes-vous sûr·e de vouloir supprimer définitivement cette liste ?",
+  "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.domain_block.confirm": "Masquer le domaine entier",
-  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
-  "confirmations.logout.confirm": "Déconnexion",
-  "confirmations.logout.message": "Êtes-vous sûr·e de vouloir vous déconnecter ?",
+  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
+  "confirmations.logout.confirm": "Se déconnecter",
+  "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Êtes-vous sûr·e de vouloir masquer {name} ?",
-  "confirmations.redraft.confirm": "Effacer et ré-écrire",
-  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
+  "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
+  "confirmations.redraft.confirm": "Supprimer et ré-écrire",
+  "confirmations.redraft.message": "Voulez-vous vraiment supprimer ce pouet pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
-  "confirmations.reply.message": "Répondre maintenant écrasera le message que vous composez actuellement. Êtes-vous sûr·e de vouloir continuer ?",
+  "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez actuellement. Voulez-vous vraiment continuer ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Êtes-vous sûr·e de vouloir arrêter de suivre {name} ?",
+  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name} ?",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
   "conversation.with": "Avec {names}",
   "directory.federated": "Du fédiverse connu",
   "directory.local": "De {domain} seulement",
-  "directory.new_arrivals": "Nouveaux·elles arrivant·e·s",
-  "directory.recently_active": "Récemment actif·ve·s",
+  "directory.new_arrivals": "Inscrit·e·s récemment",
+  "directory.recently_active": "Actif·ve·s récemment",
   "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
-  "emoji_button.activity": "Activités",
+  "emoji_button.activity": "Activité",
   "emoji_button.custom": "Personnalisés",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Nourriture & Boisson",
@@ -136,7 +136,7 @@
   "emoji_button.objects": "Objets",
   "emoji_button.people": "Personnes",
   "emoji_button.recent": "Fréquemment utilisés",
-  "emoji_button.search": "Recherche…",
+  "emoji_button.search": "Recherche...",
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux & Voyages",
@@ -155,7 +155,7 @@
   "empty_column.home.public_timeline": "le fil public",
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Dès que des personnes de cette liste publieront de nouveaux statuts, ils apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
-  "empty_column.mutes": "Vous n’avez pas encore silencié d’utilisateur·rice·s.",
+  "empty_column.mutes": "Vous n’avez masqué aucun·e utilisateur·rice pour le moment.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -176,12 +176,12 @@
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
   "hashtag.column_settings.select.no_options_message": "Aucune suggestion trouvée",
-  "hashtag.column_settings.select.placeholder": "Ajouter des hashtags…",
+  "hashtag.column_settings.select.placeholder": "Entrer des hashtags…",
   "hashtag.column_settings.tag_mode.all": "Tous ces éléments",
   "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
   "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
-  "hashtag.column_settings.tag_toggle": "Inclure des mots-clés additionnels dans cette colonne",
-  "home.column_settings.basic": "Base",
+  "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -199,46 +199,46 @@
   "introduction.interactions.action": "Finir le tutoriel !",
   "introduction.interactions.favourite.headline": "Favoris",
   "introduction.interactions.favourite.text": "Vous pouvez garder un pouet pour plus tard et faire savoir à son auteur·ice que vous l’avez aimé, en l'ajoutant aux favoris.",
-  "introduction.interactions.reblog.headline": "Repartager",
+  "introduction.interactions.reblog.headline": "Partager",
   "introduction.interactions.reblog.text": "Vous pouvez partager les pouets d'autres personnes avec vos abonné·e·s en les repartageant.",
   "introduction.interactions.reply.headline": "Répondre",
   "introduction.interactions.reply.text": "Vous pouvez répondre aux pouets d'autres personnes et à vos propres pouets, ce qui les enchaînera dans une conversation.",
   "introduction.welcome.action": "Allons-y !",
   "introduction.welcome.headline": "Premiers pas",
   "introduction.welcome.text": "Bienvenue dans le fédiverse ! Dans quelques instants, vous pourrez diffuser des messages et parler à vos ami·e·s sur une grande variété de serveurs. Mais ce serveur, {domain}, est spécial - il héberge votre profil, alors souvenez-vous de son nom.",
-  "keyboard_shortcuts.back": "pour revenir en arrière",
-  "keyboard_shortcuts.blocked": "pour ouvrir la liste des comptes bloqués",
-  "keyboard_shortcuts.boost": "pour partager",
-  "keyboard_shortcuts.column": "pour focaliser un statut dans l’une des colonnes",
-  "keyboard_shortcuts.compose": "pour focaliser la zone de rédaction",
+  "keyboard_shortcuts.back": "revenir en arrière",
+  "keyboard_shortcuts.blocked": "ouvrir la liste des comptes bloqués",
+  "keyboard_shortcuts.boost": "partager",
+  "keyboard_shortcuts.column": "cibler un pouet d’une des colonnes",
+  "keyboard_shortcuts.compose": "cibler la zone de rédaction",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "pour ouvrir la colonne des messages directs",
-  "keyboard_shortcuts.down": "pour descendre dans la liste",
-  "keyboard_shortcuts.enter": "pour ouvrir le statut",
-  "keyboard_shortcuts.favourite": "pour ajouter aux favoris",
-  "keyboard_shortcuts.favourites": "pour ouvrir la liste des pouets favoris",
-  "keyboard_shortcuts.federated": "pour ouvrir le fil public global",
+  "keyboard_shortcuts.direct": "ouvrir la colonne des messages directs",
+  "keyboard_shortcuts.down": "descendre dans la liste",
+  "keyboard_shortcuts.enter": "ouvrir le pouet",
+  "keyboard_shortcuts.favourite": "ajouter aux favoris",
+  "keyboard_shortcuts.favourites": "ouvrir la liste des favoris",
+  "keyboard_shortcuts.federated": "ouvrir le fil public global",
   "keyboard_shortcuts.heading": "Raccourcis clavier",
-  "keyboard_shortcuts.home": "pour ouvrir l’accueil",
-  "keyboard_shortcuts.hotkey": "Raccourci",
-  "keyboard_shortcuts.legend": "pour afficher cette légende",
-  "keyboard_shortcuts.local": "pour ouvrir le fil public local",
-  "keyboard_shortcuts.mention": "pour mentionner l’auteur·rice",
-  "keyboard_shortcuts.muted": "pour ouvrir la liste des utilisateur·rice·s muté·e·s",
-  "keyboard_shortcuts.my_profile": "pour ouvrir votre profil",
-  "keyboard_shortcuts.notifications": "pour ouvrir votre colonne de notifications",
-  "keyboard_shortcuts.open_media": "pour ouvrir le média",
-  "keyboard_shortcuts.pinned": "pour ouvrir une liste des pouets épinglés",
-  "keyboard_shortcuts.profile": "pour ouvrir le profil de l’auteur·rice",
-  "keyboard_shortcuts.reply": "pour répondre",
-  "keyboard_shortcuts.requests": "pour ouvrir la liste de demandes de suivi",
-  "keyboard_shortcuts.search": "pour cibler la recherche",
-  "keyboard_shortcuts.start": "pour ouvrir la colonne « pour commencer »",
-  "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
-  "keyboard_shortcuts.toggle_sensitivity": "pour afficher/cacher les médias",
-  "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
-  "keyboard_shortcuts.unfocus": "pour quitter la zone de composition/recherche",
-  "keyboard_shortcuts.up": "pour remonter dans la liste",
+  "keyboard_shortcuts.home": "le fil d’accueil",
+  "keyboard_shortcuts.hotkey": "Raccourci clavier",
+  "keyboard_shortcuts.legend": "afficher cet aide-mémoire",
+  "keyboard_shortcuts.local": "ouvrir le fil public local",
+  "keyboard_shortcuts.mention": "mentionner l’auteur·rice",
+  "keyboard_shortcuts.muted": "ouvrir la liste des comptes masqués",
+  "keyboard_shortcuts.my_profile": "ouvrir votre profil",
+  "keyboard_shortcuts.notifications": "ouvrir la colonne de notifications",
+  "keyboard_shortcuts.open_media": "ouvrir le média",
+  "keyboard_shortcuts.pinned": "ouvrir la liste des pouets épinglés",
+  "keyboard_shortcuts.profile": "ouvrir le profil de l’auteur·rice",
+  "keyboard_shortcuts.reply": "répondre",
+  "keyboard_shortcuts.requests": "ouvrir la liste de demandes d’abonnement",
+  "keyboard_shortcuts.search": "cibler la zone de recherche",
+  "keyboard_shortcuts.start": "ouvrir la colonne « Pour commencer »",
+  "keyboard_shortcuts.toggle_hidden": "déplier/replier le texte derrière un CW",
+  "keyboard_shortcuts.toggle_sensitivity": "afficher/cacher les médias",
+  "keyboard_shortcuts.toot": "démarrer un tout nouveau pouet",
+  "keyboard_shortcuts.unfocus": "quitter la zone de rédaction/recherche",
+  "keyboard_shortcuts.up": "remonter dans la liste",
   "lightbox.close": "Fermer",
   "lightbox.next": "Suivant",
   "lightbox.previous": "Précédent",
@@ -254,7 +254,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "Modifier la visibilité",
+  "media_gallery.toggle_visible": "Intervertir la visibilité",
   "missing_indicator.label": "Non trouvé",
   "missing_indicator.sublabel": "Ressource introuvable",
   "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
@@ -268,7 +268,7 @@
   "navigation_bar.domain_blocks": "Domaines cachés",
   "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.favourites": "Favoris",
-  "navigation_bar.filters": "Mots silenciés",
+  "navigation_bar.filters": "Mots masqués",
   "navigation_bar.follow_requests": "Demandes de suivi",
   "navigation_bar.follows_and_followers": "Abonnements et abonné⋅e·s",
   "navigation_bar.info": "À propos de ce serveur",
@@ -287,15 +287,15 @@
   "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
-  "notification.reblog": "{name} a partagé votre statut :",
-  "notifications.clear": "Nettoyer les notifications",
-  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
-  "notifications.column_settings.alert": "Notifications locales",
+  "notification.reblog": "{name} a partagé votre statut",
+  "notifications.clear": "Effacer les notifications",
+  "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
+  "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
   "notifications.column_settings.filter_bar.show": "Afficher",
-  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e·s :",
+  "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
   "notifications.column_settings.poll": "Résultats des sondage :",
@@ -306,7 +306,7 @@
   "notifications.filter.all": "Tout",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favoris",
-  "notifications.filter.follows": "Abonné·e·s",
+  "notifications.filter.follows": "Abonnés",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Résultats des sondages",
   "notifications.group": "{count} notifications",
@@ -321,8 +321,8 @@
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "N’envoyer qu’aux personnes mentionnées",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Seul⋅e⋅s vos abonné⋅e⋅s verront vos statuts",
-  "privacy.private.short": "Abonné⋅e⋅s uniquement",
+  "privacy.private.long": "Seul·e·s vos abonné·e·s verront vos statuts",
+  "privacy.private.short": "Abonné·e·s uniquement",
   "privacy.public.long": "Afficher dans les fils publics",
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
@@ -347,22 +347,22 @@
   "search_popout.search_format": "Recherche avancée",
   "search_popout.tips.full_text": "Un texte normal retourne les pouets que vous avez écris, mis en favori, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondant.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "statuts",
+  "search_popout.tips.status": "pouet",
   "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les identifiants et les hashtags correspondants",
-  "search_popout.tips.user": "utilisateur⋅ice",
+  "search_popout.tips.user": "utilisateur·ice",
   "search_results.accounts": "Comptes",
   "search_results.hashtags": "Hashtags",
   "search_results.statuses": "Pouets",
   "search_results.statuses_fts_disabled": "La recherche de pouets par leur contenu n'est pas activée sur ce serveur Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
-  "status.admin_status": "Ouvrir ce statut dans l’interface de modération",
+  "status.admin_status": "Ouvrir ce pouet dans l’interface de modération",
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
   "status.cannot_reblog": "Ce pouet ne peut pas être partagé",
   "status.copy": "Copier le lien vers le pouet",
-  "status.delete": "Effacer",
+  "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Envoyer un message direct à @{name}",
   "status.embed": "Intégrer",
@@ -374,15 +374,15 @@
   "status.more": "Plus",
   "status.mute": "Masquer @{name}",
   "status.mute_conversation": "Masquer la conversation",
-  "status.open": "Déplier ce statut",
+  "status.open": "Voir les détails du pouet",
   "status.pin": "Épingler sur le profil",
   "status.pinned": "Pouet épinglé",
   "status.read_more": "En savoir plus",
   "status.reblog": "Partager",
   "status.reblog_private": "Partager à l’audience originale",
-  "status.reblogged_by": "{name} a partagé :",
+  "status.reblogged_by": "{name} a partagé",
   "status.reblogs.empty": "Personne n’a encore partagé ce pouet. Lorsque quelqu’un le fera, il apparaîtra ici.",
-  "status.redraft": "Effacer et ré-écrire",
+  "status.redraft": "Supprimer et ré-écrire",
   "status.remove_bookmark": "Retirer des marque-pages",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
@@ -393,7 +393,7 @@
   "status.show_less_all": "Tout replier",
   "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
-  "status.show_thread": "Lire le fil",
+  "status.show_thread": "Montrer le fil",
   "status.uncached_media_warning": "Indisponible",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Retirer du profil",
@@ -409,7 +409,7 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} restantes",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} restantes",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {personne} other {personnes}} discutent",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {personne discute} other {personnes discutent}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "upload_area.title": "Glissez et déposez pour envoyer",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 0e9c9d6d1..b69ec2b95 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 76657cdde..f26b39c21 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -128,7 +128,7 @@
   "embed.preview": "Así será mostrado:",
   "emoji_button.activity": "Actividade",
   "emoji_button.custom": "Personalizado",
-  "emoji_button.flags": "Bandeiras",
+  "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida e Bebida",
   "emoji_button.label": "Inserir emoticona",
   "emoji_button.nature": "Natureza",
@@ -150,33 +150,33 @@
   "empty_column.favourited_statuses": "Aínda non tes toots favoritos. Cando che goste algún, aparecerá aquí.",
   "empty_column.favourites": "A ninguén lle gostou este toot polo momento. Cando a alguén lle goste, aparecerá aquí.",
   "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
-  "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
+  "empty_column.hashtag": "Aínda non hai nada con esta etiqueta.",
   "empty_column.home": "A túa cronoloxía inicial está baleira! Visita {public} ou emprega a procura para atopar outras usuarias.",
   "empty_column.home.public_timeline": "a cronoloxía pública",
   "empty_column.list": "Aínda non hai nada en esta lista. Cando as usuarias incluídas na lista publiquen mensaxes, aparecerán aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
-  "empty_column.notifications": "Aínda non tes notificacións. Interactúa con outros para comezar unha conversa.",
+  "empty_column.notifications": "Aínda non tes notificacións. Interactúa con outras para comezar unha conversa.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
-  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se esto non axuda podes tamén empregar o Mastodon noutro navegador ou aplicación nativa.",
+  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se esto non axuda podes tamén empregar Mastodon noutro navegador ou aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar trazas (stacktrace) ó portapapeis",
-  "errors.unexpected_crash.report_issue": "Denunciar un problema",
+  "errors.unexpected_crash.report_issue": "Informar sobre un problema",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
-  "getting_started.developers": "Desenvolvedores",
+  "getting_started.developers": "Desenvolvedoras",
   "getting_started.directory": "Directorio local",
   "getting_started.documentation": "Documentación",
   "getting_started.heading": "Primeiros pasos",
   "getting_started.invite": "Convidar persoas",
-  "getting_started.open_source_notice": "O Mastodon é software de código aberto. Podes contribuír ou informar de fallos no GitHub en {github}.",
+  "getting_started.open_source_notice": "Mastodon é software de código aberto. Podes contribuír ou informar de fallos en GitHub en {github}.",
   "getting_started.security": "Seguranza",
   "getting_started.terms": "Termos do servizo",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
   "hashtag.column_settings.select.no_options_message": "Non se atoparon suxestións",
-  "hashtag.column_settings.select.placeholder": "Inserir cancelos…",
+  "hashtag.column_settings.select.placeholder": "Inserir etiquetas…",
   "hashtag.column_settings.tag_mode.all": "Todos estes",
   "hashtag.column_settings.tag_mode.any": "Calquera destes",
   "hashtag.column_settings.tag_mode.none": "Ningún destes",
@@ -192,7 +192,7 @@
   "introduction.federation.action": "Seguinte",
   "introduction.federation.federated.headline": "Federado",
   "introduction.federation.federated.text": "Publicacións públicas doutros servidores do fediverso aparecerán na cronoloxía federada.",
-  "introduction.federation.home.headline": "Páxina inicial",
+  "introduction.federation.home.headline": "Inicio",
   "introduction.federation.home.text": "Publicacións de persoas que ti segues aparecerán na cronoloxía do inicio. Podes seguir calquera persoa en calquera servidor!",
   "introduction.federation.local.headline": "Local",
   "introduction.federation.local.text": "Publicacións públicas de persoas no teu mesmo servidor aparecerán na cronoloxía local.",
@@ -205,7 +205,7 @@
   "introduction.interactions.reply.text": "Podes responder ós toots doutras persoas e ós teus propios, así ficarán encadeados nunha conversa.",
   "introduction.welcome.action": "Imos!",
   "introduction.welcome.headline": "Primeiros pasos",
-  "introduction.welcome.text": "Benvido ó fediverso! Nun intre poderás difundir mensaxes e falar coas túas amizades nun grande número de servidores. Mais este servidor, {domain}, é especial—hospeda o teu perfil, por iso lémbrate do seu nome.",
+  "introduction.welcome.text": "Benvida ó fediverso! Nun intre poderás difundir mensaxes e falar coas túas amizades nun grande número de servidores. Mais este servidor, {domain}, é especial—hospeda o teu perfil, por iso lémbra o seu nome.",
   "keyboard_shortcuts.back": "para voltar atrás",
   "keyboard_shortcuts.blocked": "abrir lista de usuarias bloqueadas",
   "keyboard_shortcuts.boost": "promover",
@@ -270,7 +270,7 @@
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Peticións de seguimento",
-  "navigation_bar.follows_and_followers": "Seguindo e seguidores",
+  "navigation_bar.follows_and_followers": "Seguindo e seguidoras",
   "navigation_bar.info": "Sobre este servidor",
   "navigation_bar.keyboard_shortcuts": "Atallos do teclado",
   "navigation_bar.lists": "Listaxes",
@@ -295,7 +295,7 @@
   "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.filter_bar.show": "Amosar",
-  "notifications.column_settings.follow": "Novos seguidores:",
+  "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
   "notifications.column_settings.poll": "Resultados da enquisa:",
@@ -312,7 +312,7 @@
   "notifications.group": "{count} notificacións",
   "poll.closed": "Pechado",
   "poll.refresh": "Actualizar",
-  "poll.total_people": "{count, plural,one {# persoa}other {# persoas}}",
+  "poll.total_people": "{count, plural,one {# persoa} other {# persoas}}",
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaches por esta opción",
@@ -321,14 +321,14 @@
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Só para as usuarias mencionadas",
   "privacy.direct.short": "Directo",
-  "privacy.private.long": "Só para os seguidores",
-  "privacy.private.short": "Só seguidores",
+  "privacy.private.long": "Só para os seguidoras",
+  "privacy.private.short": "Só para seguidoras",
   "privacy.public.long": "Publicar nas cronoloxías públicas",
   "privacy.public.short": "Público",
   "privacy.unlisted.long": "Non publicar nas cronoloxías públicas",
   "privacy.unlisted.short": "Non listado",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Estase a cargar…",
+  "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
@@ -365,7 +365,7 @@
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa a @{name}",
-  "status.embed": "Embeber nunha web",
+  "status.embed": "Incrustar",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
   "status.load_more": "Cargar máis",
@@ -411,7 +411,7 @@
   "time_remaining.seconds": "{number, plural, one {# segundo} other {# segundos}} restantes",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoa} other {persoas}} falando",
   "trends.trending_now": "Tendencias actuais",
-  "ui.beforeunload": "O borrador perderase se saes do Mastodon.",
+  "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
   "upload_area.title": "Arrastra e solta para subir",
   "upload_button.label": "Engadir multimedia ({formats})",
   "upload_error.limit": "Límite máximo do ficheiro a subir excedido.",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index d4659bc2e..ee9d701b0 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "लोड हो रहा है...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "नहीं मिला",
   "missing_indicator.sublabel": "यह संसाधन नहीं मिल सका।",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index b25369326..d2d851436 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -130,7 +130,7 @@
   "emoji_button.custom": "Egyéni",
   "emoji_button.flags": "Zászlók",
   "emoji_button.food": "Étel és Ital",
-  "emoji_button.label": "Emoji beszúrása",
+  "emoji_button.label": "Emodzsi beszúrása",
   "emoji_button.nature": "Természet",
   "emoji_button.not_found": "Nincsenek emodzsik!! (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "Tárgyak",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 6a0e825b0..b3f1df94c 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -40,10 +40,10 @@
   "account.unmute": "Ապալռեցնել @{name}֊ին",
   "account.unmute_notifications": "Միացնել ծանուցումները @{name}֊ից",
   "alert.rate_limited.message": "Փորձէք  որոշ ժամանակ անց՝ {retry_time, time, medium}։",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.title": "Գործողությունների հաճախությունը գերազանցում է թույլատրելին",
   "alert.unexpected.message": "Անսպասելի սխալ տեղի ունեցաւ։",
   "alert.unexpected.title": "Վա՜յ",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Հայտարարություններ",
   "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա հաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.body": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
   "compose_form.poll.option_placeholder": "Տարբերակ {number}",
   "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրությամբ",
+  "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրությամբ",
   "compose_form.publish": "Թթել",
   "compose_form.publish_loud": "Թթե՜լ",
   "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
@@ -143,29 +143,29 @@
   "empty_column.account_timeline": "Այստեղ թթեր չկա՛ն։",
   "empty_column.account_unavailable": "Անձնական էջը հասանելի չի",
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշւած թութ։ Երբ էջանշես, դրանք կերեւան այստեղ։",
   "empty_column.community": "Տեղական հոսքը դատա՛րկ է։ Հրապարակային մի բան գրիր շարժիչը խոդ տալու համար։",
   "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն այստեղ կերեւայ։",
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած թութ։ Երբ հաւանես, դրանք կերեւան այստեղ։",
   "empty_column.favourites": "Այս թութը ոչ մէկ դեռ չի հաւանել։ Հաւանողները կերեւան այստեղ, երբ նշեն թութը հաւանած։",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_requests": "Դու դեռ չունես որեւէ հետևելու հայտ։ Բոլոր նման հայտերը կհայտնվեն այստեղ։",
   "empty_column.hashtag": "Այս պիտակով դեռ ոչինչ չկա։",
   "empty_column.home": "Քո հիմնական հոսքը դատա՛րկ է։ Այցելի՛ր {public}ը կամ օգտվիր որոնումից՝ այլ մարդկանց հանդիպելու համար։",
   "empty_column.home.public_timeline": "հրապարակային հոսք",
   "empty_column.list": "Այս ցանկում դեռ ոչինչ չկա։ Երբ ցանկի անդամներից որեւէ մեկը նոր թութ գրի, այն կհայտնվի այստեղ։",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "Առայժմ ոչ ոքի չեք արգելափակել։",
+  "empty_column.lists": "Դուք դեռ չունեք ստեղծած ցանկ։ Ցանկ ստեղծելուն պես այն կհայտնվի այստեղ։",
+  "empty_column.mutes": "Առայժմ ոչ ոքի չեք լռեցրել։",
   "empty_column.notifications": "Ոչ մի ծանուցում դեռ չունես։ Բզիր մյուսներին՝ խոսակցությունը սկսելու համար։",
   "empty_column.public": "Այստեղ բան չկա՛։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգույցներից էակների՝ այն լցնելու համար։",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.explanation": "Մեր ծրագրակազմում վրիպակի կամ դիտարկչի անհամատեղելիության պատճառով այս էջը չի կարող լիարժեք պատկերվել։",
+  "error.unexpected_crash.next_steps": "Փորձիր թարմացնել էջը։ Եթե դա չօգնի ապա կարող ես օգտվել Մաստադոնից ուրիշ դիտարկիչով կամ հավելվածով։",
+  "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին",
   "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին",
   "follow_request.authorize": "Վավերացնել",
   "follow_request.reject": "Մերժել",
   "getting_started.developers": "Մշակողներ",
-  "getting_started.directory": "Պրոֆիլի տեղադրավայրը",
+  "getting_started.directory": "Օգտատերերի շտեմարան",
   "getting_started.documentation": "Փաստաթղթեր",
   "getting_started.heading": "Ինչպես սկսել",
   "getting_started.invite": "Հրավիրել մարդկանց",
@@ -175,8 +175,8 @@
   "hashtag.column_header.tag_mode.all": "և {additional}",
   "hashtag.column_header.tag_mode.any": "կամ {additional}",
   "hashtag.column_header.tag_mode.none": "առանց {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.select.no_options_message": "Առաջարկներ չկան",
+  "hashtag.column_settings.select.placeholder": "Ավելացրու հեշթեգեր…",
   "hashtag.column_settings.tag_mode.all": "Բոլորը",
   "hashtag.column_settings.tag_mode.any": "Ցանկացածը",
   "hashtag.column_settings.tag_mode.none": "Ոչ մեկը",
@@ -184,50 +184,50 @@
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "home.hide_announcements": "Թաքցնել հայտարարությունները",
+  "home.show_announcements": "Ցուցադրել հայտարարությունները",
+  "intervals.full.days": "{number, plural, one {# օր} other {# օր}}",
+  "intervals.full.hours": "{number, plural, one {# ժամ} other {# ժամ}}",
+  "intervals.full.minutes": "{number, plural, one {# րոպե} other {# րոպե}}",
   "introduction.federation.action": "Հաջորդ",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.federated.headline": "Դաշնային",
+  "introduction.federation.federated.text": "Դաշտնեզերքի հարևան հանգույցների հանրային գրառումները կհայտնվեն դաշնային հոսքում։",
   "introduction.federation.home.headline": "Հիմնական",
-  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.home.text": "Այն անձանց թթերը ում հետևում ես, կհայտնվի հիմնական հոսքում։ Դու կարող ես հետևել ցանկացած անձի ցանկացած հանգույցից։",
   "introduction.federation.local.headline": "Տեղային",
-  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.federation.local.text": "Տեղական հոսքում կարող ես տեսնել քո հանգույցի բոլոր հանրային գրառումները։",
   "introduction.interactions.action": "Finish toot-orial!",
   "introduction.interactions.favourite.headline": "Նախընտրելի",
-  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.favourite.text": "Փոխանցիր հեղինակին որ քեզ դուր է եկել իր թութը հավանելով այն։",
   "introduction.interactions.reblog.headline": "Տարածել",
-  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reblog.text": "Կիսիր այլ օգտատերերի թութերը քո հետևորդների հետ տարածելով դրանք քո անձնական էջում։",
   "introduction.interactions.reply.headline": "Պատասխանել",
-  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.interactions.reply.text": "Արձագանքիր ուրիշների և քո թթերին, դրանք կդարսվեն մեկ ընհանուր քննարկման շղթայով։",
   "introduction.welcome.action": "Գնացի՜նք։",
   "introduction.welcome.headline": "Առաջին քայլեր",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+  "introduction.welcome.text": "Դաշնեզերքը ողջունում է ձեզ։ Շուտով կկարողանաս ուղարկել նամակներ ու շփվել տարբեր հանգույցների ընկերներիդ հետ։ Բայց մտապահիր {domain} հանգույցը, այն յուրահատուկ է, այստեղ է պահվում քո հաշիվը։",
   "keyboard_shortcuts.back": "ետ նավարկելու համար",
   "keyboard_shortcuts.blocked": "արգելափակված օգտատերերի ցանկը բացելու համար",
   "keyboard_shortcuts.boost": "տարածելու համար",
   "keyboard_shortcuts.column": "սյուներից մեկի վրա սեւեռվելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրույթին սեւեռվելու համար",
   "keyboard_shortcuts.description": "Նկարագրություն",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "հասցեագրված գրվածքների հոսքը բացելու համար",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժվելու համար",
   "keyboard_shortcuts.enter": "թութը բացելու համար",
   "keyboard_shortcuts.favourite": "հավանելու համար",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.favourites": "էջանիշերի ցուցակը բացելու համար",
+  "keyboard_shortcuts.federated": "դաշնային հոսքին անցնելու համար",
   "keyboard_shortcuts.heading": "Ստեղնաշարի կարճատներ",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "անձնական հոսքին անցնելու համար",
   "keyboard_shortcuts.hotkey": "Հատուկ ստեղն",
   "keyboard_shortcuts.legend": "այս ձեռնարկը ցուցադրելու համար",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.local": "տեղական հոսքին անցնելու համար",
   "keyboard_shortcuts.mention": "հեղինակին նշելու համար",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.muted": "լռեցված օգտատերերի ցանկը բացելու համար",
+  "keyboard_shortcuts.my_profile": "սեփական էջին անցնելու համար",
+  "keyboard_shortcuts.notifications": "ծանուցումեների սյունակը բացելու համար",
+  "keyboard_shortcuts.open_media": "ցուցադրել մեդիան",
   "keyboard_shortcuts.pinned": "ամրացուած թթերի ցանկը բացելու համար",
   "keyboard_shortcuts.profile": "հեղինակի անձնական էջը բացելու համար",
   "keyboard_shortcuts.reply": "պատասխանելու համար",
@@ -252,7 +252,7 @@
   "lists.new.title_placeholder": "Նոր ցանկի վերնագիր",
   "lists.search": "Փնտրել քո հետեւած մարդկանց մեջ",
   "lists.subheading": "Քո ցանկերը",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "load_pending": "{count, plural, one {# նոր նյութ} other {# նոր նյութ}}",
   "loading_indicator.label": "Բեռնվում է…",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "missing_indicator.label": "Չգտնվեց",
@@ -283,7 +283,7 @@
   "navigation_bar.security": "Անվտանգություն",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} քեզ հետևելու հայց է ուղարկել",
   "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
   "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
   "notifications.column_settings.filter_bar.show": "Ցուցադրել",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
   "notifications.column_settings.poll": "Հարցման արդիւնքները՝",
   "notifications.column_settings.push": "Հրելու ծանուցումներ",
@@ -312,8 +312,8 @@
   "notifications.group": "{count} ծանուցում",
   "poll.closed": "Փակ",
   "poll.refresh": "Թարմացնել",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.total_people": "{count, plural, one {# հոգի} other {# հոգի}}",
+  "poll.total_votes": "{count, plural, one {# ձայն} other {# ձայն}}",
   "poll.vote": "Քուէարկել",
   "poll.voted": "Դու քուէարկել ես այս տարբերակի համար",
   "poll_button.add_poll": "Աւելացնել հարցում",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "նոր",
   "relative_time.minutes": "{number}ր",
   "relative_time.seconds": "{number}վ",
-  "relative_time.today": "today",
+  "relative_time.today": "Այսօր",
   "reply_indicator.cancel": "Չեղարկել",
   "report.forward": "Փոխանցել {target}֊ին",
   "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
@@ -361,10 +361,10 @@
   "status.bookmark": "Էջանիշ",
   "status.cancel_reblog_private": "Ապատարածել",
   "status.cannot_reblog": "Այս թութը չի կարող տարածվել",
-  "status.copy": "Copy link to status",
+  "status.copy": "Պատճենել գրառման հղումը",
   "status.delete": "Ջնջել",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
+  "status.detailed_status": "Շղթայի ընդլայնված դիտում",
+  "status.direct": "Նամակ գրել {name} -ին",
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filtered": "Զտված",
@@ -376,57 +376,57 @@
   "status.mute_conversation": "Լռեցնել խոսակցությունը",
   "status.open": "Ընդարձակել այս թութը",
   "status.pin": "Ամրացնել անձնական էջում",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "Ամրացված թութ",
   "status.read_more": "Կարդալ ավելին",
   "status.reblog": "Տարածել",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Տարածել սեփական լսարանին",
   "status.reblogged_by": "{name} տարածել է",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.reblogs.empty": "Այս թութը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ որևէ մեկը տարածի։",
+  "status.redraft": "Ջնջել եւ վերակազմել",
+  "status.remove_bookmark": "Հեռացնել էջանիշերից",
   "status.reply": "Պատասխանել",
   "status.replyAll": "Պատասխանել թելին",
   "status.report": "Բողոքել @{name}֊ից",
   "status.sensitive_warning": "Կասկածելի բովանդակություն",
   "status.share": "Կիսվել",
   "status.show_less": "Պակաս",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
   "status.show_more": "Ավելին",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
+  "status.show_thread": "Բացել շղթան",
   "status.uncached_media_warning": "Անհասանելի",
   "status.unmute_conversation": "Ապալռեցնել խոսակցությունը",
   "status.unpin": "Հանել անձնական էջից",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Անտեսել առաջարկը",
+  "suggestions.header": "Միգուցե քեզ հետաքրքրի…",
   "tabs_bar.federated_timeline": "Դաշնային",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.local_timeline": "Տեղական",
   "tabs_bar.notifications": "Ծանուցումներ",
   "tabs_bar.search": "Փնտրել",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.days": "{number, plural, one {մնաց # օր} other {մնաց # օր}}",
   "time_remaining.hours": "{number, plural, one {# ժամ} other {# ժամ}} անց",
   "time_remaining.minutes": "{number, plural, one {# րոպե} other {# րոպե}} անց",
-  "time_remaining.moments": "Moments remaining",
+  "time_remaining.moments": "Մնացել է մի քանի վարկյան",
   "time_remaining.seconds": "{number, plural, one {# վայրկյան} other {# վայրկյան}} անց",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {հոգի} other {հոգի}} խոսում է սրա մասին",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կկորի, եթե լքես Մաստոդոնը։",
   "upload_area.title": "Քաշիր ու նետիր՝ վերբեռնելու համար",
   "upload_button.label": "Ավելացնել մեդիա",
   "upload_error.limit": "Ֆայլի վերբեռնման սահմանաչափը գերազանցված է։",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_error.poll": "Հարցումների հետ ֆայլ կցել հնարավոր չէ։",
+  "upload_form.audio_description": "Նկարագրիր ձայնագրության բովանդակությունը լսողական խնդիրներով անձանց համար",
   "upload_form.description": "Նկարագրություն ավելացրու տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.undo": "Հետարկել",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Նկարագրիր տեսանյութը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
   "upload_modal.description_placeholder": "Ճկուն շագանակագույն աղվեսը ցատկում է ծույլ շան վրայով",
   "upload_modal.detect_text": "Հայտնբերել տեքստը նկարից",
   "upload_modal.edit_media": "Խմբագրել մեդիան",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.hint": "Սեղմեք և տեղաշարժեք նախատեսքի վրայի շրջանակը ընտրելու այն կետը որը միշտ տեսանելի կլինի մանրապատկերներում։",
   "upload_modal.preview_label": "Նախադիտում ({ratio})",
   "upload_progress.label": "Վերբեռնվում է…",
   "video.close": "Փակել  տեսագրությունը",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 94f81116c..c1b47f860 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -5,7 +5,7 @@
   "account.block": "Blocca @{name}",
   "account.block_domain": "Nascondi tutto da {domain}",
   "account.blocked": "Bloccato",
-  "account.cancel_follow_request": "Annulla richiesta di seguito",
+  "account.cancel_follow_request": "Annulla richiesta di seguire",
   "account.direct": "Invia messaggio privato a @{name}",
   "account.domain_blocked": "Dominio nascosto",
   "account.edit_profile": "Modifica profilo",
@@ -36,7 +36,7 @@
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Non nascondere {domain}",
   "account.unendorse": "Non mettere in evidenza sul profilo",
-  "account.unfollow": "Non seguire",
+  "account.unfollow": "Smetti di seguire",
   "account.unmute": "Non silenziare @{name}",
   "account.unmute_notifications": "Non silenziare più le notifiche da @{name}",
   "alert.rate_limited.message": "Riprova dopo {retry_time, time, medium}.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a0254679f..5fe096d39 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
   "account.block": "@{name}さんをブロック",
-  "account.block_domain": "{domain}全体を非表示",
+  "account.block_domain": "{domain}全体をブロック",
   "account.blocked": "ブロック済み",
   "account.cancel_follow_request": "フォローリクエストを取り消す",
   "account.direct": "@{name}さんにダイレクトメッセージ",
-  "account.domain_blocked": "ドメイン非表示中",
+  "account.domain_blocked": "ドメインブロック中",
   "account.edit_profile": "プロフィール編集",
   "account.endorse": "プロフィールで紹介する",
   "account.follow": "フォロー",
@@ -34,7 +34,7 @@
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
   "account.unblock": "@{name}さんのブロックを解除",
-  "account.unblock_domain": "{domain}の非表示を解除",
+  "account.unblock_domain": "{domain}のブロックを解除",
   "account.unendorse": "プロフィールから外す",
   "account.unfollow": "フォロー解除",
   "account.unmute": "@{name}さんのミュートを解除",
@@ -57,7 +57,7 @@
   "column.community": "ローカルタイムライン",
   "column.direct": "ダイレクトメッセージ",
   "column.directory": "ディレクトリ",
-  "column.domain_blocks": "非表示にしたドメイン",
+  "column.domain_blocks": "ブロックしたドメイン",
   "column.favourites": "お気に入り",
   "column.follow_requests": "フォローリクエスト",
   "column.home": "ホーム",
@@ -105,7 +105,7 @@
   "confirmations.delete.message": "本当に削除しますか？",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
-  "confirmations.domain_block.confirm": "ドメイン全体を非表示",
+  "confirmations.domain_block.confirm": "ドメイン全体をブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
@@ -148,7 +148,7 @@
   "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
   "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
-  "empty_column.domain_blocks": "非表示にしているドメインはありません。",
+  "empty_column.domain_blocks": "ブロックしているドメインはありません。",
   "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
   "empty_column.favourites": "まだ誰もお気に入り登録していません。お気に入り登録されるとここに表示されます。",
   "empty_column.follow_requests": "まだフォローリクエストを受けていません。フォローリクエストを受けるとここに表示されます。",
@@ -258,7 +258,7 @@
   "lists.subheading": "あなたのリスト",
   "load_pending": "{count} 件の新着",
   "loading_indicator.label": "読み込み中...",
-  "media_gallery.toggle_visible": "表示切り替え",
+  "media_gallery.toggle_visible": "メディアを隠す",
   "missing_indicator.label": "見つかりません",
   "missing_indicator.sublabel": "見つかりませんでした",
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
@@ -269,7 +269,7 @@
   "navigation_bar.compose": "トゥートの新規作成",
   "navigation_bar.direct": "ダイレクトメッセージ",
   "navigation_bar.discover": "見つける",
-  "navigation_bar.domain_blocks": "非表示にしたドメイン",
+  "navigation_bar.domain_blocks": "ブロックしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -329,13 +329,13 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "メンションしたユーザーだけに公開",
+  "privacy.direct.long": "送信した相手のみ閲覧可",
   "privacy.direct.short": "ダイレクト",
-  "privacy.private.long": "フォロワーだけに公開",
+  "privacy.private.long": "フォロワーのみ閲覧可",
   "privacy.private.short": "フォロワー限定",
-  "privacy.public.long": "公開TLに投稿する",
+  "privacy.public.long": "誰でも閲覧可、公開TLに表示",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "公開TLで表示しない",
+  "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
   "refresh": "更新",
   "qr_modal.description": "QRコードを読み取って簡単にプロフィールにアクセスしましょう。",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index e78b4cc4f..8ce4c2774 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,51 +1,51 @@
 {
-  "account.add_or_remove_from_list": "Rnu neγ kkes seg tebdarin",
+  "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
   "account.badges.bot": "Aṛubut",
   "account.badges.group": "Agraw",
   "account.block": "Seḥbes @{name}",
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
   "account.blocked": "Yettuseḥbes",
-  "account.cancel_follow_request": "Sefsex asuter n weḍfaṛ",
+  "account.cancel_follow_request": "Sefsex asuter n uḍfaṛ",
   "account.direct": "Izen usrid i @{name}",
-  "account.domain_blocked": "Taγult yeffren",
-  "account.edit_profile": "Ẓreg amaγnu",
-  "account.endorse": "Welleh fell-as deg umaγnu-inek",
+  "account.domain_blocked": "Taɣult yeffren",
+  "account.edit_profile": "Ẓreg amaɣnu",
+  "account.endorse": "Welleh fell-as deg umaɣnu-inek",
   "account.follow": "Ḍfeṛ",
   "account.followers": "Imeḍfaṛen",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
-  "account.follows": "Ig ṭafaṛ",
+  "account.follows": "I yeṭṭafaṛ",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.follows_you": "Yeṭṭafaṛ-ik",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.last_status": "Armud aneggaru",
   "account.link_verified_on": "Taγara n useγwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
-  "account.media": "Allal n teywalt",
+  "account.media": "Amidya",
   "account.mention": "Bder-d @{name}",
-  "account.moved_to": "{name} ibeddel γer:",
+  "account.moved_to": "{name} ibeddel ɣer:",
   "account.mute": "Sgugem @{name}",
-  "account.mute_notifications": "Susem ilγa sγur @{name}",
+  "account.mute_notifications": "Sgugem tilɣa sγur @{name}",
   "account.muted": "Yettwasgugem",
   "account.never_active": "Werǧin",
   "account.posts": "Tijewwaqin",
   "account.posts_with_replies": "Tijewwaqin akked tririyin",
-  "account.report": "Sewɛed @{name}",
-  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit iwakken ad yefsex usuter n weḍfar",
-  "account.share": "Bḍu amaγnu n @{name}",
+  "account.report": "Cetki ɣef @{name}",
+  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Sken-d inebḍa n @{name}",
   "account.unblock": "Serreḥ i @{name}",
-  "account.unblock_domain": "Kkes tuffra i {domain}",
-  "account.unendorse": "Ur ttwellih ara fell-as deg umaγnu-inek",
+  "account.unblock_domain": "Sken-d {domain}",
+  "account.unendorse": "Ur ttwellih ara fell-as deg umaɣnu-inek",
   "account.unfollow": "Ur ṭṭafaṛ ara",
-  "account.unmute": "Kkes asgugem γef @{name}",
-  "account.unmute_notifications": "Serreḥ ilγa sγur @{name}",
-  "alert.rate_limited.message": "Ma ulac aγilif ɛreḍ tikelt-nniḍen mbeɛd {retry_time, time, medium}.",
+  "account.unmute": "Kkes asgugem ɣef @{name}",
+  "account.unmute_notifications": "Serreḥ ilɣa sɣur @{name}",
+  "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
   "alert.rate_limited.title": "Aktum s talast",
-  "alert.unexpected.message": "Tella-d tuccḍa i γef ur nedmi ara.",
+  "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
   "alert.unexpected.title": "Ayhuh!",
-  "announcement.announcement": "Ulγu",
+  "announcement.announcement": "Ulɣu",
   "autosuggest_hashtag.per_week": "{count} i yimalas",
-  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ γef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
   "bundle_column_error.body": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
   "bundle_column_error.title": "Tuccḍa deg uẓeṭṭa",
@@ -56,22 +56,22 @@
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
   "column.direct": "Iznan usriden",
-  "column.directory": "Qelleb deg imaγnuten",
-  "column.domain_blocks": "Tiγula yettwaffren",
+  "column.directory": "Inig deg imaɣnuten",
+  "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Ismenyifen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
   "column.home": "Agejdan",
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
-  "column.notifications": "Tilγa",
+  "column.notifications": "Tilɣa",
   "column.pins": "Tijewwaqin yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
-  "column_back_button.label": "Tuγalin",
-  "column_header.hide_settings": "Ffer iγewwaṛen",
-  "column_header.moveLeft_settings": "Err ajgu γer tama tazelmaḍt",
-  "column_header.moveRight_settings": "Err ajgu γer tama tayfust",
+  "column_back_button.label": "Tuɣalin",
+  "column_header.hide_settings": "Ffer iɣewwaṛen",
+  "column_header.moveLeft_settings": "Err ajgu ɣer tama tazelmaḍt",
+  "column_header.moveRight_settings": "Err ajgu ɣer tama tayfust",
   "column_header.pin": "Senteḍ",
-  "column_header.show_settings": "Sken iγewwaṛen",
+  "column_header.show_settings": "Sken iɣewwaṛen",
   "column_header.unpin": "Kkes asenteḍ",
   "column_subheading.settings": "Iγewwaṛen",
   "community.column_settings.media_only": "Allal n teywalt kan",
@@ -102,7 +102,7 @@
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebγiḍ s tidet ad tekkseḍ tasuffeγt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
-  "confirmations.delete_list.message": "Tebγiḍ s tidet ad tekkseḍ tabdert-agi i lebda?",
+  "confirmations.delete_list.message": "Tebγiḍ s tidet ad tekkseḍ umuγ-agi i lebda?",
   "confirmations.domain_block.confirm": "Ffer taγult meṛṛa",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "Ffeγ",
@@ -137,7 +137,7 @@
   "emoji_button.people": "Medden",
   "emoji_button.recent": "Wid yettuseqdacen s waṭas",
   "emoji_button.search": "Nadi…",
-  "emoji_button.search_results": "Igmaḍ u unadi",
+  "emoji_button.search_results": "Igemmaḍ n unadi",
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
   "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
@@ -153,8 +153,8 @@
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaγ γer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neγ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.home.public_timeline": "tasuddemt tazayezt n yisallen",
-  "empty_column.list": "Ar tura ur yelli kra deg tebdert-a. Ad d-yettwasken da ticki iɛeggalen n tebdert-a suffγen-d kra.",
-  "empty_column.lists": "Ulac γur-k kra n tebdert yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.list": "Ar tura ur yelli kra deg umuγ-a. Ad d-yettwasken da ticki iɛeggalen n wumuγ-a suffγen-d kra.",
+  "empty_column.lists": "Ulac γur-k kra n wumuγ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
   "empty_column.mutes": "Ulac γur-k imseqdacen i yettwasgugmen.",
   "empty_column.notifications": "Ulac γur-k tilγa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neγ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
@@ -202,58 +202,58 @@
   "introduction.interactions.reblog.headline": "Bḍu tikelt-nniḍen",
   "introduction.interactions.reblog.text": "Tzemreḍ ad tebḍuḍ tijewwaqin n medden akk d yimeḍfaṛen-ik s beṭṭu-nsent tikelt-nniḍen.",
   "introduction.interactions.reply.headline": "Err",
-  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ γef tjewwakin-ik d tid n medden-nniḍen, d acu ara tent-id-iɛeqden ta deffir ta deg yiwen udiwenni.",
+  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ γef tjewwaqin-ik·im akked tid n medden-nniḍen, aya atent-id-icudd ta deffir ta deg yiwen udiwenni.",
   "introduction.welcome.action": "Bdu!",
   "introduction.welcome.headline": "Isurifen imenza",
   "introduction.welcome.text": "Anṣuf γer fediverse! Deg kra n yimiren, ad tizmireḍ ad tzzuzreḍ iznan neγ ad tmeslayeḍ i yemddukkal deg waṭas n yiqeddacen. Maca aqeddac-agi, {domain}, mačči am wiyaḍ - deg-s i yella umaγnu-ik, ihi cfu γef yisem-is.",
   "keyboard_shortcuts.back": "uγal ar deffir",
-  "keyboard_shortcuts.blocked": "akken ad teldiḍ tabdert n yimseqdacen yettwasḥebsen",
+  "keyboard_shortcuts.blocked": "akken ad teldiḍ umuγ n yimseqdacen yettwasḥebsen",
   "keyboard_shortcuts.boost": "i beṭṭu tikelt-nniḍen",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Aglam",
   "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
-  "keyboard_shortcuts.down": "i kennu γer wadda n tebdert",
+  "keyboard_shortcuts.down": "i kennu γer wadda n wumuγ",
   "keyboard_shortcuts.enter": "i tildin n tsuffeγt",
   "keyboard_shortcuts.favourite": "akken ad ternuḍ γer yismenyifen",
-  "keyboard_shortcuts.favourites": "i tildin n tebdert n yismenyifen",
+  "keyboard_shortcuts.favourites": "i tildin umuγ n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
   "keyboard_shortcuts.hotkey": "Inegzumen",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "akken ad tsekneḍ taneffust-agi",
   "keyboard_shortcuts.local": "i tildin n tsuddemt tadigant n yisallen",
   "keyboard_shortcuts.mention": "akken ad d-bedreḍ ameskar",
-  "keyboard_shortcuts.muted": "akken ad teldiḍ tabdert n yimseqdacen yettwasgugmen",
+  "keyboard_shortcuts.muted": "akken ad teldiḍ umuγ n yimseqdacen yettwasgugmen",
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaγnu-ik",
   "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n tilγa",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "i tildin n tebdert n tjewwaqin yettwasentḍen",
+  "keyboard_shortcuts.open_media": "i taɣwalin yeldin ",
+  "keyboard_shortcuts.pinned": "akken ad teldiḍ umuγ n tjewwiqin yettwasentḍen",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaγnu n umeskar",
   "keyboard_shortcuts.reply": "i tririt",
-  "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
+  "keyboard_shortcuts.requests": "akken ad d-teldiḍ umuγ n yisuturen n teḍfeṛt",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.start": "akken ad d-teldiḍ ajgu n \"bdu\"",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "i teskent/tuffra n yimidyaten",
   "keyboard_shortcuts.toot": "i wakken attebdud tajewwaqt tamaynut",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "i tulin γer ufella n tebdert",
+  "keyboard_shortcuts.up": "i tulin γer d asawen n wumuγ",
   "lightbox.close": "Mdel",
   "lightbox.next": "Γer zdat",
   "lightbox.previous": "Γer deffir",
   "lightbox.view_context": "Ẓer amnaḍ",
-  "lists.account.add": "Rnu γer tabdart",
-  "lists.account.remove": "Kkes seg tebdart",
-  "lists.delete": "Kkes tabdert",
-  "lists.edit": "Ẓreg tabdert",
+  "lists.account.add": "Rnu γer wumuγ",
+  "lists.account.remove": "Kkes seg umuγ",
+  "lists.delete": "Kkes umuγ",
+  "lists.edit": "Ẓreg umuγ",
   "lists.edit.submit": "Beddel azwel",
-  "lists.new.create": "Rnu tabdart",
-  "lists.new.title_placeholder": "Azwel n tebdert tamaynut",
+  "lists.new.create": "Rnu umuγ",
+  "lists.new.title_placeholder": "Azwel amaynut n wumuγ",
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
-  "lists.subheading": "Tibdarin-ik·im",
+  "lists.subheading": "Umuγen-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
-  "loading_indicator.label": "Yessalay-ed…",
+  "loading_indicator.label": "Yessalay-d…",
   "media_gallery.toggle_visible": "Sken / Ffer",
   "missing_indicator.label": "Ulac-it",
   "missing_indicator.sublabel": "Ur nufi ara aγbalu-a",
@@ -271,9 +271,9 @@
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
-  "navigation_bar.info": "Γef uqeddac-a",
+  "navigation_bar.info": "Ɣef uqeddac-agi",
   "navigation_bar.keyboard_shortcuts": "Inegzumen n unasiw",
-  "navigation_bar.lists": "Tibdarin",
+  "navigation_bar.lists": "Umuγen",
   "navigation_bar.logout": "Ffeγ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.personal": "Udmawan",
@@ -326,15 +326,15 @@
   "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
   "privacy.public.short": "Azayez",
   "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
-  "privacy.unlisted.short": "War tabdert",
+  "privacy.unlisted.short": "War umuγ",
   "refresh": "Smiren",
-  "regeneration_indicator.label": "Yessalay-ed…",
+  "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
   "relative_time.days": "{number}u",
-  "relative_time.hours": "{number}a",
+  "relative_time.hours": "{number}isr",
   "relative_time.just_now": "tura",
-  "relative_time.minutes": "{number}t",
-  "relative_time.seconds": "{number}t",
+  "relative_time.minutes": "{number}tis",
+  "relative_time.seconds": "{number}tas",
   "relative_time.today": "assa",
   "reply_indicator.cancel": "Sefsex",
   "report.forward": "Bren-it γeṛ {target}",
@@ -391,13 +391,13 @@
   "status.share": "Bḍu",
   "status.show_less": "Sken-d drus",
   "status.show_less_all": "Semẓi akk tisuffγin",
-  "status.show_more": "Sken-ed ugar",
+  "status.show_more": "Sken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
-  "status.show_thread": "Sken-ed lxiḍ",
+  "status.show_thread": "Sken-d lxiḍ",
   "status.uncached_media_warning": "Ulac-it",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
   "status.unpin": "Kkes asenteḍ seg umaγnu",
-  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.dismiss": "Sefsex asumer",
   "suggestions.header": "Ahat ad tcelgeḍ deg…",
   "tabs_bar.federated_timeline": "Amatu",
   "tabs_bar.home": "Agejdan",
@@ -408,10 +408,10 @@
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
   "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}}",
+  "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {n umdan} other {n yemdanen}} i yettmeslayen",
   "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeγ-ed deg Maṣṭudun.",
+  "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "upload_area.title": "Zuḥeb rnu sers i tasalyt",
   "upload_button.label": "Rnu Taγwalt ({formats})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 5385de456..eafb7ede7 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 6d6bf2ea2..cdcce62ff 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -53,7 +53,7 @@
   "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
   "column.blocks": "차단 중인 사용자",
-  "column.bookmarks": "갈무리",
+  "column.bookmarks": "보관함",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.directory": "프로필 둘러보기",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "여긴 툿이 없어요!",
   "empty_column.account_unavailable": "프로필 사용 불가",
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
-  "empty_column.bookmarked_statuses": "아직 갈무리한 툿이 없습니다. 툿을 갈무리하면 여기에 나타납니다.",
+  "empty_column.bookmarked_statuses": "아직 보관한 툿이 없습니다. 툿을 보관하면 여기에 나타납니다.",
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
   "empty_column.domain_blocks": "아직 숨겨진 도메인이 없습니다.",
@@ -260,7 +260,7 @@
   "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
   "navigation_bar.apps": "모바일 앱",
   "navigation_bar.blocks": "차단한 사용자",
-  "navigation_bar.bookmarks": "갈무리",
+  "navigation_bar.bookmarks": "보관함",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 툿 작성",
   "navigation_bar.direct": "다이렉트 메시지",
@@ -358,7 +358,7 @@
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
   "status.block": "@{name} 차단",
-  "status.bookmark": "갈무리",
+  "status.bookmark": "보관",
   "status.cancel_reblog_private": "부스트 취소",
   "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
   "status.copy": "게시물 링크 복사",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name}님이 부스트 했습니다",
   "status.reblogs.empty": "아직 아무도 이 툿을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
-  "status.remove_bookmark": "갈무리 삭제",
+  "status.remove_bookmark": "보관한 툿 삭제",
   "status.reply": "답장",
   "status.replyAll": "전원에게 답장",
   "status.report": "신고",
@@ -398,7 +398,7 @@
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
   "suggestions.dismiss": "추천 지우기",
-  "suggestions.header": "이것에 관심이 있을 것 같습니다…",
+  "suggestions.header": "여기에 관심이 있을 것 같습니다…",
   "tabs_bar.federated_timeline": "연합",
   "tabs_bar.home": "홈",
   "tabs_bar.local_timeline": "로컬",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 5385de456..eafb7ede7 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 1b5b7cf5e..82ec3b8e8 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 4a1f736cf..ee8b13ace 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 58bb9b723..b3a06d6ed 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 8c0fed9b0..be5d9a396 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 0d23e0d2c..19f3ca257 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 5048a3a49..6589c2b1d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -2,11 +2,11 @@
   "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groep",
-  "account.block": "Blokkeer @{name}",
-  "account.block_domain": "Verberg alles van {domain}",
+  "account.block": "@{name} blokkeren",
+  "account.block_domain": "Alles van {domain} verbergen",
   "account.blocked": "Geblokkeerd",
   "account.cancel_follow_request": "Volgverzoek annuleren",
-  "account.direct": "Direct bericht @{name}",
+  "account.direct": "@{name} een direct bericht sturen",
   "account.domain_blocked": "Domein verborgen",
   "account.edit_profile": "Profiel bewerken",
   "account.endorse": "Op profiel weergeven",
@@ -21,19 +21,19 @@
   "account.link_verified_on": "Eigendom van deze link is gecontroleerd op {date}",
   "account.locked_info": "De privacystatus van dit account is op besloten gezet. De eigenaar bepaalt handmatig wie hen kan volgen.",
   "account.media": "Media",
-  "account.mention": "Vermeld @{name}",
+  "account.mention": "@{name} vermelden",
   "account.moved_to": "{name} is verhuisd naar:",
-  "account.mute": "Negeer @{name}",
-  "account.mute_notifications": "Negeer meldingen van @{name}",
+  "account.mute": "@{name} negeren",
+  "account.mute_notifications": "Meldingen van @{name} negeren",
   "account.muted": "Genegeerd",
   "account.never_active": "Nooit",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots en reacties",
-  "account.report": "Rapporteer @{name}",
+  "account.report": "@{name} rapporteren",
   "account.requested": "Wacht op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon boosts van @{name}",
-  "account.unblock": "Deblokkeer @{name}",
+  "account.unblock": "@{name} deblokkeren",
   "account.unblock_domain": "{domain} niet langer verbergen",
   "account.unendorse": "Niet op profiel weergeven",
   "account.unfollow": "Ontvolgen",
@@ -254,7 +254,7 @@
   "lists.subheading": "Jouw lijsten",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
   "loading_indicator.label": "Laden…",
-  "media_gallery.toggle_visible": "Media wel/niet tonen",
+  "media_gallery.toggle_visible": "Media verbergen",
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
@@ -323,9 +323,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Alleen aan volgers tonen",
   "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Op openbare tijdlijnen tonen",
+  "privacy.public.long": "Voor iedereen zichtbaar en op openbare tijdlijnen tonen",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
+  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
@@ -357,22 +357,22 @@
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_status": "Deze toot in de moderatie-omgeving openen",
-  "status.block": "Blokkeer @{name}",
+  "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.copy": "Link naar toot kopiëren",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",
-  "status.direct": "Direct bericht @{name}",
+  "status.direct": "@{name} een direct bericht sturen",
   "status.embed": "Insluiten",
   "status.favourite": "Favoriet",
   "status.filtered": "Gefilterd",
   "status.load_more": "Meer laden",
   "status.media_hidden": "Media verborgen",
-  "status.mention": "Vermeld @{name}",
+  "status.mention": "@{name} vermelden",
   "status.more": "Meer",
-  "status.mute": "Negeer @{name}",
+  "status.mute": "@{name} negeren",
   "status.mute_conversation": "Negeer gesprek",
   "status.open": "Uitgebreide toot tonen",
   "status.pin": "Aan profielpagina vastmaken",
@@ -386,7 +386,7 @@
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.reply": "Reageren",
   "status.replyAll": "Reageer op iedereen",
-  "status.report": "Rapporteer @{name}",
+  "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
   "status.show_less": "Minder tonen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 9dd48767d..39fe5158e 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "Begrensa rate",
   "alert.unexpected.message": "Eit uventa problem oppstod.",
   "alert.unexpected.title": "Oi sann!",
-  "announcement.announcement": "Kunngjøring",
+  "announcement.announcement": "Kunngjering",
   "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.body": "Noko gjekk gale mens denne komponenten vart lasta ned.",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Varigskap for røysting",
   "compose_form.poll.option_placeholder": "Val {number}",
   "compose_form.poll.remove_option": "Ta vekk dette valet",
-  "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
-  "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.switch_to_multiple": "Endre avstemninga til å tillate fleirval",
+  "compose_form.poll.switch_to_single": "Endra avstemninga til tillate berre eitt val",
   "compose_form.publish": "Tut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Merk medium som sensitivt",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
-  "home.hide_announcements": "Skjul kunngjøring",
-  "home.show_announcements": "Vis kunngjøring",
+  "home.hide_announcements": "Skjul kunngjeringar",
+  "home.show_announcements": "Vis kunngjeringar",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
   "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutt}}",
@@ -237,7 +237,7 @@
   "keyboard_shortcuts.toggle_hidden": "for å visa/gøyma tekst bak innhaldsvarsel",
   "keyboard_shortcuts.toggle_sensitivity": "for å visa/gøyma media",
   "keyboard_shortcuts.toot": "for å laga ein heilt ny tut",
-  "keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet",
+  "keyboard_shortcuts.unfocus": "for å fokusere vekk skrive-/søkefeltet",
   "keyboard_shortcuts.up": "for å flytta seg opp på lista",
   "lightbox.close": "Lukk att",
   "lightbox.next": "Neste",
@@ -416,11 +416,11 @@
   "upload_button.label": "Legg til medium ({formats})",
   "upload_error.limit": "Du har gått over opplastingsgrensa.",
   "upload_error.poll": "Filopplasting ikkje tillate med meiningsmålingar.",
-  "upload_form.audio_description": "Beskriv det for folk med hørselstap",
+  "upload_form.audio_description": "Grei ut for folk med nedsett høyrsel",
   "upload_form.description": "Skildr for synshemja",
   "upload_form.edit": "Rediger",
   "upload_form.undo": "Slett",
-  "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
+  "upload_form.video_description": "Greit ut for folk med nedsett høyrsel eller syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
   "upload_modal.description_placeholder": "Ein rask brun rev hoppar over den late hunden",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 024bbb9df..a019f39ee 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -65,7 +65,7 @@
   "column.mutes": "Usuários silenciados",
   "column.notifications": "Notificações",
   "column.pins": "Toots fixados",
-  "column.public": "Linha global",
+  "column.public": "Global",
   "column_back_button.label": "Voltar",
   "column_header.hide_settings": "Ocultar configurações",
   "column_header.moveLeft_settings": "Mover coluna para a esquerda",
@@ -92,7 +92,7 @@
   "compose_form.sensitive.hide": "Marcar mídia como sensível",
   "compose_form.sensitive.marked": "Mídia está marcada como sensível",
   "compose_form.sensitive.unmarked": "Mídia não está marcada como sensível",
-  "compose_form.spoiler.marked": "O texto está oculto por um aviso de conteúdo",
+  "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
   "confirmation_modal.cancel": "Cancelar",
@@ -100,7 +100,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
   "confirmations.delete.confirm": "Excluir",
-  "confirmations.delete.message": "Excluir este toot?",
+  "confirmations.delete.message": "Você tem certeza de que deseja excluir este toot?",
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.domain_block.confirm": "Bloquear domínio",
@@ -113,9 +113,9 @@
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que deseja apagar o toot e usá-lo como rascunho? Boosts e favoritos serão perdidos e as respostas ao toot original ficarão desconectadas.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder agora vai sobrescrever o toot que você está compondo. Deseja continuar?",
+  "confirmations.reply.message": "Responder agora sobrescreverá o toot que você está compondo. Deseja continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Deixar de seguir {name}?",
+  "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Nada aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Nada aqui.",
-  "empty_column.bookmarked_statuses": "Sem toots salvos. Quando você salvar alguns, eles aparecerão aqui.",
+  "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
   "empty_column.community": "A linha do tempo local está vazia. Poste algo publicamente para começar!",
   "empty_column.direct": "Nada aqui. Quando você enviar ou receber toots diretos, eles aparecerão aqui.",
   "empty_column.domain_blocks": "Nada aqui.",
@@ -185,7 +185,7 @@
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar anúncios",
-  "home.show_announcements": "Exibir anúncios",
+  "home.show_announcements": "Mostrar anúncios",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -198,7 +198,7 @@
   "introduction.federation.local.text": "Toots públicos de pessoas na mesma instância que você aparecerão na linha local.",
   "introduction.interactions.action": "Terminar o tutorial!",
   "introduction.interactions.favourite.headline": "Favoritos",
-  "introduction.interactions.favourite.text": "Ao favoritar, você salva o toot para mais tarde ou sinaliza ao autor que você gostou do toot.",
+  "introduction.interactions.favourite.text": "Ao favoritar, você sinaliza ao autor que você gostou do toot.",
   "introduction.interactions.reblog.headline": "Boost",
   "introduction.interactions.reblog.text": "Ao dar boost, você compartilha toots de outras pessoas para seus seguidores.",
   "introduction.interactions.reply.headline": "Responder",
@@ -289,14 +289,14 @@
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no seu toot",
   "notifications.clear": "Limpar notificações",
-  "notifications.clear_confirmation": "Você tem certeza de que quer limpar todas as suas notificações?",
+  "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
   "notifications.column_settings.filter_bar.show": "Mostrar",
   "notifications.column_settings.follow": "Seguidores:",
-  "notifications.column_settings.follow_request": "Novos seguidores pendentes:",
+  "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Enviar notificações",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 34acbfc9a..b8902d65e 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -17,9 +17,9 @@
   "account.follows.empty": "Este utilizador ainda não segue alguém.",
   "account.follows_you": "É teu seguidor",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
-  "account.last_status": "Última actividade",
+  "account.last_status": "Última atividade",
   "account.link_verified_on": "A posse deste link foi verificada em {date}",
-  "account.locked_info": "O estatuto de privacidade desta conta é fechado. O dono revê manualmente que a pode seguir.",
+  "account.locked_info": "O estatuto de privacidade desta conta é fechado. O dono revê manualmente quem a pode seguir.",
   "account.media": "Média",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} mudou a sua conta para:",
@@ -53,7 +53,7 @@
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
   "column.blocks": "Utilizadores Bloqueados",
-  "column.bookmarks": "Favoritos",
+  "column.bookmarks": "Marcadores",
   "column.community": "Cronologia local",
   "column.direct": "Mensagens directas",
   "column.directory": "Procurar perfis",
@@ -74,7 +74,7 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_subheading.settings": "Configurações",
-  "community.column_settings.media_only": "Somente multimédia",
+  "community.column_settings.media_only": "Somente média",
   "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
   "compose_form.direct_message_warning_learn_more": "Conhecer mais",
   "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
@@ -89,7 +89,7 @@
   "compose_form.poll.switch_to_single": "Alterar a votação para permitir uma única escolha",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marcar multimédia como sensível",
+  "compose_form.sensitive.hide": "Marcar média como sensível",
   "compose_form.sensitive.marked": "Média marcada como sensível",
   "compose_form.sensitive.unmarked": "Média não está marcada como sensível",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
@@ -124,7 +124,7 @@
   "directory.local": "Apenas de {domain}",
   "directory.new_arrivals": "Recém chegados",
   "directory.recently_active": "Com actividade recente",
-  "embed.instructions": "Publica esta publicação no teu site copiando o código abaixo.",
+  "embed.instructions": "Incorpora esta publicação no teu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
   "emoji_button.custom": "Personalizar",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Sem toots por aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
-  "empty_column.bookmarked_statuses": "Ainda não assinalou toots como favoritos. Quando o fizer, eles aparecerão aqui.",
+  "empty_column.bookmarked_statuses": "Ainda não adicionou nenhum toot aos Itens salvos. Quando adicionar, eles serão exibidos aqui.",
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
   "empty_column.direct": "Ainda não tens qualquer mensagem directa. Quando enviares ou receberes alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
@@ -214,7 +214,7 @@
   "keyboard_shortcuts.description": "Descrição",
   "keyboard_shortcuts.direct": "para abrir a coluna das mensagens directas",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
-  "keyboard_shortcuts.enter": "para expandir um estado",
+  "keyboard_shortcuts.enter": "para expandir uma publicação",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
   "keyboard_shortcuts.favourites": "para abrir a lista dos favoritos",
   "keyboard_shortcuts.federated": "para abrir a cronologia federada",
@@ -254,13 +254,13 @@
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
   "loading_indicator.label": "A carregar...",
-  "media_gallery.toggle_visible": "Mostrar/ocultar",
+  "media_gallery.toggle_visible": "Alternar visibilidade",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Este recurso não foi encontrado",
   "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
   "navigation_bar.apps": "Aplicações móveis",
   "navigation_bar.blocks": "Utilizadores bloqueados",
-  "navigation_bar.bookmarks": "Favoritos",
+  "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronologia local",
   "navigation_bar.compose": "Escrever novo toot",
   "navigation_bar.direct": "Mensagens directas",
@@ -281,13 +281,13 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.security": "Segurança",
-  "notification.favourite": "{name} adicionou o teu estado aos favoritos",
+  "notification.favourite": "{name} adicionou a tua publicação aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.mention": "{name} mencionou-te",
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em participaste chegou ao fim",
-  "notification.reblog": "{name} fez boost ao teu o teu estado",
+  "notification.reblog": "{name} partilhou a tua publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
   "notifications.column_settings.alert": "Notificações no computador",
@@ -318,7 +318,7 @@
   "poll.voted": "Você votou nesta resposta",
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover votação",
-  "privacy.change": "Ajustar a privacidade da mensagem",
+  "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
   "privacy.direct.short": "Directo",
   "privacy.private.long": "Apenas para os seguidores",
@@ -347,7 +347,7 @@
   "search_popout.search_format": "Formato avançado de pesquisa",
   "search_popout.tips.full_text": "Texto simples devolve publicações que tu escreveste, marcaste como favorita, partilhaste ou em que foste mencionado, tal como nomes de utilizador correspondentes, alcunhas e hashtags.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "estado",
+  "search_popout.tips.status": "publicação",
   "search_popout.tips.text": "O texto simples retorna a correspondência de nomes, utilizadores e hashtags",
   "search_popout.tips.user": "utilizador",
   "search_results.accounts": "Pessoas",
@@ -358,7 +358,7 @@
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
   "status.block": "Bloquear @{name}",
-  "status.bookmark": "Favorito",
+  "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Remover boost",
   "status.cannot_reblog": "Não é possível fazer boost a esta publicação",
   "status.copy": "Copiar o link para a publicação",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name} fez boost",
   "status.reblogs.empty": "Ainda ninguém fez boost a este toot. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
-  "status.remove_bookmark": "Remover favorito",
+  "status.remove_bookmark": "Remover dos itens salvos",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
@@ -394,7 +394,7 @@
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
   "status.show_thread": "Mostrar conversa",
-  "status.uncached_media_warning": "Não diponível",
+  "status.uncached_media_warning": "Não disponível",
   "status.unmute_conversation": "Deixar de silenciar esta conversa",
   "status.unpin": "Não fixar no perfil",
   "suggestions.dismiss": "Dispensar a sugestão",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index f805215c1..ac88661bb 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -41,7 +41,7 @@
   "account.unmute_notifications": "Показывать уведомления от @{name}",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Вы выполняете действие слишком часто",
-  "alert.unexpected.message": "Что-то пошло не так.",
+  "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Ой!",
   "announcement.announcement": "Объявление",
   "autosuggest_hashtag.per_week": "{count} / неделю",
@@ -155,12 +155,12 @@
   "empty_column.home.public_timeline": "публичные ленты",
   "empty_column.list": "В этом списке пока ничего нет.",
   "empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
-  "empty_column.mutes": "Вы никого не игнорируете и всех внимательно выслушиваете.",
+  "empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
   "empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
   "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
   "error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
   "error.unexpected_crash.next_steps": "Попробуйте обновить страницу. Если проблема не исчезает, используйте Mastodon из-под другого браузера или приложения.",
-  "errors.unexpected_crash.copy_stacktrace": "Копировать стектрейс в буфер обмена",
+  "errors.unexpected_crash.copy_stacktrace": "Скопировать диагностическую информацию",
   "errors.unexpected_crash.report_issue": "Сообщить о проблеме",
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
@@ -197,12 +197,12 @@
   "introduction.federation.local.headline": "Локальная лента",
   "introduction.federation.local.text": "Публичные посты от людей с того же сервера, что и вы, будут отображены в локальной ленте.",
   "introduction.interactions.action": "Завершить обучение",
-  "introduction.interactions.favourite.headline": "Отметки «нравится»",
+  "introduction.interactions.favourite.headline": "Помечайте избранное",
   "introduction.interactions.favourite.text": "Дайте автору знать, что пост вам понравился и вернитесь к нему позже, добавив его в избранное.",
-  "introduction.interactions.reblog.headline": "Продвижения",
-  "introduction.interactions.reblog.text": "Вы можете делиться постами других людей, продвигая их в своей учётной записи.",
-  "introduction.interactions.reply.headline": "Ответы",
-  "introduction.interactions.reply.text": "Вы можете отвечать свои и чужие посты, образуя цепочки сообщений (обсуждения).",
+  "introduction.interactions.reblog.headline": "Продвигайте",
+  "introduction.interactions.reblog.text": "Делитесь постами других людей со своими подписчиками, продвигая их в своём профиле.",
+  "introduction.interactions.reply.headline": "Отвечайте",
+  "introduction.interactions.reply.text": "Отвечайте на свои или чужие посты, образуя цепочки сообщений — обсуждения.",
   "introduction.welcome.action": "Поехали!",
   "introduction.welcome.headline": "Первые шаги",
   "introduction.welcome.text": "Добро пожаловать в Федиверс! Уже через мгновение вы сможете отправлять сообщения и общаться со своими друзьями с любых узлов. Но этот узел — {domain} — особенный: на нём располагается ваш профиль, так что не забудьте его название.",
@@ -366,7 +366,7 @@
   "status.detailed_status": "Подробный просмотр обсуждения",
   "status.direct": "Написать @{name}",
   "status.embed": "Встроить на свой сайт",
-  "status.favourite": "Нравится",
+  "status.favourite": "В избранное",
   "status.filtered": "Отфильтровано",
   "status.load_more": "Загрузить остальное",
   "status.media_hidden": "Файл скрыт",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ad4407e9d..819496911 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -10,12 +10,12 @@
   "account.domain_blocked": "Doména ukrytá",
   "account.edit_profile": "Uprav profil",
   "account.endorse": "Zobrazuj na profile",
-  "account.follow": "Následuj",
+  "account.follow": "Nasleduj",
   "account.followers": "Sledujúci",
-  "account.followers.empty": "Tohto užívateľa ešte nikto nenásleduje.",
-  "account.follows": "Následuje",
-  "account.follows.empty": "Tento užívateľ ešte nikoho nenásleduje.",
-  "account.follows_you": "Následuje ťa",
+  "account.followers.empty": "Tohto používateľa ešte nikto nenásleduje.",
+  "account.follows": "Nasleduje",
+  "account.follows.empty": "Tento používateľ ešte nikoho nenasleduje.",
+  "account.follows_you": "Nasleduje ťa",
   "account.hide_reblogs": "Skry vyzdvihnutia od @{name}",
   "account.last_status": "Naposledy aktívny",
   "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
@@ -193,7 +193,7 @@
   "introduction.federation.federated.headline": "Federovaná",
   "introduction.federation.federated.text": "Verejné príspevky z ostatných serverov vo fediverse budú zobrazené vo federovanej časovej osi.",
   "introduction.federation.home.headline": "Domovská",
-  "introduction.federation.home.text": "Príspevky od ľudí ktorých následuješ sa zobrazia na tvojej domovskej nástenke. Môžeš následovať hocikoho na ktoromkoľvek serveri!",
+  "introduction.federation.home.text": "Príspevky od ľudí ktorých nasleduješ sa zobrazia na tvojej domovskej nástenke. Môžeš nasledovať hocikoho na ktoromkoľvek serveri!",
   "introduction.federation.local.headline": "Miestna",
   "introduction.federation.local.text": "Verejné príspevky od ľudí v rámci toho istého serveru na akom si aj ty, budú zobrazované na miestnej časovej osi.",
   "introduction.interactions.action": "Ukonči návod!",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index fbe48bf2e..b50cc611c 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -1,11 +1,11 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Додај или Одстрани са листа",
   "account.badges.bot": "Бот",
-  "account.badges.group": "Group",
+  "account.badges.group": "Група",
   "account.block": "Блокирај @{name}",
   "account.block_domain": "Сакриј све са домена {domain}",
   "account.blocked": "Блокиран",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Поништи захтеве за праћење",
   "account.direct": "Директна порука @{name}",
   "account.domain_blocked": "Домен сакривен",
   "account.edit_profile": "Измени профил",
@@ -17,16 +17,16 @@
   "account.follows.empty": "Корисник тренутно не прати никога.",
   "account.follows_you": "Прати Вас",
   "account.hide_reblogs": "Сакриј подршке које даје корисника @{name}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.last_status": "Последњи пут активан/на",
+  "account.link_verified_on": "Власништво над овом везом је проверено {date}",
+  "account.locked_info": "Статус приватности овог налога је подешен на закључано. Власник ручно прегледа ко га може пратити.",
   "account.media": "Медији",
   "account.mention": "Помени корисника @{name}",
   "account.moved_to": "{name} се померио на:",
   "account.mute": "Ућуткај корисника @{name}",
   "account.mute_notifications": "Искључи обавештења од корисника @{name}",
   "account.muted": "Ућуткан",
-  "account.never_active": "Never",
+  "account.never_active": "Никада",
   "account.posts": "Трубе",
   "account.posts_with_replies": "Трубе и одговори",
   "account.report": "Пријави @{name}",
@@ -39,12 +39,12 @@
   "account.unfollow": "Отпрати",
   "account.unmute": "Уклони ућуткавање кориснику @{name}",
   "account.unmute_notifications": "Укључи назад обавештења од корисника @{name}",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.message": "Молимо покушајте поново после {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ограничена брзина",
   "alert.unexpected.message": "Појавила се неочекивана грешка.",
   "alert.unexpected.title": "Упс!",
-  "announcement.announcement": "Announcement",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "announcement.announcement": "Најава",
+  "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.body": "Нешто је пошло по злу приликом учитавања ове компоненте.",
   "bundle_column_error.retry": "Покушајте поново",
@@ -53,10 +53,10 @@
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
   "column.blocks": "Блокирани корисници",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
-  "column.directory": "Browse profiles",
+  "column.directory": "Претражиј профиле",
   "column.domain_blocks": "Скривени домени",
   "column.favourites": "Омиљене",
   "column.follow_requests": "Захтеви за праћење",
@@ -81,22 +81,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "Шта Вам је на уму?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.add_option": "Додајте избор",
+  "compose_form.poll.duration": "Трајање анкете",
+  "compose_form.poll.option_placeholder": "Избор {number}",
+  "compose_form.poll.remove_option": "Одстрани овај избор",
+  "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
+  "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
   "compose_form.publish": "Труби",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.hide": "Означи мултимедију као осетљиву",
   "compose_form.sensitive.marked": "Медији су означени као осетљиви",
   "compose_form.sensitive.unmarked": "Медији су означени као не-осетљиви",
   "compose_form.spoiler.marked": "Текст је сакривен иза упозорења",
   "compose_form.spoiler.unmarked": "Текст није сакривен",
   "compose_form.spoiler_placeholder": "Овде упишите упозорење",
   "confirmation_modal.cancel": "Поништи",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
   "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
   "confirmations.delete.confirm": "Обриши",
@@ -105,25 +105,25 @@
   "confirmations.delete_list.message": "Да ли сте сигурни да желите да бесповратно обришете ову листу?",
   "confirmations.domain_block.confirm": "Сакриј цео домен",
   "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, неколико добро промишљених блокирања или ућуткавања су довољна и препоручљива.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.confirm": "Одјави се",
+  "confirmations.logout.message": "Да ли се сигурни да желите да се одјавите?",
   "confirmations.mute.confirm": "Ућуткај",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "Ово ће сакрити објаве од њих и објаве које их помињу, али ће им и даље дозволити да виде ваше постове и да вас запрате.",
   "confirmations.mute.message": "Да ли стварно желите да ућуткате корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете овај статус и да га преправите? Сва стављања у омиљене трубе, као и подршке ће бити изгубљене, а одговори на оригинални пост ће бити поништени.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.confirm": "Одговори",
+  "confirmations.reply.message": "Одговарањем ћете обрисати поруку коју састављате. Јесте ли сигурни да желите да наставите?",
   "confirmations.unfollow.confirm": "Отпрати",
   "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "conversation.delete": "Обриши преписку",
+  "conversation.mark_as_read": "Означи као прочитано",
+  "conversation.open": "Прикажи преписку",
+  "conversation.with": "Са {names}",
+  "directory.federated": "Са знаних здружених инстанци",
+  "directory.local": "Само са {domain}",
+  "directory.new_arrivals": "Новопридошли",
+  "directory.recently_active": "Недавно активни",
   "embed.instructions": "Угради овај статус на Ваш веб сајт копирањем кода испод.",
   "embed.preview": "Овако ће да изгледа:",
   "emoji_button.activity": "Активност",
@@ -140,10 +140,10 @@
   "emoji_button.search_results": "Резултати претраге",
   "emoji_button.symbols": "Симболи",
   "emoji_button.travel": "Путовања и места",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.account_timeline": "Овде нема труба!",
+  "empty_column.account_unavailable": "Профил недоступан",
   "empty_column.blocks": "Још увек немате блокираних корисника.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Још увек немате обележене трубе. Када их обележите, појавиће се овде.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
   "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.",
   "empty_column.domain_blocks": "Још увек нема сакривених домена.",
@@ -158,41 +158,41 @@
   "empty_column.mutes": "Још увек немате ућутканих корисника.",
   "empty_column.notifications": "Тренутно немате обавештења. Дружите се мало да започнете разговор.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно, или нађите кориснике са других инстанци које ћете запратити да попуните ову празнину",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
+  "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
+  "error.unexpected_crash.next_steps": "Покушајте да освежите страницу. Ако то не помогне, можда ћете и даље моћи да користите Мастодон путем другог прегледача или матичне апликације.",
+  "errors.unexpected_crash.copy_stacktrace": "Копирај \"stacktrace\" у клипборд",
+  "errors.unexpected_crash.report_issue": "Пријави проблем",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "getting_started.developers": "Програмери",
-  "getting_started.directory": "Profile directory",
+  "getting_started.directory": "Профил фасцикле",
   "getting_started.documentation": "Документација",
   "getting_started.heading": "Да почнете",
   "getting_started.invite": "Позовите људе",
   "getting_started.open_source_notice": "Мастoдон је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко ГитХаба на {github}.",
   "getting_started.security": "Безбедност",
   "getting_started.terms": "Услови коришћења",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "и {additional}",
+  "hashtag.column_header.tag_mode.any": "или {additional}",
+  "hashtag.column_header.tag_mode.none": "без {additional}",
+  "hashtag.column_settings.select.no_options_message": "Нису пронађени предлози",
+  "hashtag.column_settings.select.placeholder": "Унеси хештег…",
+  "hashtag.column_settings.tag_mode.all": "Све оve",
+  "hashtag.column_settings.tag_mode.any": "Било које од ових",
+  "hashtag.column_settings.tag_mode.none": "Ништа од ових",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи и подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
+  "home.hide_announcements": "Сакриј најаве",
+  "home.show_announcements": "Пријажи најаве",
+  "intervals.full.days": "{number, plural, one {# дан} other {# дана}}",
+  "intervals.full.hours": "{number, plural, one {# сат} other {# сати}}",
+  "intervals.full.minutes": "{number, plural, one {# минут} other {# минута}}",
+  "introduction.federation.action": "Даље",
+  "introduction.federation.federated.headline": "Федерисано",
+  "introduction.federation.federated.text": "Јавне објаве са осталих сервера из здружених инстанци ће се појавити у федерисаној временској линији.",
+  "introduction.federation.home.headline": "Почетна",
   "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
   "introduction.federation.local.headline": "Local",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
@@ -355,13 +355,13 @@
   "search_results.statuses": "Трубе",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_account": "Отвори модераторски интерфејс за @{name}",
+  "status.admin_status": "Отвори овај статус у модераторском интерфејсу",
   "status.block": "Блокирај @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Обележи",
   "status.cancel_reblog_private": "Уклони подршку",
   "status.cannot_reblog": "Овај статус не може да се подржи",
-  "status.copy": "Copy link to status",
+  "status.copy": "Копирај везу на статус",
   "status.delete": "Обриши",
   "status.detailed_status": "Детаљни преглед разговора",
   "status.direct": "Директна порука @{name}",
@@ -377,13 +377,13 @@
   "status.open": "Прошири овај статус",
   "status.pin": "Закачи на профил",
   "status.pinned": "Закачена труба",
-  "status.read_more": "Read more",
+  "status.read_more": "Прочитајте више",
   "status.reblog": "Подржи",
   "status.reblog_private": "Подржи да види првобитна публика",
   "status.reblogged_by": "{name} подржао/ла",
   "status.reblogs.empty": "Још увек нико није подржао ову трубу. Када буде подржана, појавиће се овде.",
   "status.redraft": "Избриши и преправи",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "Уклони обележивач",
   "status.reply": "Одговори",
   "status.replyAll": "Одговори на дискусију",
   "status.report": "Пријави корисника @{name}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 29b8b023e..763dae5ef 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Dölj notiser",
+  "home.show_announcements": "Visa notiser",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# timme} other {# timmar}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuter}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "nu",
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
-  "relative_time.today": "today",
+  "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
   "report.forward": "Vidarebefordra till {target}",
   "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 71de4beaf..479d0ab31 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "บอต",
   "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
-  "account.block_domain": "ซ่อนทุกอย่างจาก {domain}",
+  "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.blocked": "ปิดกั้นอยู่",
   "account.cancel_follow_request": "ยกเลิกคำขอติดตาม",
   "account.direct": "ส่งข้อความโดยตรงถึง @{name}",
-  "account.domain_blocked": "ซ่อนโดเมนอยู่",
+  "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
   "account.edit_profile": "แก้ไขโปรไฟล์",
   "account.endorse": "แสดงให้เห็นในโปรไฟล์",
   "account.follow": "ติดตาม",
@@ -34,7 +34,7 @@
   "account.share": "แบ่งปันโปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
   "account.unblock": "เลิกปิดกั้น @{name}",
-  "account.unblock_domain": "เลิกซ่อน {domain}",
+  "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
   "account.unendorse": "ไม่แสดงให้เห็นในโปรไฟล์",
   "account.unfollow": "เลิกติดตาม",
   "account.unmute": "เลิกปิดเสียง @{name}",
@@ -54,10 +54,10 @@
   "bundle_modal_error.retry": "ลองอีกครั้ง",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "ที่คั่นหน้า",
-  "column.community": "เส้นเวลาในเว็บ",
+  "column.community": "เส้นเวลาในเซิร์ฟเวอร์",
   "column.direct": "ข้อความโดยตรง",
   "column.directory": "เรียกดูโปรไฟล์",
-  "column.domain_blocks": "โดเมนที่ซ่อนอยู่",
+  "column.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "column.favourites": "รายการโปรด",
   "column.follow_requests": "คำขอติดตาม",
   "column.home": "หน้าแรก",
@@ -103,7 +103,7 @@
   "confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบสถานะนี้?",
   "confirmations.delete_list.confirm": "ลบ",
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
-  "confirmations.domain_block.confirm": "ซ่อนทั้งโดเมน",
+  "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
   "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการปิดเสียงแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
@@ -144,9 +144,9 @@
   "empty_column.account_unavailable": "ไม่มีโปรไฟล์",
   "empty_column.blocks": "คุณยังไม่ได้ปิดกั้นผู้ใช้ใด ๆ",
   "empty_column.bookmarked_statuses": "คุณยังไม่มีโพสต์ที่เพิ่มที่คั่นหน้าไว้ใด ๆ เมื่อคุณเพิ่มที่คั่นหน้าโพสต์ โพสต์จะปรากฏที่นี่",
-  "empty_column.community": "เส้นเวลาในเว็บว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
+  "empty_column.community": "เส้นเวลาในเซิร์ฟเวอร์ว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
   "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
-  "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ซ่อนอยู่",
+  "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ปิดกั้นอยู่",
   "empty_column.favourited_statuses": "คุณยังไม่มีโพสต์ที่ชื่นชอบใด ๆ เมื่อคุณชื่นชอบโพสต์ โพสต์จะปรากฏที่นี่",
   "empty_column.favourites": "ยังไม่มีใครชื่นชอบโพสต์นี้ เมื่อใครสักคนชื่นชอบ เขาจะปรากฏที่นี่",
   "empty_column.follow_requests": "คุณยังไม่มีคำขอติดตามใด ๆ เมื่อคุณได้รับคำขอ คำขอจะปรากฏที่นี่",
@@ -194,8 +194,8 @@
   "introduction.federation.federated.text": "โพสต์สาธารณะจากเซิร์ฟเวอร์อื่น ๆ ของเฟดิเวิร์สจะปรากฏในเส้นเวลาที่ติดต่อกับภายนอก",
   "introduction.federation.home.headline": "หน้าแรก",
   "introduction.federation.home.text": "โพสต์จากผู้คนที่คุณติดตามจะปรากฏในฟีดหน้าแรกของคุณ คุณสามารถติดตามใครก็ตามในเซิร์ฟเวอร์ใดก็ตาม!",
-  "introduction.federation.local.headline": "ในเว็บ",
-  "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเว็บ",
+  "introduction.federation.local.headline": "ในเซิร์ฟเวอร์",
+  "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเซิร์ฟเวอร์",
   "introduction.interactions.action": "เสร็จสิ้นบทช่วยสอน!",
   "introduction.interactions.favourite.headline": "ชื่นชอบ",
   "introduction.interactions.favourite.text": "คุณสามารถบันทึกโพสต์ไว้ในภายหลังและแจ้งให้ผู้สร้างทราบว่าคุณชอบโพสต์โดยการชื่นชอบโพสต์",
@@ -222,7 +222,7 @@
   "keyboard_shortcuts.home": "เพื่อเปิดเส้นเวลาหน้าแรก",
   "keyboard_shortcuts.hotkey": "ปุ่มลัด",
   "keyboard_shortcuts.legend": "เพื่อแสดงคำอธิบายนี้",
-  "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเว็บ",
+  "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเซิร์ฟเวอร์",
   "keyboard_shortcuts.mention": "เพื่อกล่าวถึงผู้สร้าง",
   "keyboard_shortcuts.muted": "เพื่อเปิดรายการผู้ใช้ที่ปิดเสียงอยู่",
   "keyboard_shortcuts.my_profile": "เพื่อเปิดโปรไฟล์ของคุณ",
@@ -254,18 +254,18 @@
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด...",
-  "media_gallery.toggle_visible": "เปิด/ปิดการมองเห็น",
+  "media_gallery.toggle_visible": "ซ่อนสื่อ",
   "missing_indicator.label": "ไม่พบ",
   "missing_indicator.sublabel": "ไม่พบทรัพยากรนี้",
   "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
   "navigation_bar.apps": "แอปมือถือ",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
-  "navigation_bar.community_timeline": "เส้นเวลาในเว็บ",
+  "navigation_bar.community_timeline": "เส้นเวลาในเซิร์ฟเวอร์",
   "navigation_bar.compose": "เขียนโพสต์ใหม่",
   "navigation_bar.direct": "ข้อความโดยตรง",
   "navigation_bar.discover": "ค้นพบ",
-  "navigation_bar.domain_blocks": "โดเมนที่ซ่อนอยู่",
+  "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ปิดเสียงอยู่",
@@ -319,13 +319,13 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของสถานะ",
-  "privacy.direct.long": "โพสต์ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
+  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
   "privacy.direct.short": "โดยตรง",
-  "privacy.private.long": "โพสต์ไปยังผู้ติดตามเท่านั้น",
+  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
   "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "โพสต์ไปยังเส้นเวลาสาธารณะ",
+  "privacy.public.long": "ปรากฏแก่ทุกคน แสดงในเส้นเวลาสาธารณะ",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ไม่โพสต์ไปยังเส้นเวลาสาธารณะ",
+  "privacy.unlisted.long": "ปรากฏแก่ทุกคน แต่ไม่อยู่ในเส้นเวลาสาธารณะ",
   "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
@@ -401,7 +401,7 @@
   "suggestions.header": "คุณอาจสนใจ…",
   "tabs_bar.federated_timeline": "ที่ติดต่อกับภายนอก",
   "tabs_bar.home": "หน้าแรก",
-  "tabs_bar.local_timeline": "ในเว็บ",
+  "tabs_bar.local_timeline": "ในเซิร์ฟเวอร์",
   "tabs_bar.notifications": "การแจ้งเตือน",
   "tabs_bar.search": "ค้นหา",
   "time_remaining.days": "เหลืออีก {number, plural, other {# วัน}}",
@@ -409,7 +409,7 @@
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",
   "time_remaining.moments": "ช่วงเวลาที่เหลือ",
   "time_remaining.seconds": "เหลืออีก {number, plural, other {# วินาที}}",
-  "trends.count_by_accounts": "{count} {rawCount, plural, other {คน}}กำลังคุย",
+  "trends.count_by_accounts": "{count} {rawCount, plural, other {คน}}กำลังพูดคุย",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
   "upload_area.title": "ลากแล้วปล่อยเพื่ออัปโหลด",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 664eebfbf..d625a88bf 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 41ecfe1f2..57658706a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -158,7 +158,7 @@
   "empty_column.mutes": "你没有隐藏任何用户。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
-  "error.unexpected_crash.explanation": "此页面无法正确现实，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
+  "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
   "error.unexpected_crash.next_steps": "刷新一下页面试试。如果没用，您可以换个浏览器或者用本地应用。",
   "errors.unexpected_crash.copy_stacktrace": "把堆栈跟踪信息复制到剪贴板",
   "errors.unexpected_crash.report_issue": "报告问题",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 12f154a2c..a321e5a66 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機械人",
-  "account.badges.group": "Group",
+  "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的一切文章",
   "account.blocked": "封鎖",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生不可預期的錯誤。",
   "alert.unexpected.title": "噢！",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "公告",
   "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，",
   "bundle_column_error.body": "加載本組件出錯。",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.option_placeholder": "第 {number} 個選擇",
   "compose_form.poll.remove_option": "移除此選擇",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
+  "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.publish": "發文",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "隱藏公告",
+  "home.show_announcements": "顯示公告",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number}分鐘",
   "relative_time.seconds": "{number}秒",
-  "relative_time.today": "today",
+  "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳戶屬於其他服務站。要向該服務站發送匿名的舉報訊息嗎？",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 56c4de066..112d5cb2f 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機器人",
-  "account.badges.group": "Group",
+  "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的所有內容",
   "account.blocked": "已封鎖",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生了非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "公告",
   "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.body": "載入此元件時發生錯誤。",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.option_placeholder": "第 {number} 個選擇",
   "compose_form.poll.remove_option": "移除此選擇",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
+  "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.publish": "嘟出去",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "隱藏公告",
+  "home.show_announcements": "顯示公告",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number} 分",
   "relative_time.seconds": "{number} 秒",
-  "relative_time.today": "today",
+  "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳戶屬於其他站點。要像該站點發送匿名的檢舉訊息嗎?",
diff --git a/app/javascript/mastodon/middleware/errors.js b/app/javascript/mastodon/middleware/errors.js
index 3cebb42e0..0a65fd321 100644
--- a/app/javascript/mastodon/middleware/errors.js
+++ b/app/javascript/mastodon/middleware/errors.js
@@ -8,7 +8,7 @@ export default function errorsMiddleware() {
       const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
 
       if (action.type.match(isFail)) {
-        dispatch(showAlertForError(action.error));
+        dispatch(showAlertForError(action.error, action.skipNotFound));
       }
     }
 
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index c6653fe4c..e6e6d2ae1 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -261,7 +261,6 @@ export default function compose(state = initialState, action) {
     });
   case COMPOSE_SPOILERNESS_CHANGE:
     return state.withMutations(map => {
-      map.set('spoiler_text', '');
       map.set('spoiler', !state.get('spoiler'));
       map.set('idempotencyKey', uuid());
 
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 60e901e39..ed1ba0272 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -72,11 +72,11 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
 
       mutable.update(usePendingItems ? 'pendingItems' : 'items', list => {
         const lastIndex = 1 + list.findLastIndex(
-          item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id'))
+          item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id')),
         );
 
         const firstIndex = 1 + list.take(lastIndex).findLastIndex(
-          item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0
+          item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0,
         );
 
         return list.take(firstIndex).concat(items, list.skip(lastIndex));
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 0d7222e10..63b76773d 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -54,7 +54,7 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
 
         return oldIds.take(firstIndex + 1).concat(
           isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds,
-          oldIds.skip(lastIndex)
+          oldIds.skip(lastIndex),
         );
       });
     }
@@ -166,7 +166,7 @@ export default function timelines(state = initialState, action) {
     return state.update(
       action.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items)
+      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
     );
   default:
     return state;
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 6a48f3b3f..673268c5a 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -117,7 +117,7 @@ export const makeGetStatus = () => {
         map.set('account', accountBase);
         map.set('filtered', filtered);
       });
-    }
+    },
   );
 };
 
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 1ab0dc0fa..958e5fc12 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -117,7 +117,7 @@ const handlePush = (event) => {
         badge: '/badge.png',
         data: { access_token, preferred_locale, url: '/web/notifications' },
       });
-    })
+    }),
   );
 };
 
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index 7e7472841..e18af842f 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -10,6 +10,6 @@ export default function configureStore() {
     thunk,
     loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
     errorsMiddleware(),
-    soundsMiddleware()
+    soundsMiddleware(),
   ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f));
 };
diff --git a/app/javascript/mastodon/utils/log_out.js b/app/javascript/mastodon/utils/log_out.js
index b43417f4b..3a4cc8ecb 100644
--- a/app/javascript/mastodon/utils/log_out.js
+++ b/app/javascript/mastodon/utils/log_out.js
@@ -1,4 +1,4 @@
-import Rails from 'rails-ujs';
+import Rails from '@rails/ujs';
 
 export const logOut = () => {
   const form = document.createElement('form');
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index b318cadc6..51f92de8a 100644
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -1,4 +1,4 @@
-import { delegate } from 'rails-ujs';
+import { delegate } from '@rails/ujs';
 import ready from '../mastodon/ready';
 
 const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
@@ -30,6 +30,10 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
   });
 });
 
+delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
+  target.form.submit();
+});
+
 const onDomainBlockSeverityChange = (target) => {
   const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
   const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 2fb9cb29d..85789c8aa 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -25,7 +25,7 @@ window.addEventListener('message', e => {
 function main() {
   const IntlMessageFormat = require('intl-messageformat').default;
   const { timeAgoString } = require('../mastodon/components/relative_timestamp');
-  const { delegate } = require('rails-ujs');
+  const { delegate } = require('@rails/ujs');
   const emojify = require('../mastodon/features/emoji/emoji').default;
   const { getLocale } = require('../mastodon/locales');
   const { messages } = getLocale();
@@ -118,6 +118,28 @@ function main() {
 
     delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
     delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
+
+    delegate(document, '.status__content__spoiler-link', 'click', function() {
+      const contentEl = this.parentNode.parentNode.querySelector('.e-content');
+
+      if (contentEl.style.display === 'block') {
+        contentEl.style.display = 'none';
+        this.parentNode.style.marginBottom = 0;
+        this.textContent = (new IntlMessageFormat(messages['status.show_more'] || 'Show more', locale)).format();
+      } else {
+        contentEl.style.display = 'block';
+        this.parentNode.style.marginBottom = null;
+        this.textContent = (new IntlMessageFormat(messages['status.show_less'] || 'Show less', locale)).format();
+      }
+
+      return false;
+    });
+
+    [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
+      const contentEl = spoilerLink.parentNode.parentNode.querySelector('.e-content');
+      const message = (contentEl.style.display === 'block') ? (messages['status.show_less'] || 'Show less') : (messages['status.show_more'] || 'Show more');
+      spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
+    });
   });
 
   delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
@@ -128,20 +150,6 @@ function main() {
     return false;
   });
 
-  delegate(document, '.status__content__spoiler-link', 'click', function() {
-    const contentEl = this.parentNode.parentNode.querySelector('.e-content');
-
-    if (contentEl.style.display === 'block') {
-      contentEl.style.display = 'none';
-      this.parentNode.style.marginBottom = 0;
-    } else {
-      contentEl.style.display = 'block';
-      this.parentNode.style.marginBottom = null;
-    }
-
-    return false;
-  });
-
   delegate(document, '.modal-button', 'click', e => {
     e.preventDefault();
 
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 05e52966b..7a846bcc6 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -142,7 +142,7 @@ html {
 }
 
 .compose-form__autosuggest-wrapper,
-.poll__text input[type="text"],
+.poll__option input[type="text"],
 .compose-form .spoiler-input__input,
 .compose-form__poll-wrapper select,
 .search__input,
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index b0307fb71..cee44f436 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -418,6 +418,11 @@ body,
       }
     }
 
+    &--with-select strong {
+      display: block;
+      margin-bottom: 10px;
+    }
+
     a {
       display: inline-block;
       color: $darker-text-color;
@@ -551,19 +556,22 @@ body,
 }
 
 .log-entry {
-  margin-bottom: 20px;
   line-height: 20px;
+  padding: 15px 0;
+  background: $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 4%);
+
+  &:last-child {
+    border-bottom: 0;
+  }
 
   &__header {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    padding: 10px;
-    background: $ui-base-color;
     color: $darker-text-color;
-    border-radius: 4px 4px 0 0;
     font-size: 14px;
-    position: relative;
+    padding: 0 10px;
   }
 
   &__avatar {
@@ -590,44 +598,6 @@ body,
     color: $dark-text-color;
   }
 
-  &__extras {
-    background: lighten($ui-base-color, 6%);
-    border-radius: 0 0 4px 4px;
-    padding: 10px;
-    color: $darker-text-color;
-    font-family: $font-monospace, monospace;
-    font-size: 12px;
-    word-wrap: break-word;
-    min-height: 20px;
-  }
-
-  &__icon {
-    font-size: 28px;
-    margin-right: 10px;
-    color: $dark-text-color;
-  }
-
-  &__icon__overlay {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-
-    &.positive {
-      background: $success-green;
-    }
-
-    &.negative {
-      background: lighten($error-red, 12%);
-    }
-
-    &.neutral {
-      background: $ui-highlight-color;
-    }
-  }
-
   a,
   .username,
   .target {
@@ -635,18 +605,6 @@ body,
     text-decoration: none;
     font-weight: 500;
   }
-
-  .diff-old {
-    color: lighten($error-red, 12%);
-  }
-
-  .diff-neutral {
-    color: $secondary-text-color;
-  }
-
-  .diff-new {
-    color: $success-green;
-  }
 }
 
 a.name-tag,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a51781a36..82ca04fff 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -388,8 +388,8 @@
 
   .emoji-picker-dropdown {
     position: absolute;
-    top: 5px;
-    right: 5px;
+    top: 0;
+    right: 0;
   }
 
   .compose-form__autosuggest-wrapper {
@@ -889,6 +889,7 @@
 
 .announcements__item__content {
   word-wrap: break-word;
+  overflow-y: auto;
 
   .emojione {
     width: 20px;
@@ -1046,13 +1047,11 @@
     }
 
     .display-name {
+      color: $light-text-color;
+
       strong {
         color: $inverted-text-color;
       }
-
-      span {
-        color: $light-text-color;
-      }
     }
 
     .status__content {
@@ -1351,7 +1350,6 @@
     border-radius: 50%;
     overflow: hidden;
     position: relative;
-    cursor: default;
 
     & > div {
       float: left;
@@ -3805,7 +3803,8 @@ a.status-card.compact:hover {
 }
 
 .empty-column-indicator,
-.error-column {
+.error-column,
+.follow_requests-unlocked_explanation {
   color: $dark-text-color;
   background: $ui-base-color;
   text-align: center;
@@ -3836,6 +3835,11 @@ a.status-card.compact:hover {
   }
 }
 
+.follow_requests-unlocked_explanation {
+  background: darken($ui-base-color, 4%);
+  contain: initial;
+}
+
 .error-column {
   flex-direction: column;
 }
@@ -4063,10 +4067,7 @@ a.status-card.compact:hover {
 
 .emoji-button {
   display: block;
-  font-size: 24px;
-  line-height: 24px;
-  margin-left: 2px;
-  width: 24px;
+  padding: 5px 5px 2px 2px;
   outline: 0;
   cursor: pointer;
 
@@ -4082,7 +4083,6 @@ a.status-card.compact:hover {
     margin: 0;
     width: 22px;
     height: 22px;
-    margin-top: 2px;
   }
 
   &:hover,
@@ -5061,12 +5061,6 @@ a.status-card.compact:hover {
 }
 
 .media-gallery__gifv {
-  &.autoplay {
-    .media-gallery__gifv__label {
-      display: none;
-    }
-  }
-
   &:hover {
     .media-gallery__gifv__label {
       opacity: 1;
@@ -6583,6 +6577,7 @@ noscript {
     padding: 10px;
     padding-top: 12px;
     position: relative;
+    cursor: pointer;
   }
 
   &__unread {
@@ -6686,17 +6681,21 @@ noscript {
     box-sizing: border-box;
     width: 100%;
     padding: 15px;
-    padding-right: 15px + 18px;
     position: relative;
     font-size: 15px;
     line-height: 20px;
     word-wrap: break-word;
     font-weight: 400;
+    max-height: 50vh;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     &__range {
       display: block;
       font-weight: 500;
       margin-bottom: 10px;
+      padding-right: 18px;
     }
 
     &__unread {
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index d7d850a1e..1ecc8434d 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -8,20 +8,18 @@
   }
 
   &__chart {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    display: inline-block;
     border-radius: 4px;
-    background: darken($ui-primary-color, 14%);
+    display: block;
+    background: darken($ui-primary-color, 5%);
+    height: 5px;
+    min-width: 1%;
 
     &.leading {
       background: $ui-highlight-color;
     }
   }
 
-  &__text {
+  &__option {
     position: relative;
     display: flex;
     padding: 6px 0;
@@ -29,6 +27,13 @@
     cursor: default;
     overflow: hidden;
 
+    &__text {
+      display: inline-block;
+      word-wrap: break-word;
+      overflow-wrap: break-word;
+      max-width: calc(100% - 45px - 25px);
+    }
+
     input[type=radio],
     input[type=checkbox] {
       display: none;
@@ -95,8 +100,8 @@
     &:active,
     &:focus,
     &:hover {
+      border-color: lighten($valid-value-color, 15%);
       border-width: 4px;
-      background: none;
     }
 
     &::-moz-focus-inner {
@@ -112,19 +117,18 @@
 
   &__number {
     display: inline-block;
-    width: 52px;
+    width: 45px;
     font-weight: 700;
-    padding: 0 10px;
-    padding-left: 8px;
-    text-align: right;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 52px;
+    flex: 0 0 45px;
   }
 
-  &__vote__mark {
-    float: left;
-    line-height: 18px;
+  &__voted {
+    padding: 0 5px;
+    display: inline-block;
+
+    &__mark {
+      font-size: 18px;
+    }
   }
 
   &__footer {
@@ -199,7 +203,7 @@
     display: flex;
     align-items: center;
 
-    .poll__text {
+    .poll__option {
       flex: 0 0 auto;
       width: calc(100% - (23px + 6px));
       margin-right: 6px;
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index ed680d762..1523f86d4 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -15,6 +15,8 @@ class ActivityPub::TagManager
   def url_for(target)
     return target.url if target.respond_to?(:local?) && !target.local?
 
+    return unless target.respond_to?(:object_type)
+
     case target.object_type
     when :person
       target.instance_actor? ? about_more_url(instance_actor: true) : short_account_url(target)
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 35a3773d2..afdbd70f2 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -7,6 +7,10 @@ class EntityCache
 
   MAX_EXPIRATION = 7.days.freeze
 
+  def status(url)
+    Rails.cache.fetch(to_key(:status, url), expires_in: MAX_EXPIRATION) { FetchRemoteStatusService.new.call(url) }
+  end
+
   def mention(username, domain)
     Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:id, :username, :domain, :url).find_remote(username, domain) }
   end
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 01346bfe5..3362576b0 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -8,6 +8,7 @@ module Mastodon
   class LengthValidationError < ValidationError; end
   class DimensionsValidationError < ValidationError; end
   class RaceConditionError < Error; end
+  class RateLimitExceededError < Error; end
 
   class UnexpectedResponseError < Error
     def initialize(response = nil)
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
index 302072bcc..05a06726d 100644
--- a/app/lib/language_detector.rb
+++ b/app/lib/language_detector.rb
@@ -52,8 +52,10 @@ class LanguageDetector
 
   def detect_language_code(text)
     return if unreliable_input?(text)
+
     result = @identifier.find_language(text)
-    iso6391(result.language.to_s).to_sym if result.reliable?
+
+    iso6391(result.language.to_s).to_sym if result&.reliable?
   end
 
   def iso6391(bcp47)
diff --git a/app/lib/rate_limiter.rb b/app/lib/rate_limiter.rb
new file mode 100644
index 000000000..0e2c9a894
--- /dev/null
+++ b/app/lib/rate_limiter.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+class RateLimiter
+  include Redisable
+
+  FAMILIES = {
+    follows: {
+      limit: 400,
+      period: 24.hours.freeze,
+    }.freeze,
+
+    statuses: {
+      limit: 300,
+      period: 3.hours.freeze,
+    }.freeze,
+
+    reports: {
+      limit: 400,
+      period: 24.hours.freeze,
+    }.freeze,
+  }.freeze
+
+  def initialize(by, options = {})
+    @by     = by
+    @family = options[:family]
+    @limit  = FAMILIES[@family][:limit]
+    @period = FAMILIES[@family][:period].to_i
+  end
+
+  def record!
+    count = redis.get(key)
+
+    if count.nil?
+      redis.set(key, 0)
+      redis.expire(key, (@period - (last_epoch_time % @period) + 1).to_i)
+    end
+
+    raise Mastodon::RateLimitExceededError if count.present? && count.to_i >= @limit
+
+    redis.incr(key)
+  end
+
+  def rollback!
+    redis.decr(key)
+  end
+
+  def to_headers(now = Time.now.utc)
+    {
+      'X-RateLimit-Limit' => @limit.to_s,
+      'X-RateLimit-Remaining' => (@limit - (redis.get(key) || 0).to_i).to_s,
+      'X-RateLimit-Reset' => (now + (@period - now.to_i % @period)).iso8601(6),
+    }
+  end
+
+  private
+
+  def key
+    @key ||= "rate_limit:#{@by.id}:#{@family}:#{(last_epoch_time / @period).to_i}"
+  end
+
+  def last_epoch_time
+    @last_epoch_time ||= Time.now.to_i
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 0eb719d65..6aceb809c 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -46,6 +46,7 @@
 #  silenced_at             :datetime
 #  suspended_at            :datetime
 #  trust_level             :integer
+#  hide_collections        :boolean
 #
 
 class Account < ApplicationRecord
@@ -102,6 +103,7 @@ class Account < ApplicationRecord
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).left_outer_joins(:account_stat) }
   scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
   scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc, accounts.id desc')) }
+  scope :by_recent_sign_in, -> { order(Arel.sql('(case when users.current_sign_in_at is null then 1 else 0 end) asc, users.current_sign_in_at desc, accounts.id desc')) }
   scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
@@ -322,6 +324,14 @@ class Account < ApplicationRecord
     save!
   end
 
+  def hides_followers?
+    hide_collections? || user_hides_network?
+  end
+
+  def hides_following?
+    hide_collections? || user_hides_network?
+  end
+
   def object_type
     :person
   end
@@ -478,7 +488,16 @@ class Account < ApplicationRecord
     def from_text(text)
       return [] if text.blank?
 
-      text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map { |(username, domain)| EntityCache.instance.mention(username, domain) }
+      text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map do |(username, domain)|
+        domain = begin
+          if TagManager.instance.local_domain?(domain)
+            nil
+          else
+            TagManager.instance.normalize_domain(domain)
+          end
+        end
+        EntityCache.instance.mention(username, domain)
+      end.compact
     end
 
     private
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index c7bf07787..7b6012e0f 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -14,6 +14,7 @@ class AccountFilter
     email
     ip
     staff
+    order
   ).freeze
 
   attr_reader :params
@@ -24,7 +25,7 @@ class AccountFilter
   end
 
   def results
-    scope = Account.recent.includes(:user)
+    scope = Account.includes(:user).reorder(nil)
 
     params.each do |key, value|
       scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
@@ -38,6 +39,7 @@ class AccountFilter
   def set_defaults!
     params['local']  = '1' if params['remote'].blank?
     params['active'] = '1' if params['suspended'].blank? && params['silenced'].blank? && params['pending'].blank?
+    params['order']  = 'recent' if params['order'].blank?
   end
 
   def scope_for(key, value)
@@ -51,9 +53,9 @@ class AccountFilter
     when 'active'
       Account.without_suspended
     when 'pending'
-      accounts_with_users.merge User.pending
+      accounts_with_users.merge(User.pending)
     when 'disabled'
-      accounts_with_users.merge User.disabled
+      accounts_with_users.merge(User.disabled)
     when 'silenced'
       Account.silenced
     when 'suspended'
@@ -63,16 +65,31 @@ class AccountFilter
     when 'display_name'
       Account.matches_display_name(value)
     when 'email'
-      accounts_with_users.merge User.matches_email(value)
+      accounts_with_users.merge(User.matches_email(value))
     when 'ip'
       valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value)) : Account.none
     when 'staff'
-      accounts_with_users.merge User.staff
+      accounts_with_users.merge(User.staff)
+    when 'order'
+      order_scope(value)
     else
       raise "Unknown filter: #{key}"
     end
   end
 
+  def order_scope(value)
+    case value
+    when 'active'
+      params['remote'] ? Account.joins(:account_stat).by_recent_status : Account.joins(:user).by_recent_sign_in
+    when 'recent'
+      Account.recent
+    when 'alphabetic'
+      Account.alphabetic
+    else
+      raise "Unknown order: #{value}"
+    end
+  end
+
   def accounts_with_users
     Account.joins(:user)
   end
diff --git a/app/models/account_warning_preset.rb b/app/models/account_warning_preset.rb
index ba8ceabb3..c20f683cf 100644
--- a/app/models/account_warning_preset.rb
+++ b/app/models/account_warning_preset.rb
@@ -8,8 +8,11 @@
 #  text       :text             default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  title      :string           default(""), not null
 #
 
 class AccountWarningPreset < ApplicationRecord
   validates :text, presence: true
+
+  scope :alphabetic, -> { order(title: :asc, text: :asc) }
 end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index e9da003a3..b30a82369 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -62,8 +62,6 @@ class Admin::AccountAction
 
   def process_action!
     case type
-    when 'none'
-      handle_resolve!
     when 'disable'
       handle_disable!
     when 'silence'
@@ -105,16 +103,6 @@ class Admin::AccountAction
     end
   end
 
-  def handle_resolve!
-    if with_report? && report.account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
-      # This is an automated report and it is being dismissed, so it's
-      # a false positive, in which case update the account's trust level
-      # to prevent further spam checks
-
-      target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
-    end
-  end
-
   def handle_disable!
     authorize(target_account.user, :disable?)
     log_action(:disable, target_account.user)
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
new file mode 100644
index 000000000..0ba7e1609
--- /dev/null
+++ b/app/models/admin/action_log_filter.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+class Admin::ActionLogFilter
+  KEYS = %i(
+    action_type
+    account_id
+    target_account_id
+  ).freeze
+
+  ACTION_TYPE_MAP = {
+    assigned_to_self_report: { target_type: 'Report', action: 'assigned_to_self' }.freeze,
+    change_email_user: { target_type: 'User', action: 'change_email' }.freeze,
+    confirm_user: { target_type: 'User', action: 'confirm' }.freeze,
+    create_account_warning: { target_type: 'AccountWarning', action: 'create' }.freeze,
+    create_announcement: { target_type: 'Announcement', action: 'create' }.freeze,
+    create_custom_emoji: { target_type: 'CustomEmoji', action: 'create' }.freeze,
+    create_domain_allow: { target_type: 'DomainAllow', action: 'create' }.freeze,
+    create_domain_block: { target_type: 'DomainBlock', action: 'create' }.freeze,
+    create_email_domain_block: { target_type: 'EmailDomainBlock', action: 'create' }.freeze,
+    demote_user: { target_type: 'User', action: 'demote' }.freeze,
+    destroy_announcement: { target_type: 'Announcement', action: 'destroy' }.freeze,
+    destroy_custom_emoji: { target_type: 'CustomEmoji', action: 'destroy' }.freeze,
+    destroy_domain_allow: { target_type: 'DomainAllow', action: 'destroy' }.freeze,
+    destroy_domain_block: { target_type: 'DomainBlock', action: 'destroy' }.freeze,
+    destroy_email_domain_block: { target_type: 'EmailDomainBlock', action: 'destroy' }.freeze,
+    destroy_status: { target_type: 'Status', action: 'destroy' }.freeze,
+    disable_2fa_user: { target_type: 'User', action: 'disable' }.freeze,
+    disable_custom_emoji: { target_type: 'CustomEmoji', action: 'disable' }.freeze,
+    disable_user: { target_type: 'User', action: 'disable' }.freeze,
+    enable_custom_emoji: { target_type: 'CustomEmoji', action: 'enable' }.freeze,
+    enable_user: { target_type: 'User', action: 'enable' }.freeze,
+    memorialize_account: { target_type: 'Account', action: 'memorialize' }.freeze,
+    promote_user: { target_type: 'User', action: 'promote' }.freeze,
+    remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze,
+    reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
+    reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze,
+    resolve_report: { target_type: 'Report', action: 'resolve' }.freeze,
+    silence_account: { target_type: 'Account', action: 'silence' }.freeze,
+    suspend_account: { target_type: 'Account', action: 'suspend' }.freeze,
+    unassigned_report: { target_type: 'Report', action: 'unassigned' }.freeze,
+    unsilence_account: { target_type: 'Account', action: 'unsilence' }.freeze,
+    unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
+    update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
+    update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
+    update_status: { target_type: 'Status', action: 'update' }.freeze,
+  }.freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Admin::ActionLog.includes(:target)
+
+    params.each do |key, value|
+      next if key.to_s == 'page'
+
+      scope.merge!(scope_for(key.to_s, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key
+    when 'action_type'
+      Admin::ActionLog.where(ACTION_TYPE_MAP[value.to_sym])
+    when 'account_id'
+      Admin::ActionLog.where(account_id: value)
+    when 'target_account_id'
+      account = Account.find(value)
+      Admin::ActionLog.where(target: [account, account.user].compact)
+    else
+      raise "Unknown filter: #{key}"
+    end
+  end
+end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index d99502f44..a4e427b49 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -14,6 +14,7 @@
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  published_at :datetime
+#  status_ids   :bigint           is an Array
 #
 
 class Announcement < ApplicationRecord
@@ -48,6 +49,16 @@ class Announcement < ApplicationRecord
     @mentions ||= Account.from_text(text)
   end
 
+  def statuses
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.where(id: status_ids, visibility: [:public, :unlisted])
+      end
+    end
+  end
+
   def tags
     @tags ||= Tag.find_or_create_by_names(Extractor.extract_hashtags(text))
   end
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 14bcf7bb1..32fcb5397 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -87,10 +87,10 @@ module AccountInteractions
     has_many :announcement_mutes, dependent: :destroy
   end
 
-  def follow!(other_account, reblogs: nil, uri: nil)
+  def follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
     reblogs = true if reblogs.nil?
 
-    rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri)
+    rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
                               .find_or_create_by!(target_account: other_account)
 
     rel.update!(show_reblogs: reblogs)
@@ -99,6 +99,18 @@ module AccountInteractions
     rel
   end
 
+  def request_follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
+    reblogs = true if reblogs.nil?
+
+    rel = follow_requests.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
+                         .find_or_create_by!(target_account: other_account)
+
+    rel.update!(show_reblogs: reblogs)
+    remove_potential_friendship(other_account)
+
+    rel
+  end
+
   def block!(other_account, uri: nil)
     remove_potential_friendship(other_account)
     block_relationships.create_with(uri: uri)
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 43ff8ac12..18b872c1e 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -74,7 +74,7 @@ module Attachmentable
     self.class.attachment_definitions.each_key do |attachment_name|
       attachment = send(attachment_name)
 
-      next if attachment.blank? || attachment.queued_for_write[:original].blank?
+      next if attachment.blank? || attachment.queued_for_write[:original].blank? || attachment.options[:preserve_files]
 
       attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name))
     end
diff --git a/app/models/concerns/rate_limitable.rb b/app/models/concerns/rate_limitable.rb
new file mode 100644
index 000000000..ad1b5e44e
--- /dev/null
+++ b/app/models/concerns/rate_limitable.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RateLimitable
+  extend ActiveSupport::Concern
+
+  def rate_limit=(value)
+    @rate_limit = value
+  end
+
+  def rate_limit?
+    @rate_limit
+  end
+
+  def rate_limiter(by, options = {})
+    return @rate_limiter if defined?(@rate_limiter)
+
+    @rate_limiter = RateLimiter.new(by, options)
+  end
+
+  class_methods do
+    def rate_limit(options = {})
+      after_create do
+        by = public_send(options[:by])
+
+        if rate_limit? && by&.local?
+          rate_limiter(by, options).record!
+          @rate_limit_recorded = true
+        end
+      end
+
+      after_rollback do
+        rate_limiter(public_send(options[:by]), options).rollback! if @rate_limit_recorded
+      end
+    end
+  end
+end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index bc70dea25..f50fa46ba 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -7,13 +7,27 @@
 #  domain     :string           default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  parent_id  :bigint(8)
 #
 
 class EmailDomainBlock < ApplicationRecord
   include DomainNormalizable
 
+  belongs_to :parent, class_name: 'EmailDomainBlock', optional: true
+  has_many :children, class_name: 'EmailDomainBlock', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+
   validates :domain, presence: true, uniqueness: true, domain: true
 
+  def with_dns_records=(val)
+    @with_dns_records = ActiveModel::Type::Boolean.new.cast(val)
+  end
+
+  def with_dns_records?
+    @with_dns_records
+  end
+
+  alias with_dns_records with_dns_records?
+
   def self.block?(email)
     _, domain = email.split('@', 2)
 
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 87fa11425..f3e48a2ed 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -15,6 +15,9 @@
 class Follow < ApplicationRecord
   include Paginable
   include RelationshipCacheable
+  include RateLimitable
+
+  rate_limit by: :account, family: :follows
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 96ac7eaa5..3325e264c 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -15,6 +15,9 @@
 class FollowRequest < ApplicationRecord
   include Paginable
   include RelationshipCacheable
+  include RateLimitable
+
+  rate_limit by: :account, family: :follows
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 42364641f..f45e2c9f7 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -19,12 +19,14 @@
 #  description         :text
 #  scheduled_status_id :bigint(8)
 #  blurhash            :string
+#  processing          :integer
 #
 
 class MediaAttachment < ApplicationRecord
   self.inheritance_column = nil
 
   enum type: [:image, :gifv, :video, :unknown, :audio]
+  enum processing: [:queued, :in_progress, :complete, :failed], _prefix: true
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
@@ -55,47 +57,6 @@ class MediaAttachment < ApplicationRecord
     },
   }.freeze
 
-  VIDEO_STYLES = {
-    small: {
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          vf: 'scale=\'min(400\, iw):min(400\, ih)\':force_original_aspect_ratio=decrease',
-        },
-      },
-      format: 'png',
-      time: 0,
-      file_geometry_parser: FastGeometryParser,
-      blurhash: BLURHASH_OPTIONS,
-    },
-
-    original: {
-      keep_same_format: true,
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          'map_metadata' => '-1',
-          'c:v' => 'copy',
-          'c:a' => 'copy',
-        },
-      },
-    },
-  }.freeze
-
-  AUDIO_STYLES = {
-    original: {
-      format: 'mp3',
-      content_type: 'audio/mpeg',
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          'map_metadata' => '-1',
-          'q:a' => 2,
-        },
-      },
-    },
-  }.freeze
-
   VIDEO_FORMAT = {
     format: 'mp4',
     content_type: 'video/mp4',
@@ -116,6 +77,54 @@ class MediaAttachment < ApplicationRecord
     },
   }.freeze
 
+  VIDEO_PASSTHROUGH_OPTIONS = {
+    video_codecs: ['h264'],
+    audio_codecs: ['aac', nil],
+    colorspaces: ['yuv420p'],
+    options: {
+      format: 'mp4',
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          'map_metadata' => '-1',
+          'c:v' => 'copy',
+          'c:a' => 'copy',
+        },
+      },
+    },
+  }.freeze
+
+  VIDEO_STYLES = {
+    small: {
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          vf: 'scale=\'min(400\, iw):min(400\, ih)\':force_original_aspect_ratio=decrease',
+        },
+      },
+      format: 'png',
+      time: 0,
+      file_geometry_parser: FastGeometryParser,
+      blurhash: BLURHASH_OPTIONS,
+    },
+
+    original: VIDEO_FORMAT.merge(passthrough_options: VIDEO_PASSTHROUGH_OPTIONS),
+  }.freeze
+
+  AUDIO_STYLES = {
+    original: {
+      format: 'mp3',
+      content_type: 'audio/mpeg',
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          'map_metadata' => '-1',
+          'q:a' => 2,
+        },
+      },
+    },
+  }.freeze
+
   VIDEO_CONVERTED_STYLES = {
     small: VIDEO_STYLES[:small],
     original: VIDEO_FORMAT,
@@ -124,6 +133,9 @@ class MediaAttachment < ApplicationRecord
   IMAGE_LIMIT = 10.megabytes
   VIDEO_LIMIT = 40.megabytes
 
+  MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
+  MAX_VIDEO_FRAME_RATE   = 60
+
   belongs_to :account,          inverse_of: :media_attachments, optional: true
   belongs_to :status,           inverse_of: :media_attachments, optional: true
   belongs_to :scheduled_status, inverse_of: :media_attachments, optional: true
@@ -156,6 +168,10 @@ class MediaAttachment < ApplicationRecord
     remote_url.blank?
   end
 
+  def not_processed?
+    processing.present? && !processing_complete?
+  end
+
   def needs_redownload?
     file.blank? && remote_url.present?
   end
@@ -168,18 +184,6 @@ class MediaAttachment < ApplicationRecord
     audio? || video?
   end
 
-  def variant?(other_file_name)
-    return true if file_file_name == other_file_name
-
-    formats = file.styles.values.map(&:format).compact
-
-    return false if formats.empty?
-
-    extension = File.extname(other_file_name)
-
-    formats.include?(extension.delete('.')) && File.basename(other_file_name, extension) == File.basename(file_file_name, File.extname(file_file_name))
-  end
-
   def to_param
     shortcode
   end
@@ -202,12 +206,21 @@ class MediaAttachment < ApplicationRecord
     "#{x},#{y}"
   end
 
+  attr_writer :delay_processing
+
+  def delay_processing?
+    @delay_processing
+  end
+
+  after_commit :enqueue_processing, on: :create
   after_commit :reset_parent_cache, on: :update
 
   before_create :prepare_description, unless: :local?
   before_create :set_shortcode
+  before_create :set_processing
 
   before_post_process :set_type_and_extension
+  before_post_process :check_video_dimensions
 
   before_save :set_meta
 
@@ -276,6 +289,21 @@ class MediaAttachment < ApplicationRecord
     end
   end
 
+  def set_processing
+    self.processing = delay_processing? ? :queued : :complete
+  end
+
+  def check_video_dimensions
+    return unless (video? || gifv?) && file.queued_for_write[:original].present?
+
+    movie = FFMPEG::Movie.new(file.queued_for_write[:original].path)
+
+    return unless movie.valid?
+
+    raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT
+    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE
+  end
+
   def set_meta
     meta = populate_meta
 
@@ -321,9 +349,11 @@ class MediaAttachment < ApplicationRecord
     }.compact
   end
 
-  def reset_parent_cache
-    return if status_id.nil?
+  def enqueue_processing
+    PostProcessMediaWorker.perform_async(id) if delay_processing?
+  end
 
-    Rails.cache.delete("statuses/#{status_id}")
+  def reset_parent_cache
+    Rails.cache.delete("statuses/#{status_id}") if status_id.present?
   end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
index fb2e040ee..f31bcfd2e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -18,6 +18,9 @@
 
 class Report < ApplicationRecord
   include Paginable
+  include RateLimitable
+
+  rate_limit by: :account, family: :reports
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
@@ -59,6 +62,14 @@ class Report < ApplicationRecord
   end
 
   def resolve!(acting_account)
+    if account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
+      # This is an automated report and it is being dismissed, so it's
+      # a false positive, in which case update the account's trust level
+      # to prevent further spam checks
+
+      target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
+    end
+
     RemovalWorker.push_bulk(Status.with_discarded.discarded.where(id: status_ids).pluck(:id)) { |status_id| [status_id, { immediate: true }] }
     update!(action_taken: true, action_taken_by_account_id: acting_account.id)
   end
diff --git a/app/models/status.rb b/app/models/status.rb
index 1e630196b..fef4e2596 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -32,6 +32,9 @@ class Status < ApplicationRecord
   include Paginable
   include Cacheable
   include StatusThreadingConcern
+  include RateLimitable
+
+  rate_limit by: :account, family: :statuses
 
   self.discard_column = :deleted_at
 
@@ -139,10 +142,12 @@ class Status < ApplicationRecord
       ids += mentions.where(account: Account.local).pluck(:account_id)
       ids += favourites.where(account: Account.local).pluck(:account_id)
       ids += reblogs.where(account: Account.local).pluck(:account_id)
+      ids += bookmarks.where(account: Account.local).pluck(:account_id)
     else
       ids += preloaded.mentions[id] || []
       ids += preloaded.favourites[id] || []
       ids += preloaded.reblogs[id] || []
+      ids += preloaded.bookmarks[id] || []
     end
 
     ids.uniq
@@ -366,6 +371,21 @@ class Status < ApplicationRecord
       end
     end
 
+    def from_text(text)
+      return [] if text.blank?
+
+      text.scan(FetchLinkCardService::URL_PATTERN).map(&:first).uniq.map do |url|
+        status = begin
+          if TagManager.instance.local_url?(url)
+            ActivityPub::TagManager.instance.uri_to_resource(url, Status)
+          else
+            EntityCache.instance.status(url)
+          end
+        end
+        status&.distributable? ? status : nil
+      end.compact
+    end
+
     private
 
     def timeline_scope(local_only = false)
diff --git a/app/policies/settings_policy.rb b/app/policies/settings_policy.rb
index 2dcb79f51..874f97bab 100644
--- a/app/policies/settings_policy.rb
+++ b/app/policies/settings_policy.rb
@@ -8,4 +8,8 @@ class SettingsPolicy < ApplicationPolicy
   def show?
     admin?
   end
+
+  def destroy?
+    admin?
+  end
 end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index f27feb669..9343b97d2 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -7,6 +7,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   attribute :read, if: :current_user?
 
   has_many :mentions
+  has_many :statuses
   has_many :tags, serializer: REST::StatusSerializer::TagSerializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
   has_many :reactions, serializer: REST::ReactionSerializer
@@ -46,4 +47,16 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
       object.pretty_acct
     end
   end
+
+  class StatusSerializer < ActiveModel::Serializer
+    attributes :id, :url
+
+    def id
+      object.id.to_s
+    end
+
+    def url
+      ActivityPub::TagManager.instance.url_for(object)
+    end
+  end
 end
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index 1b3498ea4..cc10e3001 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -12,7 +12,9 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   end
 
   def url
-    if object.needs_redownload?
+    if object.not_processed?
+      nil
+    elsif object.needs_redownload?
       media_proxy_url(object.id, :original)
     else
       full_asset_url(object.file.url(:original))
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index d217dabb3..493813aab 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -171,7 +171,7 @@ class AccountSearchService < BaseService
   end
 
   def username_complete?
-    query.include?('@') && "@#{query}" =~ Account::MENTION_RE
+    query.include?('@') && "@#{query}" =~ /\A#{Account::MENTION_RE}\Z/
   end
 
   def likely_acct?
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index d5ede0388..7b4c53d50 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -94,6 +94,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.statuses_count    = outbox_total_items    if outbox_total_items.present?
     @account.following_count   = following_total_items if following_total_items.present?
     @account.followers_count   = followers_total_items if followers_total_items.present?
+    @account.hide_collections  = following_private? || followers_private?
     @account.moved_to_account  = @json['movedTo'].present? ? moved_account : nil
   end
 
@@ -166,26 +167,36 @@ class ActivityPub::ProcessAccountService < BaseService
   end
 
   def outbox_total_items
-    collection_total_items('outbox')
+    collection_info('outbox').first
   end
 
   def following_total_items
-    collection_total_items('following')
+    collection_info('following').first
   end
 
   def followers_total_items
-    collection_total_items('followers')
+    collection_info('followers').first
   end
 
-  def collection_total_items(type)
-    return if @json[type].blank?
+  def following_private?
+    !collection_info('following').last
+  end
+
+  def followers_private?
+    !collection_info('followers').last
+  end
+
+  def collection_info(type)
+    return [nil, nil] if @json[type].blank?
     return @collections[type] if @collections.key?(type)
 
     collection = fetch_resource_without_id_validation(@json[type])
 
-    @collections[type] = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
+    total_items = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
+    has_first_page = collection.is_a?(Hash) && collection['first'].present?
+    @collections[type] = [total_items, has_first_page]
   rescue HTTP::Error, OpenSSL::SSL::SSLError
-    @collections[type] = nil
+    @collections[type] = [nil, nil]
   end
 
   def moved_account
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index abe7766d4..880cdde92 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -5,6 +5,8 @@ class FetchResourceService < BaseService
 
   ACCEPT_HEADER = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", text/html;q=0.1'
 
+  attr_reader :response_code
+
   def call(url)
     return if url.blank?
 
@@ -27,6 +29,7 @@ class FetchResourceService < BaseService
   end
 
   def process_response(response, terminal = false)
+    @response_code = response.code
     return nil if response.code != 200
 
     if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 4d19002c4..311ae7fa6 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -7,54 +7,68 @@ class FollowService < BaseService
   # Follow a remote user, notify remote user about the follow
   # @param [Account] source_account From which to follow
   # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
-  # @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
-  def call(source_account, target_account, reblogs: nil, bypass_locked: false)
-    reblogs = true if reblogs.nil?
-    target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
+  # @param [Hash] options
+  # @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
+  # @option [Boolean] :bypass_locked
+  # @option [Boolean] :with_rate_limit
+  def call(source_account, target_account, options = {})
+    @source_account = source_account
+    @target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
+    @options        = { reblogs: true, bypass_locked: false, with_rate_limit: false }.merge(options)
 
-    raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
-    raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || (!target_account.local? && target_account.ostatus?) || source_account.domain_blocking?(target_account.domain)
+    raise ActiveRecord::RecordNotFound if following_not_possible?
+    raise Mastodon::NotPermittedError  if following_not_allowed?
 
-    if source_account.following?(target_account)
-      # We're already following this account, but we'll call follow! again to
-      # make sure the reblogs status is set correctly.
-      return source_account.follow!(target_account, reblogs: reblogs)
-    elsif source_account.requested?(target_account)
-      # This isn't managed by a method in AccountInteractions, so we modify it
-      # ourselves if necessary.
-      req = source_account.follow_requests.find_by(target_account: target_account)
-      req.update!(show_reblogs: reblogs)
-      return req
+    if @source_account.following?(@target_account)
+      return change_follow_options!
+    elsif @source_account.requested?(@target_account)
+      return change_follow_request_options!
     end
 
     ActivityTracker.increment('activity:interactions')
 
-    if (target_account.locked? && !bypass_locked) || source_account.silenced? || target_account.activitypub?
-      request_follow(source_account, target_account, reblogs: reblogs)
-    elsif target_account.local?
-      direct_follow(source_account, target_account, reblogs: reblogs)
+    if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub?
+      request_follow!
+    elsif @target_account.local?
+      direct_follow!
     end
   end
 
   private
 
-  def request_follow(source_account, target_account, reblogs: true)
-    follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs)
+  def following_not_possible?
+    @target_account.nil? || @target_account.id == @source_account.id || @target_account.suspended?
+  end
 
-    if target_account.local?
-      LocalNotificationWorker.perform_async(target_account.id, follow_request.id, follow_request.class.name)
-    elsif target_account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), source_account.id, target_account.inbox_url)
+  def following_not_allowed?
+    @target_account.blocking?(@source_account) || @source_account.blocking?(@target_account) || @target_account.moved? || (!@target_account.local? && @target_account.ostatus?) || @source_account.domain_blocking?(@target_account.domain)
+  end
+
+  def change_follow_options!
+    @source_account.follow!(@target_account, reblogs: @options[:reblogs])
+  end
+
+  def change_follow_request_options!
+    @source_account.request_follow!(@target_account, reblogs: @options[:reblogs])
+  end
+
+  def request_follow!
+    follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
+
+    if @target_account.local?
+      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name)
+    elsif @target_account.activitypub?
+      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
     end
 
     follow_request
   end
 
-  def direct_follow(source_account, target_account, reblogs: true)
-    follow = source_account.follow!(target_account, reblogs: reblogs)
+  def direct_follow!
+    follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
 
-    LocalNotificationWorker.perform_async(target_account.id, follow.id, follow.class.name)
-    MergeWorker.perform_async(target_account.id, source_account.id)
+    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name)
+    MergeWorker.perform_async(@target_account.id, @source_account.id)
 
     follow
   end
diff --git a/app/services/import_service.rb b/app/services/import_service.rb
index 4ee431ea3..c0d741d57 100644
--- a/app/services/import_service.rb
+++ b/app/services/import_service.rb
@@ -64,7 +64,8 @@ class ImportService < BaseService
   end
 
   def import_relationships!(action, undo_action, overwrite_scope, limit, extra_fields = {})
-    items = @data.take(limit).map { |row| [row['Account address']&.strip, Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
+    local_domain_suffix = "@#{Rails.configuration.x.local_domain}"
+    items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
 
     if @import.overwrite?
       presence_hash = items.each_with_object({}) { |(id, extra), mapping| mapping[id] = [true, extra] }
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index a0a650d62..0a383d6a3 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -19,6 +19,7 @@ class PostStatusService < BaseService
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @option [Doorkeeper::Application] :application
   # @option [String] :idempotency Optional idempotency key
+  # @option [Boolean] :with_rate_limit
   # @return [Status]
   def call(account, options = {})
     @account     = account
@@ -47,9 +48,10 @@ class PostStatusService < BaseService
   private
 
   def preprocess_attributes!
+    @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
-    @visibility   = :unlisted if @visibility == :public && @account.silenced?
+    @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
   rescue ArgumentError
@@ -100,6 +102,7 @@ class PostStatusService < BaseService
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
   end
 
   def language_from_option(str)
@@ -155,11 +158,12 @@ class PostStatusService < BaseService
       media_attachments: @media || [],
       thread: @in_reply_to,
       poll_attributes: poll_attributes,
-      sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
+      sensitive: @sensitive,
       spoiler_text: @options[:spoiler_text] || '',
       visibility: @visibility,
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
+      rate_limit: @options[:with_rate_limit],
     }.compact
   end
 
@@ -179,10 +183,11 @@ class PostStatusService < BaseService
 
   def scheduled_options
     @options.tap do |options_hash|
-      options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
-      options_hash[:application_id] = options_hash.delete(:application)&.id
-      options_hash[:scheduled_at]   = nil
-      options_hash[:idempotency]    = nil
+      options_hash[:in_reply_to_id]  = options_hash.delete(:thread)&.id
+      options_hash[:application_id]  = options_hash.delete(:application)&.id
+      options_hash[:scheduled_at]    = nil
+      options_hash[:idempotency]     = nil
+      options_hash[:with_rate_limit] = false
     end
   end
 end
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 3bb460fca..4b5ae9492 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -8,6 +8,8 @@ class ReblogService < BaseService
   # @param [Account] account Account to reblog from
   # @param [Status] reblogged_status Status to be reblogged
   # @param [Hash] options
+  # @option [String]  :visibility
+  # @option [Boolean] :with_rate_limit
   # @return [Status]
   def call(account, reblogged_status, options = {})
     reblogged_status = reblogged_status.reblog if reblogged_status.reblog?
@@ -18,9 +20,15 @@ class ReblogService < BaseService
 
     return reblog unless reblog.nil?
 
-    visibility = options[:visibility] || account.user&.setting_default_privacy
-    visibility = reblogged_status.visibility if reblogged_status.hidden?
-    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility)
+    visibility = begin
+      if reblogged_status.hidden?
+        reblogged_status.visibility
+      else
+        options[:visibility] || account.user&.setting_default_privacy
+      end
+    end
+
+    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility, rate_limit: options[:with_rate_limit])
 
     DistributionWorker.perform_async(reblog.id)
     ActivityPub::DistributionWorker.perform_async(reblog.id)
@@ -45,7 +53,9 @@ class ReblogService < BaseService
 
   def bump_potential_friendship(account, reblog)
     ActivityTracker.increment('activity:interactions')
+
     return if account.following?(reblog.reblog.account_id)
+
     PotentialFriendshipTracker.record(account.id, reblog.reblog.account_id, :reblog)
   end
 
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index 1a2b0d60c..78080d878 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -12,7 +12,7 @@ class ResolveURLService < BaseService
       process_local_url
     elsif !fetched_resource.nil?
       process_url
-    elsif @on_behalf_of.present?
+    else
       process_url_from_db
     end
   end
@@ -30,6 +30,8 @@ class ResolveURLService < BaseService
   end
 
   def process_url_from_db
+    return unless @on_behalf_of.present? && [401, 403, 404].include?(fetch_resource_service.response_code)
+
     # It may happen that the resource is a private toot, and thus not fetchable,
     # but we can return the toot if we already know about it.
     status = Status.find_by(uri: @url) || Status.find_by(url: @url)
@@ -40,7 +42,11 @@ class ResolveURLService < BaseService
   end
 
   def fetched_resource
-    @fetched_resource ||= FetchResourceService.new.call(@url)
+    @fetched_resource ||= fetch_resource_service.call(@url)
+  end
+
+  def fetch_resource_service
+    @_fetch_resource_service ||= FetchResourceService.new
   end
 
   def resource_url
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 090fd409b..830de4de3 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -10,10 +10,10 @@ class SearchService < BaseService
     @resolve = options[:resolve] || false
 
     default_results.tap do |results|
-      next if @query.blank?
+      next if @query.blank? || @limit.zero?
 
       if url_query?
-        results.merge!(url_resource_results) unless url_resource.nil? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
+        results.merge!(url_resource_results) unless url_resource.nil? || @offset.positive? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
       elsif @query.present?
         results[:accounts] = perform_accounts_search! if account_searchable?
         results[:statuses] = perform_statuses_search! if full_text_searchable?
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb
index 9d7321cad..a32727796 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_validator.rb
@@ -2,7 +2,7 @@
 
 class PollValidator < ActiveModel::Validator
   MAX_OPTIONS      = 4
-  MAX_OPTION_CHARS = 25
+  MAX_OPTION_CHARS = 50
   MAX_EXPIRATION   = 1.month.freeze
   MIN_EXPIRATION   = 5.minutes.freeze
 
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 20fbeef33..aa88b1448 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -21,7 +21,7 @@
 
     - unless @warning_presets.empty?
       .fields-group
-        = f.input :warning_preset_id, collection: @warning_presets, label_method: :text, wrapper: :with_block_label
+        = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
 
     .fields-group
       = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index b057d3e42..44b10af6e 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -11,6 +11,8 @@
   %td
     - if account.user_current_sign_in_at
       %time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
+    - elsif account.last_status_at.present?
+      %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at
     - else
       \-
   %td
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 3a85324c9..7592161c9 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -19,6 +19,12 @@
     %ul
       %li= filter_link_to t('admin.accounts.moderation.all'), staff: nil
       %li= filter_link_to t('admin.accounts.roles.staff'), staff: '1'
+  .filter-subset
+    %strong= t 'generic.order_by'
+    %ul
+      %li= filter_link_to t('relationships.most_recent'), order: nil
+      %li= filter_link_to t('admin.accounts.username'), order: 'alphabetic'
+      %li= filter_link_to t('relationships.last_active'), order: 'active'
 
 = form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
   .fields-group
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index a30b78db2..965fd6fb6 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -53,7 +53,7 @@
       .dashboard__counters__num= number_with_delimiter @account.targeted_reports.count
       .dashboard__counters__label= t '.targeted_reports'
   %div
-    %div
+    = link_to admin_action_logs_path(target_account_id: @account.id) do
       .dashboard__counters__text
         - if @account.local? && @account.user.nil?
           %span.neutral= t('admin.accounts.deleted')
@@ -96,10 +96,17 @@
               = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user)
 
           %tr
-            %th= t('admin.accounts.email')
-            %td= @account.user_email
+            %th{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= t('admin.accounts.email')
+            %td{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= @account.user_email
             %td= table_link_to 'edit', t('admin.accounts.change_email.label'), admin_account_change_email_path(@account.id) if can?(:change_email, @account.user)
 
+          %tr
+            %td= table_link_to 'search', t('admin.accounts.search_same_email_domain'), admin_accounts_path(email: "%@#{@account.user_email.split('@').last}")
+
+          - if can?(:create, :email_domain_block)
+            %tr
+              %td= table_link_to 'ban', t('admin.accounts.add_email_domain_block'), new_admin_email_domain_block_path(_domain: @account.user_email.split('@').last)
+
           - if @account.user_unconfirmed_email.present?
             %tr
               %th= t('admin.accounts.unconfirmed_email')
@@ -204,7 +211,7 @@
         = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account)
 
       - unless @account.local?
-        - if DomainBlock.where(domain: @account.domain).exists?
+        - if DomainBlock.rule_for(@account.domain)
           = link_to t('admin.domain_blocks.view'), admin_instance_path(@account.domain), class: 'button'
         - else
           = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive'
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml
index a545e189e..59905f341 100644
--- a/app/views/admin/action_logs/_action_log.html.haml
+++ b/app/views/admin/action_logs/_action_log.html.haml
@@ -7,9 +7,3 @@
         = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe
       .log-entry__timestamp
         %time.formatted{ datetime: action_log.created_at.iso8601 }
-    .spacer
-    .log-entry__icon
-      = fa_icon icon_for_log(action_log)
-      .log-entry__icon__overlay{ class: class_for_log_icon(action_log) }
-  .log-entry__extras
-    = log_extra_attributes relevant_log_changes(action_log)
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index a4d3871a9..99f756762 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -1,6 +1,28 @@
 - content_for :page_title do
   = t('admin.action_logs.title')
 
-= render @action_logs
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
+= form_tag admin_action_logs_url, method: 'GET', class: 'simple_form' do
+  = hidden_field_tag :target_account_id, params[:target_account_id] if params[:target_account_id].present?
+
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.action_logs.filter_by_user')
+      .input.select.optional
+        = select_tag :account_id, options_from_collection_for_select(Account.joins(:user).merge(User.staff), :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
+
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.action_logs.filter_by_action')
+      .input.select.optional
+        = select_tag :action_type, options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key]}, params[:action_type]), prompt: I18n.t('admin.accounts.moderation.all')
+
+- if @action_logs.empty?
+  %div.muted-hint.center-text
+    = t 'admin.action_logs.empty'
+- else
+  .announcements-list
+    = render @action_logs
 
 = paginate @action_logs
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
index bf66c9001..41ab8c171 100644
--- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
+++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
@@ -3,3 +3,13 @@
     %samp= email_domain_block.domain
   %td
     = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(email_domain_block), method: :delete
+
+- email_domain_block.children.each do |child_email_domain_block|
+  %tr
+    %td
+      %samp= child_email_domain_block.domain
+      %span.muted-hint
+        = surround '(', ')' do
+          = t('admin.email_domain_blocks.from_html', domain: content_tag(:samp, email_domain_block.domain))
+    %td
+      = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(child_email_domain_block), method: :delete
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index f372fa512..4a346f240 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -5,7 +5,10 @@
   = render 'shared/error_messages', object: @email_domain_block
 
   .fields-group
-    = f.input :domain, wrapper: :with_label, label: t('admin.email_domain_blocks.domain')
+    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain')
+
+  .fields-group
+    = f.input :with_dns_records, as: :boolean, wrapper: :with_label
 
   .actions
     = f.button :button, t('.create'), type: :submit
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index d7b493051..f37775aa9 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -4,7 +4,10 @@
 - content_for :page_title do
   = t('admin.settings.title')
 
-= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
+  - content_for :heading_actions do
+    = button_tag t('generic.save_changes'), class: 'button', form: 'edit_admin'
+
+= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch, id: 'edit_admin' } do |f|
   = render 'shared/error_messages', object: @admin_settings
 
   .fields-group
@@ -30,13 +33,13 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: t('admin.settings.thumbnail.desc_html')
+      = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: site_upload_delete_hint(t('admin.settings.thumbnail.desc_html'), :thumbnail)
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: t('admin.settings.hero.desc_html')
+      = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: site_upload_delete_hint(t('admin.settings.hero.desc_html'), :hero)
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: t('admin.settings.mascot.desc_html')
+      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: site_upload_delete_hint(t('admin.settings.mascot.desc_html'), :mascot)
 
   %hr.spacer/
 
diff --git a/app/views/admin/warning_presets/_warning_preset.html.haml b/app/views/admin/warning_presets/_warning_preset.html.haml
new file mode 100644
index 000000000..a58199c80
--- /dev/null
+++ b/app/views/admin/warning_presets/_warning_preset.html.haml
@@ -0,0 +1,10 @@
+.announcements-list__item
+  = link_to edit_admin_warning_preset_path(warning_preset), class: 'announcements-list__item__title' do
+    = warning_preset.title.presence || truncate(warning_preset.text)
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      = truncate(warning_preset.text)
+
+    %div
+      = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
index 9522746cd..b5c5107ef 100644
--- a/app/views/admin/warning_presets/edit.html.haml
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -4,6 +4,9 @@
 = simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
   = render 'shared/error_messages', object: @warning_preset
 
+  .fields-group
+    = f.input :title, wrapper: :with_block_label
+
   .fields-group
     = f.input :text, wrapper: :with_block_label
 
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
index 45913ef73..dbc23fa30 100644
--- a/app/views/admin/warning_presets/index.html.haml
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -5,6 +5,9 @@
   = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
     = render 'shared/error_messages', object: @warning_preset
 
+    .fields-group
+      = f.input :title, wrapper: :with_block_label
+
     .fields-group
       = f.input :text, wrapper: :with_block_label
 
@@ -13,18 +16,9 @@
 
   %hr.spacer/
 
-- unless @warning_presets.empty?
-  .table-wrapper
-    %table.table
-      %thead
-        %tr
-          %th= t('simple_form.labels.account_warning_preset.text')
-          %th
-      %tbody
-        - @warning_presets.each do |preset|
-          %tr
-            %td
-              = Formatter.instance.linkify(preset.text)
-            %td
-              = table_link_to 'pencil', t('admin.warning_presets.edit'), edit_admin_warning_preset_path(preset)
-              = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+- if @warning_presets.empty?
+  %div.muted-hint.center-text
+    = t 'admin.warning_presets.empty'
+- else
+  .announcements-list
+    = render partial: 'warning_preset', collection: @warning_presets
diff --git a/app/views/errors/429.html.haml b/app/views/errors/429.html.haml
new file mode 100644
index 000000000..2df4f4175
--- /dev/null
+++ b/app/views/errors/429.html.haml
@@ -0,0 +1,5 @@
+- content_for :page_title do
+  = t('errors.429')
+
+- content_for :content do
+  = t('errors.429')
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index d2b05513e..acddf7884 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.appearance')
 
-= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
+
+= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
       = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index a496be21b..d7cc1ed5d 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.notifications')
 
-= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
+
+= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
   = render 'shared/error_messages', object: current_user
 
   %h4= t 'notifications.email_events'
@@ -32,6 +35,3 @@
       = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label
-
-  .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index db7d806bc..539a70056 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.preferences')
 
-= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
   = render 'shared/error_messages', object: current_user
 
   .fields-group
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 6929f54f3..c55ab7b90 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.edit_profile')
 
-= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_profile'
+
+= simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
   = render 'shared/error_messages', object: @account
 
   .fields-row
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
index d1aba6ef9..c17476657 100644
--- a/app/views/statuses/_poll.html.haml
+++ b/app/views/statuses/_poll.html.haml
@@ -8,16 +8,16 @@
       %li
         - if show_results
           - percent = total_votes_count > 0 ? 100 * option.votes_count / total_votes_count : 0
-          %span.poll__chart{ style: "width: #{percent}%" }
-
-          %label.poll__text><
+          %label.poll__option><
             %span.poll__number><
               - if own_votes.include?(index)
-                %i.poll__vote__mark.fa.fa-check
+                %i.poll__voted__mark.fa.fa-check
               = percent.round
             = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+
+            %span.poll__chart{ style: "width: #{percent}%" }
         - else
-          %label.poll__text><
+          %label.poll__option><
             %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
             = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
   .poll__footer
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb
index 1e87fa4bf..25dee4ee2 100644
--- a/app/workers/activitypub/distribute_poll_update_worker.rb
+++ b/app/workers/activitypub/distribute_poll_update_worker.rb
@@ -4,7 +4,7 @@ class ActivityPub::DistributePollUpdateWorker
   include Sidekiq::Worker
   include Payloadable
 
-  sidekiq_options queue: 'push', unique: :until_executed, retry: 0
+  sidekiq_options queue: 'push', lock: :until_executed, retry: 0
 
   def perform(status_id)
     @status  = Status.find(status_id)
diff --git a/app/workers/activitypub/synchronize_featured_collection_worker.rb b/app/workers/activitypub/synchronize_featured_collection_worker.rb
index 7b16d3426..7a0898e89 100644
--- a/app/workers/activitypub/synchronize_featured_collection_worker.rb
+++ b/app/workers/activitypub/synchronize_featured_collection_worker.rb
@@ -3,7 +3,7 @@
 class ActivityPub::SynchronizeFeaturedCollectionWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', unique: :until_executed
+  sidekiq_options queue: 'pull', lock: :until_executed
 
   def perform(account_id)
     ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id))
diff --git a/app/workers/after_remote_follow_request_worker.rb b/app/workers/after_remote_follow_request_worker.rb
deleted file mode 100644
index ce9c65834..000000000
--- a/app/workers/after_remote_follow_request_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AfterRemoteFollowRequestWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull', retry: 5
-
-  def perform(follow_request_id); end
-end
diff --git a/app/workers/after_remote_follow_worker.rb b/app/workers/after_remote_follow_worker.rb
deleted file mode 100644
index d9719f2bf..000000000
--- a/app/workers/after_remote_follow_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AfterRemoteFollowWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull', retry: 5
-
-  def perform(follow_id); end
-end
diff --git a/app/workers/backup_worker.rb b/app/workers/backup_worker.rb
index e4c609d70..7b0b52844 100644
--- a/app/workers/backup_worker.rb
+++ b/app/workers/backup_worker.rb
@@ -9,8 +9,12 @@ class BackupWorker
     backup_id = msg['args'].first
 
     ActiveRecord::Base.connection_pool.with_connection do
-      backup = Backup.find(backup_id)
-      backup&.destroy
+      begin
+        backup = Backup.find(backup_id)
+        backup.destroy
+      rescue ActiveRecord::RecordNotFound
+        true
+      end
     end
   end
 
diff --git a/app/workers/notification_worker.rb b/app/workers/notification_worker.rb
deleted file mode 100644
index 1c0f001cf..000000000
--- a/app/workers/notification_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class NotificationWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 5
-
-  def perform(xml, source_account_id, target_account_id); end
-end
diff --git a/app/workers/poll_expiration_notify_worker.rb b/app/workers/poll_expiration_notify_worker.rb
index e08f0c249..64b4cbd7e 100644
--- a/app/workers/poll_expiration_notify_worker.rb
+++ b/app/workers/poll_expiration_notify_worker.rb
@@ -3,7 +3,7 @@
 class PollExpirationNotifyWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(poll_id)
     poll = Poll.find(poll_id)
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb
new file mode 100644
index 000000000..d3ebda194
--- /dev/null
+++ b/app/workers/post_process_media_worker.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class PostProcessMediaWorker
+  include Sidekiq::Worker
+
+  sidekiq_options retry: 1, dead: false
+
+  sidekiq_retries_exhausted do |msg|
+    media_attachment_id = msg['args'].first
+
+    ActiveRecord::Base.connection_pool.with_connection do
+      begin
+        media_attachment = MediaAttachment.find(media_attachment_id)
+        media_attachment.processing = :failed
+        media_attachment.save
+      rescue ActiveRecord::RecordNotFound
+        true
+      end
+    end
+
+    Sidekiq.logger.error("Processing media attachment #{media_attachment_id} failed with #{msg['error_message']}")
+  end
+
+  def perform(media_attachment_id)
+    media_attachment = MediaAttachment.find(media_attachment_id)
+    media_attachment.processing = :in_progress
+    media_attachment.save
+    media_attachment.file.reprocess_original!
+    media_attachment.processing = :complete
+    media_attachment.save
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb
deleted file mode 100644
index cf3bd8397..000000000
--- a/app/workers/processing_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ProcessingWorker
-  include Sidekiq::Worker
-
-  sidekiq_options backtrace: true
-
-  def perform(account_id, body); end
-end
diff --git a/app/workers/publish_scheduled_announcement_worker.rb b/app/workers/publish_scheduled_announcement_worker.rb
index efca39d3d..1392efed0 100644
--- a/app/workers/publish_scheduled_announcement_worker.rb
+++ b/app/workers/publish_scheduled_announcement_worker.rb
@@ -5,15 +5,24 @@ class PublishScheduledAnnouncementWorker
   include Redisable
 
   def perform(announcement_id)
-    announcement = Announcement.find(announcement_id)
+    @announcement = Announcement.find(announcement_id)
 
-    announcement.publish! unless announcement.published?
+    refresh_status_ids!
 
-    payload = InlineRenderer.render(announcement, nil, :announcement)
+    @announcement.publish! unless @announcement.published?
+
+    payload = InlineRenderer.render(@announcement, nil, :announcement)
     payload = Oj.dump(event: :announcement, payload: payload)
 
     FeedManager.instance.with_active_accounts do |account|
       redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
     end
   end
+
+  private
+
+  def refresh_status_ids!
+    @announcement.status_ids = Status.from_text(@announcement.text).map(&:id)
+    @announcement.save
+  end
 end
diff --git a/app/workers/publish_scheduled_status_worker.rb b/app/workers/publish_scheduled_status_worker.rb
index 850610c4e..ce42f7be7 100644
--- a/app/workers/publish_scheduled_status_worker.rb
+++ b/app/workers/publish_scheduled_status_worker.rb
@@ -3,7 +3,7 @@
 class PublishScheduledStatusWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(scheduled_status_id)
     scheduled_status = ScheduledStatus.find(scheduled_status_id)
diff --git a/app/workers/pubsubhubbub/confirmation_worker.rb b/app/workers/pubsubhubbub/confirmation_worker.rb
deleted file mode 100644
index 783a8c95f..000000000
--- a/app/workers/pubsubhubbub/confirmation_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::ConfirmationWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: false
-
-  def perform(subscription_id, mode, secret = nil, lease_seconds = nil); end
-end
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
deleted file mode 100644
index 1260060bd..000000000
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::DeliveryWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 3, dead: false
-
-  def perform(subscription_id, payload); end
-end
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
deleted file mode 100644
index 75bac5d6f..000000000
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::DistributionWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push'
-
-  def perform(stream_entry_ids); end
-end
diff --git a/app/workers/pubsubhubbub/raw_distribution_worker.rb b/app/workers/pubsubhubbub/raw_distribution_worker.rb
deleted file mode 100644
index ece9c80ac..000000000
--- a/app/workers/pubsubhubbub/raw_distribution_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::RawDistributionWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push'
-
-  def perform(xml, source_account_id); end
-end
diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb
deleted file mode 100644
index b861b5e67..000000000
--- a/app/workers/pubsubhubbub/subscribe_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::SubscribeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 10, unique: :until_executed, dead: false
-
-  def perform(account_id); end
-end
diff --git a/app/workers/pubsubhubbub/unsubscribe_worker.rb b/app/workers/pubsubhubbub/unsubscribe_worker.rb
deleted file mode 100644
index 0c1c263f6..000000000
--- a/app/workers/pubsubhubbub/unsubscribe_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::UnsubscribeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: false, unique: :until_executed, dead: false
-
-  def perform(account_id); end
-end
diff --git a/app/workers/regeneration_worker.rb b/app/workers/regeneration_worker.rb
index 5c6a040bd..5c13c894f 100644
--- a/app/workers/regeneration_worker.rb
+++ b/app/workers/regeneration_worker.rb
@@ -3,7 +3,7 @@
 class RegenerationWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(account_id, _ = :home)
     account = Account.find(account_id)
diff --git a/app/workers/remote_profile_update_worker.rb b/app/workers/remote_profile_update_worker.rb
deleted file mode 100644
index 01e8daf8f..000000000
--- a/app/workers/remote_profile_update_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class RemoteProfileUpdateWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull'
-
-  def perform(account_id, body, resubscribe); end
-end
diff --git a/app/workers/resolve_account_worker.rb b/app/workers/resolve_account_worker.rb
index cd7c4d7dd..2b5be6d1b 100644
--- a/app/workers/resolve_account_worker.rb
+++ b/app/workers/resolve_account_worker.rb
@@ -3,7 +3,7 @@
 class ResolveAccountWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', unique: :until_executed
+  sidekiq_options queue: 'pull', lock: :until_executed
 
   def perform(uri)
     ResolveAccountService.new.call(uri)
diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb
deleted file mode 100644
index 10200b06c..000000000
--- a/app/workers/salmon_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class SalmonWorker
-  include Sidekiq::Worker
-
-  sidekiq_options backtrace: true
-
-  def perform(account_id, body); end
-end
diff --git a/app/workers/scheduler/backup_cleanup_scheduler.rb b/app/workers/scheduler/backup_cleanup_scheduler.rb
index d43660699..d69ca2556 100644
--- a/app/workers/scheduler/backup_cleanup_scheduler.rb
+++ b/app/workers/scheduler/backup_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::BackupCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     old_backups.reorder(nil).find_each(&:destroy!)
diff --git a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
index e5e5f6bc4..94788a85b 100644
--- a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
+++ b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::DoorkeeperCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
diff --git a/app/workers/scheduler/email_scheduler.rb b/app/workers/scheduler/email_scheduler.rb
index 1eeeee412..9a7355524 100644
--- a/app/workers/scheduler/email_scheduler.rb
+++ b/app/workers/scheduler/email_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::EmailScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   FREQUENCY      = 7.days.freeze
   SIGN_IN_OFFSET = 1.day.freeze
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb
index bf5e20757..458fe6193 100644
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@@ -4,7 +4,7 @@ class Scheduler::FeedCleanupScheduler
   include Sidekiq::Worker
   include Redisable
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     clean_home_feeds!
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 4f44078d8..6d38b52a2 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -5,7 +5,7 @@ class Scheduler::IpCleanupScheduler
 
   RETENTION_PERIOD = 1.year
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     time_ago = RETENTION_PERIOD.ago
diff --git a/app/workers/scheduler/media_cleanup_scheduler.rb b/app/workers/scheduler/media_cleanup_scheduler.rb
index fb01aa70c..671ebf6e0 100644
--- a/app/workers/scheduler/media_cleanup_scheduler.rb
+++ b/app/workers/scheduler/media_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::MediaCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     unattached_media.find_each(&:destroy)
diff --git a/app/workers/scheduler/pghero_scheduler.rb b/app/workers/scheduler/pghero_scheduler.rb
index 4453bf2cd..cf5570048 100644
--- a/app/workers/scheduler/pghero_scheduler.rb
+++ b/app/workers/scheduler/pghero_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::PgheroScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     PgHero.capture_space_stats
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index 9cfe949de..25df3c07d 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::ScheduledStatusesScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     publish_scheduled_statuses!
diff --git a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb b/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
deleted file mode 100644
index 75fe681a9..000000000
--- a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::SubscriptionsCleanupScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options unique: :until_executed, retry: 0
-
-  def perform; end
-end
diff --git a/app/workers/scheduler/subscriptions_scheduler.rb b/app/workers/scheduler/subscriptions_scheduler.rb
deleted file mode 100644
index 6903cadc7..000000000
--- a/app/workers/scheduler/subscriptions_scheduler.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::SubscriptionsScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options unique: :until_executed, retry: 0
-
-  def perform; end
-end
diff --git a/app/workers/scheduler/trending_tags_scheduler.rb b/app/workers/scheduler/trending_tags_scheduler.rb
index 77f0d5747..e9891424e 100644
--- a/app/workers/scheduler/trending_tags_scheduler.rb
+++ b/app/workers/scheduler/trending_tags_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::TrendingTagsScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     TrendingTags.update! if Setting.trends
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 881b911be..6113edde1 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
diff --git a/app/workers/verify_account_links_worker.rb b/app/workers/verify_account_links_worker.rb
index 901498583..8114d59be 100644
--- a/app/workers/verify_account_links_worker.rb
+++ b/app/workers/verify_account_links_worker.rb
@@ -3,7 +3,7 @@
 class VerifyAccountLinksWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', retry: false, unique: :until_executed
+  sidekiq_options queue: 'pull', retry: false, lock: :until_executed
 
   def perform(account_id)
     account = Account.find(account_id)
diff --git a/config/application.rb b/config/application.rb
index 1baa166ce..4c34efa15 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -7,6 +7,8 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 
 require_relative '../app/lib/exceptions'
+require_relative '../lib/paperclip/url_generator_extensions'
+require_relative '../lib/paperclip/attachment_extensions'
 require_relative '../lib/paperclip/lazy_thumbnail'
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/video_transcoder'
diff --git a/config/deploy.rb b/config/deploy.rb
index 4dc36c65c..79550baed 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lock '3.11.2'
+lock '3.12.1'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index d49fcfa99..e75b668b5 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -35,10 +35,12 @@ Rails.application.config.content_security_policy do |p|
 
     p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
     p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
+    p.child_src   :self, :blob, assets_host
     p.worker_src  :self, :blob, assets_host
   else
     p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
     p.script_src  :self, assets_host
+    p.child_src   :self, :blob, assets_host
     p.worker_src  :self, :blob, assets_host
   end
 end
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index aa1517256..4fec4320c 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -2,6 +2,6 @@
 
 Kaminari.configure do |config|
   config.default_per_page = 40
-  config.window = 1
+  config.window = 2
   config.outer_window = 1
 end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 3cd7ea3a6..09458c540 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -42,6 +42,7 @@ class Rack::Attack
     /auth/sign_in
     /auth
     /auth/password
+    /auth/confirmation
   ).freeze
 
   PROTECTED_PATHS_REGEX = Regexp.union(PROTECTED_PATHS.map { |path| /\A#{Regexp.escape(path)}/ })
@@ -70,7 +71,6 @@ class Rack::Attack
     req.remote_ip if req.post? && req.path == '/api/v1/accounts'
   end
 
-  # Throttle paging, as it is mainly used for public pages and AP collections
   throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
     req.authenticated_user_id if req.paging_request?
   end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 7f8a40d7b..f2733562f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -13,10 +13,15 @@ Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
     chain.add SidekiqErrorHandler
   end
+
+  config.death_handlers << lambda do |job, _ex|
+    digest = job['lock_digest']
+    SidekiqUniqueJobs::Digests.delete_by_digest(digest) if digest
+  end
 end
 
 Sidekiq.configure_client do |config|
   config.redis = redis_params
 end
 
-Sidekiq::Logging.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
+Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
index 77fc4f2a1..a7eab580c 100644
--- a/config/locales/activerecord.br.yml
+++ b/config/locales/activerecord.br.yml
@@ -10,4 +10,8 @@ br:
         account:
           attributes:
             username:
-              invalid: nemet lizherennoù, niverennoù ha isbarrennigoù
+              invalid: nemet lizherennoù, niverennoù hag isbarrennigoù
+        status:
+          attributes:
+            reblog:
+              taken: eus ar statud a zo dija
diff --git a/config/locales/activerecord.hy.yml b/config/locales/activerecord.hy.yml
index c40654016..0da0b3d5e 100644
--- a/config/locales/activerecord.hy.yml
+++ b/config/locales/activerecord.hy.yml
@@ -1 +1,17 @@
+---
 hy:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Վերջնաժամկետ
+        options: Տարբերակներ
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: միայն տառեր, թվեր և ընդգիծկներ
+        status:
+          attributes:
+            reblog:
+              taken: թութը գոյություն ունի
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 21007347c..24e2760da 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -3,6 +3,7 @@ kab:
   activerecord:
     attributes:
       poll:
+        expires_at: Azemz n tagara
         options: Tifranin
     errors:
       models:
@@ -10,3 +11,7 @@ kab:
           attributes:
             username:
               invalid: isekkilen, uṭṭunen d yijerriden n wadda kan
+        status:
+          attributes:
+            reblog:
+              taken: n iddaden yellan yakan
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml
index 2ebf9586c..c968e55aa 100644
--- a/config/locales/activerecord.zh-HK.yml
+++ b/config/locales/activerecord.zh-HK.yml
@@ -1,6 +1,10 @@
 ---
 zh-HK:
   activerecord:
+    attributes:
+      poll:
+        expires_at: 截止時間
+        options: 選擇
     errors:
       models:
         account:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f5a6f067d..c73115e2a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2,7 +2,7 @@
 ar:
   about:
     about_hashtag_html: هذه تبويقات متاحة للجمهور تحتوي على الكلمات الدلالية <strong>#%{hashtag}</strong>. يمكنك التفاعل معها إن كان لديك حساب في أي مكان على الفديفرس.
-    about_mastodon_html: ماستدون شبكة اجتماعية مبنية على أسُس بروتوكولات برمجيات الويب الحرة و مفتوحة المصدر. و هو لامركزي تمامًا كالبريد الإلكتروني.
+    about_mastodon_html: 'شبكة التواصل الإجتماعية المستقبَليّة: مِن دون إعلانات ، غير خاضعة لرقابة الشركات ، تصميم أخلاقي ولامركزية! بياناتكم مِلك لكم مع ماستدون!'
     about_this: عن مثيل الخادوم هذا
     active_count_after: نشط
     active_footnote: مستخدم نشيط شهريا (MAU)
@@ -39,8 +39,9 @@ ar:
     unavailable_content: محتوى غير متوفر
     unavailable_content_description:
       domain: الخادم
-      reason: 'السبب:'
+      reason: السبب
       silenced: 'سيتم إخفاء المنشورات القادمة من هذه الخوادم في الخيوط الزمنية والمحادثات العامة، ولن يتم إنشاء أي إخطارات من جراء تفاعلات مستخدميها، ما لم تُتَابعهم:'
+    unavailable_content_html: يسمح لك ماستدون عموماً بعرض محتوى المستخدمين القادم من أي خادم آخر في الفديفرس والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم بالذات.
     user_count_after:
       few: مستخدمين
       many: مستخدمين
@@ -53,6 +54,7 @@ ar:
   accounts:
     choices_html: 'توصيات %{name}:'
     endorsements_hint: يمكنك التوصية بالأشخاص الذين تتابعهم من واجهة الويب، وسيظهرون هنا.
+    featured_tags_hint: يمكنك عرض وسوم محددة سيتم عرضها هنا.
     follow: اتبع
     followers:
       few: متابِعون
@@ -202,6 +204,34 @@ ar:
       web: الويب
       whitelisted: في القائمة البيضاء
     action_logs:
+      action_types:
+        assigned_to_self_report: أسند التقرير
+        change_email_user: تغيير عنوان البريد الإلكتروني الخاص بالمستخدم
+        confirm_user: تأكيد المستخدم
+        create_account_warning: إنشاء تحذير
+        create_announcement: إنشاء إعلان
+        create_custom_emoji: إنشاء إيموجي مخصص
+        destroy_announcement: احذف الإعلان
+        destroy_custom_emoji: احذف الإيموجي المخصص
+        disable_2fa_user: تعطيل 2FA
+        disable_custom_emoji: تعطيل الإيموجي المخصص
+        disable_user: تعطيل المستخدم
+        enable_custom_emoji: تفعيل الإيموجي المخصص
+        enable_user: تفعيل المستخدم
+        memorialize_account: جعل الحساب تذكاريا
+        promote_user: ترقية المستخدم
+        remove_avatar_user: احذف الصورة الرمزية
+        reopen_report: إعادة فتح التقرير
+        reset_password_user: إعادة تعيين كلمة المرور
+        resolve_report: حل الشكوى
+        silence_account: كتم الحساب
+        suspend_account: تعليق الحساب
+        unassigned_report: إلغاء إسناد الشكوى
+        unsilence_account: إلغاء كتم الحساب
+        unsuspend_account: إلغاء تعليق الحساب
+        update_announcement: تحديث الإعلان
+        update_custom_emoji: تحديث الإيموجي المخصص
+        update_status: تحديث الحالة
       actions:
         assigned_to_self_report: قام %{name} بتعيين التقرير %{target} لأنفسهم
         change_email_user: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
@@ -239,6 +269,9 @@ ar:
         update_custom_emoji: "%{name} قام بتحديث الإيموجي %{target}"
         update_status: لقد قام %{name} بتحديث منشور %{target}
       deleted_status: "(منشور محذوف)"
+      empty: لم يتم العثور على سجلات.
+      filter_by_action: تصفية بحسب الإجراء
+      filter_by_user: تصفية حسب المستخدم
       title: سِجلّ التفتيش و المعاينة
     announcements:
       destroyed_msg: تم حذف الإعلان بنجاح!
@@ -364,6 +397,7 @@ ar:
       destroyed_msg: تم حذف نطاق البريد الإلكتروني من اللائحة السوداء بنجاح
       domain: النطاق
       empty: ليس هناك أية نطاقات للبريد الإلكتروني مُدرَجة في القائمة السوداء.
+      from_html: مِن %{domain}
       new:
         create: إضافة نطاق
         title: إضافة نطاق بريد جديد إلى اللائحة السوداء
@@ -421,10 +455,26 @@ ar:
       created_msg: تم إنشاء ملاحظة الشكوى بنجاح!
       destroyed_msg: تم حذف ملاحظة الشكوى بنجاح!
     reports:
+      account:
+        notes:
+          few: "%{count} ملاحظات"
+          many: "%{count} ملاحظات"
+          one: "%{count} ملاحظة"
+          other: "%{count} ملاحظات"
+          two: "%{count} ملاحظتَيْن"
+          zero: "%{count} ملاحظات"
+        reports:
+          few: "%{count} تقارير"
+          many: "%{count} تقارير"
+          one: "%{count} تقرير واحد"
+          other: "%{count} تقارير"
+          two: "%{count} تقريرَيْن"
+          zero: "%{count} تقارير"
       action_taken_by: تم اتخاذ الإجراء مِن طرف
       are_you_sure: هل أنت متأكد ؟
       assign_to_self: عين لي
       assigned: تعين رئيس
+      by_target_domain: نطاق الحساب المبلّغ عنه
       comment:
         none: لا شيء
       created_at: ذكرت
@@ -466,11 +516,16 @@ ar:
         all: للجميع
         disabled: لا أحد
         title: اظهر خاصية حجب النطاقات
+        users: للمستخدمين المتصلين محليا
       domain_blocks_rationale:
         title: اظهر السبب
+      enable_bootstrap_timeline_accounts:
+        title: تمكين الاشتراكات الافتراضية للمستخدمين الجدد
       hero:
         desc_html: معروض على الصفحة الأولى. لا يقل عن 600 × 100 بكسل. عند عدم التعيين ، تعود الصورة إلى النسخة المصغرة على سبيل المثال
         title: الصورة الرأسية
+      mascot:
+        title: صورة الماسكوت
       peers_api_enabled:
         desc_html: أسماء النطاقات التي التقى بها مثيل الخادوم على البيئة الموحَّدة فديفرس
         title: نشر عدد مثيلات الخوادم التي تم مصادفتها
@@ -527,6 +582,9 @@ ar:
         title: السماح للوسوم بالظهور على المتداوَلة بدون مراجعة مسبقة
       trends:
         title: الوسوم المتداولة
+    site_uploads:
+      delete: احذف الملف الذي تم تحميله
+      destroyed_msg: تم حذف التحميل مِن الموقع بنجاح!
     statuses:
       back_to_account: العودة إلى صفحة الحساب
       batch:
@@ -562,7 +620,6 @@ ar:
     warning_presets:
       add_new: إضافة واحد جديد
       delete: حذف
-      edit: تعديل
       edit_preset: تعديل نموذج التحذير
       title: إدارة نماذج التحذير
   admin_mailer:
@@ -578,6 +635,7 @@ ar:
     remove: إلغاء ربط الكنية
   appearance:
     advanced_web_interface: واجهة الويب المتقدمة
+    advanced_web_interface_hint: 'إذا كنت ترغب في استخدام عرض شاشتك بأكمله، فواجهة الويب المتقدمة تسمح لك بضبط العديد من الأعمدة المختلفة لرؤية أكبر قدر من المعلومات التي ترغب فيها في آن واحد: الخيط الرئيسي والإخطارات والخيط الزمني الفدرالي وأي عدد من القوائم والوسوم.'
     animations_and_accessibility: الإتاحة والحركة
     confirmation_dialogs: نوافذ التأكيد
     discovery: استكشاف
@@ -642,6 +700,7 @@ ar:
     trouble_logging_in: هل صادفتكم مشكلة في الولوج؟
   authorize_follow:
     already_following: أنت تتابع بالفعل هذا الحساب
+    already_requested: لقد قُمتَ بإرسال طلب متابَعة إلى هذا الحساب مِن قَبل
     error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد
     follow: اتبع
     follow_request: 'لقد قمت بإرسال طلب متابعة إلى:'
@@ -684,6 +743,7 @@ ar:
       data_removal: سوف تُحذَف منشوراتك والبيانات الأخرى نهائيا
       email_change_html: بإمكانك <a href="%{path}">تغيير عنوان بريدك الإلكتروني</a> دون أن يُحذف حسابك
       email_contact_html: إن لم تتلقّ أي شيء ، يمكنك مراسلة <a href="mailto:%{email}">%{email}</a> لطلب المساعدة
+      email_reconfirmation_html: إن لم تتلقّ الرسالة الإلكترونية للتأكيد ، بإمكانك <a href="%{path}">إعادة طلبها ثانيةً</a>
       irreversible: لن يكون بإمكانك استرجاع أو إعادة تنشيط حسابك
       more_details_html: للمزيد مِن التفاصيل ، يرجى الإطلاع على <a href="%{terms_path}">سياسة الخصوصية</a>.
       username_available: سيصبح اسم مستخدمك متوفرا ثانية
@@ -825,7 +885,7 @@ ar:
       images_and_video: ليس بالإمكان إرفاق فيديو في منشور يحتوي مسبقا على صور
       too_many: لا يمكن إرفاق أكثر من 4 ملفات
   migrations:
-    acct: username@domain للحساب الجديد
+    acct: انتقل إلى
     cancel: ألغِ التوجيه
     cancelled_msg: تم إلغاء التوجيه بنجاح.
     errors:
@@ -1089,6 +1149,8 @@ ar:
     pinned: تبويق مثبّت
     reblogged: رقّاه
     sensitive_content: محتوى حساس
+  tags:
+    does_not_match_previous_name: لا يطابق الإسم السابق
   terms:
     title: شروط الخدمة وسياسة الخصوصية على %{instance}
   themes:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d7e0faf41..1d6c11f13 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -209,6 +209,7 @@ ast:
     trouble_logging_in: "¿Problemes col aniciu de sesión?"
   authorize_follow:
     already_following: Yá tas siguiendo a esta cuenta
+    already_requested: Yá unviesti una solicitú de siguimientu a esa cuenta
     error: Desafortunadamente, hebo un fallu guetando la cuenta remota
     follow_request: 'Unviesti una solicitú de siguimientu a:'
     post_follow:
@@ -354,7 +355,7 @@ ast:
     errors:
       already_voted: Yá votesti nesta encuesta
       expired: La encuesta yá finó
-      invalid_choice: El la opción de votu escoyida nun esiste
+      invalid_choice: La opción de votu escoyida nun esiste
   preferences:
     public_timelines: Llinies temporales públiques
   relationships:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 07149f51f..4142d439f 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -54,7 +54,7 @@ bg:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 7dd49ff96..ad613f721 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -201,7 +201,7 @@ bn:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 7d15639ee..5da24d25c 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -3,8 +3,140 @@ br:
   about:
     about_this: Diàr-benn
     active_count_after: oberiant
+    api: API
     apps: Arloadoù pellgomz
     apps_platforms: Ober get Mastodoñ àr iOS, Android ha savennoù arall
+    contact: Darempred
+    discover_users: Dizoleiñ implijer·ien·ezed
+    learn_more: Gouzout hiroc'h
+    privacy_policy: Reolennoù prevezded
+    source_code: Boneg tarzh
+    terms: Divizoù gwerzhañ hollek
+    unavailable_content_description:
+      domain: Dafariad
+  accounts:
+    media: Media
+    posts_tab_heading: Toudoù
+    posts_with_replies: Toudoù ha respontoù
+    roles:
+      admin: Merour
+      bot: Robot
+      group: Strollad
+      moderator: Mod
+    unavailable: Profil dihegerz
+    unfollow: Diheuliañ
+  admin:
+    account_moderation_notes:
+      delete: Dilemel
+    accounts:
+      change_email:
+        current_email: Postel bremanel
+        label: Kemm ar postel
+        new_email: Postel nevez
+        submit: Kemm ar postel
+      enable: Gweredekaat
+      enabled: Gweredekaet
+      followers: Heulier·ezed·ien
+      header: Talbenn
+      ip: IP
+      location:
+        local: Lec'hel
+        remote: A-bell
+      moderation:
+        active: Oberiant
+        silenced: Mudet
+        suspended: Astalet
+      perform_full_suspension: Astalañ
+      protocol: Komenad
+      public: Publik
+      reject: Nac'hañ
+      reject_all: Nac'hañ pep hini
+      remove_header: Dilemel an talbenn
+      reset: Adderaouekaat
+      reset_password: Adderaouekaat ar ger-tremen
+      roles:
+        admin: Merour
+        moderator: Habaskaer·ez
+        user: Implijer·ez
+    action_logs:
+      deleted_status: "(statud dilemet)"
+    announcements:
+      new:
+        create: Sevel ur gemenn
+        title: Kemenn nevez
+      title: Kemennoù
+    custom_emojis:
+      delete: Dilemel
+      disable: Diweredekaat
+      disabled: Diweredekaet
+      emoji: Fromlun
+      enable: Gweredekaat
+      enabled: Gweredekaet
+    dashboard:
+      config: Kefluniadur
+      software: Meziant
+      trends: Luskadoù
+    domain_blocks:
+      domain: Domani
+      new:
+        create: Sevel ur stanker
+        severity:
+          noop: Hini ebet
+          silence: Mudañ
+          suspend: Astalañ
+      severity:
+        silence: mudet
+        suspend: astalet
+      show:
+        undo: Dizober
+    email_domain_blocks:
+      add_new: Ouzhpenniñ unan nevez
+      delete: Dilemel
+      domain: Domani
+      from_html: eus %{domain}
+      new:
+        create: Ouzhpenniñ un domani
+    instances:
+      by_domain: Domani
+      moderation:
+        all: Pep tra
+    settings:
+      domain_blocks:
+        all: D'an holl dud
+      site_title: Anv ar servijer
+      title: Arventennoù al lec'hienn
+  auth:
+    change_password: Ger-tremen
+    delete_account: Dilemel ar gont
+    login: Mont tre
+    logout: Digennaskañ
+    providers:
+      saml: SAML
+    reset_password: Adderaouekaat ar ger-tremen
+    security: Diogelroez
+    setup:
+      title: Kefluniañ
+  authorize_follow:
+    title: Heuliañ %{acct}
+  challenge:
+    confirm: Kenderc' hel
+    invalid_password: Ger-tremen diwiriek
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}e"
+      about_x_months: "%{count}miz"
+      about_x_years: "%{count}b"
+      almost_x_years: "%{count}b"
+      less_than_x_minutes: "%{count}m"
+      over_x_years: "%{count}b"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}miz"
+      x_seconds: "%{count}eil"
+  deletes:
+    proceed: Dilemel ar gont
+  directories:
+    directory: Roll ar profiloù
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -12,14 +144,93 @@ br:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
+  featured_tags:
+    add_new: Ouzhpenniñ unan nevez
+  filters:
+    contexts:
+      account: Profiloù
+      notifications: Kemennoù
+    index:
+      delete: Dilemel
+  footer:
+    developers: Diorroerien
+    more: Muioc'h…
+  generic:
+    all: Pep tra
+    copy: Eilañ
+    delete: Dilemel
+    order_by: Urzhiañ dre
   invites:
     expires_in:
       '1800': 30 minutes
       '21600': 6 hours
       '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+      '43200': 12 eur
+      '604800': 1 sizhun
+      '86400': 1 deiz
+    expires_in_prompt: Birviken
+    title: Pediñ tud
+  notification_mailer:
+    follow:
+      title: Heulier nevez
+    mention:
+      action: Respont
+  relationships:
+    followers: Heulier·ezed·ien
+  sessions:
+    browser: Merdeer
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      windows: Windows
+  statuses:
+    show_more: Diskouez muioc'h
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      public: Publik
+  stream_entries:
+    pinned: Toud spilhennet
+  themes:
+    default: Mastodoñ (Teñval)
+    mastodon-light: Mastodoñ (Sklaer)
+  time:
+    formats:
+      default: "%He%M, %d %b %Y"
+      month: "%b %Y"
+  two_factor_authentication:
+    disable: Diweredekaat
+    enable: Gweredekaat
+    setup: Kefluniañ
+  user_mailer:
+    warning:
+      title:
+        none: Diwall
+    welcome:
+      edit_profile_action: Kefluniañ ar profil
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1c30b6b7a..f056bb943 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -92,6 +92,7 @@ ca:
       delete: Suprimeix
       destroyed_msg: Nota de moderació destruïda amb èxit!
     accounts:
+      add_email_domain_block: Afegir el domini de correu a la llista negra
       approve: Aprova
       approve_all: Aprova'ls tots
       are_you_sure: N'estàs segur?
@@ -172,6 +173,7 @@ ca:
         staff: Personal
         user: Usuari
       search: Cerca
+      search_same_email_domain: Altres usuaris amb el mateix domini de correu
       search_same_ip: Altres usuaris amb la mateixa IP
       shared_inbox_url: URL de la safata d'entrada compartida
       show:
@@ -193,6 +195,42 @@ ca:
       web: Web
       whitelisted: Llista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assigna l'informe
+        change_email_user: Canvia l'adreça electrònica per l'usuari
+        confirm_user: Confirma l'usuari
+        create_account_warning: Crea un avís
+        create_announcement: Crea un anunci
+        create_custom_emoji: Crea un emoji personalitzat
+        create_domain_allow: Crea un domini permès
+        create_domain_block: Crea un bloqueig de domini
+        create_email_domain_block: Crea un bloqueig de domini d'adreça de correu
+        demote_user: Degrada l'usuari
+        destroy_announcement: Esborra l'anunci
+        destroy_custom_emoji: Esborra l'emoji personalitzat
+        destroy_domain_allow: Esborra el domini permès
+        destroy_domain_block: Esborra el bloqueig de domini
+        destroy_email_domain_block: Esborra el bloqueig de domini de l'adreça de correu
+        destroy_status: Esborra el tut
+        disable_2fa_user: Desactiva 2FA
+        disable_custom_emoji: Desactiva l'emoji personalitzat
+        disable_user: Deshabilita l'usuari
+        enable_custom_emoji: Activa l'emoji personalitzat
+        enable_user: Activa l'usuari
+        memorialize_account: Memoritza el compte
+        promote_user: Promou l'usuari
+        remove_avatar_user: Eliminar avatar
+        reopen_report: Reobre l'informe
+        reset_password_user: Restableix la contrasenya
+        resolve_report: Resolt l'informe
+        silence_account: Silencia el compte
+        suspend_account: Suspèn el compte
+        unassigned_report: Des-assigna l'informe
+        unsilence_account: Desfés el silenci del compte
+        unsuspend_account: Desfés la suspensió del compte
+        update_announcement: Actualitza l'anunci
+        update_custom_emoji: Actualitza l'emoji personalitzat
+        update_status: Actualitza l'estat
       actions:
         assigned_to_self_report: "%{name} han assignat l'informe %{target} a ells mateixos"
         change_email_user: "%{name} ha canviat l'adreça de correu electrònic del usuari %{target}"
@@ -230,6 +268,9 @@ ca:
         update_custom_emoji: "%{name} ha actualitzat l'emoji %{target}"
         update_status: "%{name} estat actualitzat per %{target}"
       deleted_status: "(tut esborrat)"
+      empty: No s’han trobat registres.
+      filter_by_action: Filtra per acció
+      filter_by_user: Filtra per usuari
       title: Registre d'auditoria
     announcements:
       destroyed_msg: L’anunci s’ha esborrat amb èxit!
@@ -358,6 +399,7 @@ ca:
       destroyed_msg: S'ha eliminat correctament el bloc del domini de correu
       domain: Domini
       empty: Cap domini de correu a la llista negre.
+      from_html: des de %{domain}
       new:
         create: Afegeix un domini
         title: Nova adreça de correu en la llista negra
@@ -537,6 +579,9 @@ ca:
       trends:
         desc_html: Mostra públicament les etiquetes revisades anteriorment que actualment estan en tendència
         title: Etiquetes tendència
+    site_uploads:
+      delete: Esborra el fitxer pujat
+      destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
     statuses:
       back_to_account: Torna a la pàgina del compte
       batch:
@@ -573,7 +618,6 @@ ca:
     warning_presets:
       add_new: Afegeix-ne un de nou
       delete: Esborra
-      edit: Edita
       edit_preset: Edita l'avís predeterminat
       title: Gestiona les configuracions predefinides dels avisos
   admin_mailer:
@@ -661,6 +705,7 @@ ca:
     trouble_logging_in: Problemes per iniciar la sessió?
   authorize_follow:
     already_following: Ja estàs seguint aquest compte
+    already_requested: Ja has enviat una sol·licitud de seguiment a aquest usuari
     error: Malauradament, ha ocorregut un error cercant el compte remot
     follow: Segueix
     follow_request: 'Has enviat una sol·licitud de seguiment a:'
@@ -849,6 +894,7 @@ ca:
   media_attachments:
     validations:
       images_and_video: No es pot adjuntar un vídeo a una publicació que ja contingui imatges
+      not_ready: No es poden adjuntar fitxers que no s'hagin acabat de processar. Torna-ho a provar en un moment!
       too_many: No es poden adjuntar més de 4 fitxers
   migrations:
     acct: Mogut a
@@ -1070,6 +1116,8 @@ ca:
     disallowed_hashtags:
       one: 'conté una etiqueta no permesa: %{tags}'
       other: 'conté les etiquetes no permeses: %{tags}'
+    errors:
+      in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
     language_detection: Detecta automàticament el llenguatge
     open_in_web: Obre en la web
     over_character_limit: Límit de caràcters de %{max} superat
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 24f7f45fc..2d50cefd7 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -92,6 +92,7 @@ co:
       delete: Toglie
       destroyed_msg: Nota di muderazione sguassata!
     accounts:
+      add_email_domain_block: Mette u duminiu e-mail in lista nera
       approve: Appruvà
       approve_all: Appruvà tuttu
       are_you_sure: Site sicuru·a?
@@ -172,6 +173,7 @@ co:
         staff: Squadra
         user: Utilizatore
       search: Cercà
+      search_same_email_domain: Altri utilizatori cù listessu duminiu d'e-mail
       search_same_ip: Altri utilizatori cù listessa IP
       shared_inbox_url: URL di l’inbox spartuta
       show:
@@ -193,6 +195,42 @@ co:
       web: Web
       whitelisted: In a lista bianca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assignà signalamentu
+        change_email_user: Mudificà l'E-mail di l'Utilizatore
+        confirm_user: Cunfirmà Utilizatore
+        create_account_warning: Creà avertimentu
+        create_announcement: Creà Annunziu
+        create_custom_emoji: Creà Emoji Persunalizata
+        create_domain_allow: Creà Auturizazione di Duminiu
+        create_domain_block: Creà Blucchime di Duminiu
+        create_email_domain_block: Creà Blucchime di Duminiu E-mail
+        demote_user: Ritrugadà Utilizatore
+        destroy_announcement: Toglie Annunziu
+        destroy_custom_emoji: Toglie Emoji Persunalizata
+        destroy_domain_allow: Toglie Auturizazione di Duminiu
+        destroy_domain_block: Toglie Blucchime di Duminiu
+        destroy_email_domain_block: Toglie blucchime di duminiu e-mail
+        destroy_status: Toglie u statutu
+        disable_2fa_user: Disattivà l’identificazione à 2 fattori
+        disable_custom_emoji: Disattivà Emoji Persunalizata
+        disable_user: Disattivà Utilizatore
+        enable_custom_emoji: Attivà Emoji Persunalizata
+        enable_user: Attivà utilizatore
+        memorialize_account: Trasfurmà contu in mimuriale
+        promote_user: Prumove Utilizatore
+        remove_avatar_user: Toglie Avatar
+        reopen_report: Riapre Signalamentu
+        reset_password_user: Riinizializà Chjave d'Accessu
+        resolve_report: Chjode Signalamentu
+        silence_account: Silenzà Contu
+        suspend_account: Suspende Contu
+        unassigned_report: Disassignà signalamentu
+        unsilence_account: Ùn Silenzà Più u Contu
+        unsuspend_account: Ùn Suspende Più u Contu
+        update_announcement: Cambià Annunziu
+        update_custom_emoji: Cambià Emoji Persunalizata
+        update_status: Cambià Statutu
       actions:
         assigned_to_self_report: "%{name} s’hè assignatu u signalamentu %{target}"
         change_email_user: "%{name} hà cambiatu l’indirizzu e-mail di %{target}"
@@ -230,6 +268,9 @@ co:
         update_custom_emoji: "%{name} hà messu à ghjornu l’emoji %{target}"
         update_status: "%{name} hà cambiatu u statutu di %{target}"
       deleted_status: "(statutu sguassatu)"
+      empty: Nunda trovu.
+      filter_by_action: Filtrà da azzione
+      filter_by_user: Filtrà da utilizatore
       title: Ghjurnale d’audit
     announcements:
       destroyed_msg: Annunziu sguassatu!
@@ -358,6 +399,7 @@ co:
       destroyed_msg: U blucchime di u duminiu d’e-mail ùn hè più attivu
       domain: Duminiu
       empty: Ùn c'hè manc'un duminiu d'email in lista nera.
+      from_html: da %{domain}
       new:
         create: Creà un blucchime
         title: Nova iscrizzione nant’a lista nera e-mail
@@ -537,6 +579,9 @@ co:
       trends:
         desc_html: Mustrà à u pubblicu i hashtag chì sò stati digià verificati è chì sò in e tendenze avà
         title: Tendenze di hashtag
+    site_uploads:
+      delete: Sguassà u fugliale caricatu
+      destroyed_msg: Fugliale sguassatu da u situ!
     statuses:
       back_to_account: Ritornu à a pagina di u contu
       batch:
@@ -573,7 +618,6 @@ co:
     warning_presets:
       add_new: Aghjunghje
       delete: Sguassà
-      edit: Cambià
       edit_preset: Cambià a preselezzione d'avertimentu
       title: Amministrà e preselezzione d'avertimentu
   admin_mailer:
@@ -661,6 +705,7 @@ co:
     trouble_logging_in: Difficultà per cunnettavi?
   authorize_follow:
     already_following: Site digià abbunatu·a à stu contu
+    already_requested: Avete digià mandatu una dumanda d'abbunamentu à stu contu
     error: Peccatu, c’hè statu un prublemu ricercandu u contu
     follow: Siguità
     follow_request: 'Avete dumandatu di siguità:'
@@ -849,6 +894,7 @@ co:
   media_attachments:
     validations:
       images_and_video: Ùn si pò micca aghjunghje un filmettu à un statutu chì hà digià ritratti
+      not_ready: Ùn si pò micca aghjunghje un fugliale micca ancu trattatu. Ripruvate più tardi!
       too_many: Ùn si pò micca aghjunghje più di 4 fugliali
   migrations:
     acct: cugnome@duminiu di u novu contu
@@ -1070,6 +1116,8 @@ co:
     disallowed_hashtags:
       one: 'cuntene l’hashtag disattivatu: %{tags}'
       other: 'cuntene l’hashtag disattivati: %{tags}'
+    errors:
+      in_reply_not_found: U statutu à quellu avete pruvatu di risponde ùn sembra micca esiste.
     language_detection: Truvà a lingua autumaticamente
     open_in_web: Apre nant’à u web
     over_character_limit: Site sopr’à a limita di %{max} caratteri
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bab669e7e..d7c49279d 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -244,6 +244,7 @@ cs:
       edit:
         title: Upravit oznámení
       empty: Nebyla nalezena žádná oznámení.
+      live: Živě
       new:
         create: Vytvořit oznámení
         title: Nové oznámení
@@ -588,7 +589,6 @@ cs:
     warning_presets:
       add_new: Přidat nové
       delete: Smazat
-      edit: Upravit
       edit_preset: Upravit předlohu pro varování
       title: Spravovat předlohy pro varování
   admin_mailer:
@@ -676,6 +676,7 @@ cs:
     trouble_logging_in: Problémy s přihlášením?
   authorize_follow:
     already_following: Tento účet již sledujete
+    already_requested: Tomuto účtu už jste žádost o sledování zaslali
     error: Při hledání vzdáleného účtu bohužel nastala chyba
     follow: Sledovat
     follow_request: 'Poslali jste žádost o sledování uživateli:'
@@ -1119,6 +1120,7 @@ cs:
         other: "%{count} hlasů"
       vote: Hlasovat
     show_more: Zobrazit více
+    show_thread: Zobrazit vlákno
     sign_in_to_participate: Chcete-li se zúčastnit této konverzace, přihlaste se
     title: "%{name}: „%{quote}“"
     visibilities:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index afca0212a..572cf895a 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -569,6 +569,9 @@ cy:
       trends:
         desc_html: Arddangos hashnodau a adolygwyd yn gynt yn gyhoeddus sydd yn tueddu yn bresennol
         title: Hashnodau tueddig
+    site_uploads:
+      delete: Dileu ffeil sydd wedi'i uwchlwytho
+      destroyed_msg: Uwchlwythiad wefan wedi'i ddileu yn lwyddianus!
     statuses:
       back_to_account: Yn ôl i dudalen y cyfrif
       batch:
@@ -605,7 +608,6 @@ cy:
     warning_presets:
       add_new: Ychwanegu newydd
       delete: Dileu
-      edit: Golygu
       edit_preset: Golygu rhagosodiad rhybudd
       title: Rheoli rhagosodiadau rhybudd
   admin_mailer:
@@ -693,6 +695,7 @@ cy:
     trouble_logging_in: Trafferdd mewngofnodi?
   authorize_follow:
     already_following: Yr ydych yn dilyn y cyfrif hwn yn barod
+    already_requested: Rydych barod wedi anfon ceisiad dilyn i'r cyfrif hynny
     error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif anghysbell
     follow: Dilyn
     follow_request: 'Yr ydych wedi anfon cais dilyn at:'
@@ -889,6 +892,7 @@ cy:
   media_attachments:
     validations:
       images_and_video: Ni ellir ychwanegu fideo at statws sy'n cynnwys delweddau'n barod
+      not_ready: Methu atodi ffeiliau sydd dal yn prosesu. Ceisiwch eto mewn foment!
       too_many: Ni ellir ychwanegu mwy na 4 dogfen
   migrations:
     acct: enwdefnyddiwr@parth y cyfrif newydd
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1cdf7722e..c978029b3 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -489,7 +489,6 @@ da:
       most_recent: Seneste
     warning_presets:
       delete: Slet
-      edit: Rediger
   admin_mailer:
     new_report:
       body: "%{reporter} har anmeldt %{target}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50f994473..d99b36d14 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -92,6 +92,7 @@ de:
       delete: Löschen
       destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
     accounts:
+      add_email_domain_block: E-Mail-Domain blacklisten
       approve: Akzeptieren
       approve_all: Alle akzeptieren
       are_you_sure: Bist du sicher?
@@ -172,6 +173,7 @@ de:
         staff: Mitarbeiter
         user: Nutzer
       search: Suche
+      search_same_email_domain: Andere Benutzer mit der gleichen E-Mail-Domain
       search_same_ip: Andere Benutzer mit derselben IP
       shared_inbox_url: Geteilte Posteingang-URL
       show:
@@ -193,6 +195,42 @@ de:
       web: Web
       whitelisted: Auf der Whitelist
     action_logs:
+      action_types:
+        assigned_to_self_report: Bericht zuweisen
+        change_email_user: E-Mail des Benutzers ändern
+        confirm_user: Benutzer bestätigen
+        create_account_warning: Warnung erstellen
+        create_announcement: Ankündigung erstellen
+        create_custom_emoji: Eigene Emoji erstellen
+        create_domain_allow: Domain erlauben
+        create_domain_block: Domain blockieren
+        create_email_domain_block: E-Mail-Domain-Block erstellen
+        demote_user: Benutzer degradieren
+        destroy_announcement: Ankündigung löschen
+        destroy_custom_emoji: Eigene Emoji löschen
+        destroy_domain_allow: Erlaube das Löschen von Domains
+        destroy_domain_block: Domain-Blockade löschen
+        destroy_email_domain_block: E-Mail-Domain-Blockade löschen
+        destroy_status: Beitrag löschen
+        disable_2fa_user: 2FA deaktivieren
+        disable_custom_emoji: Benutzerdefiniertes Emoji deaktivieren
+        disable_user: Benutzer deaktivieren
+        enable_custom_emoji: Benutzerdefiniertes Emoji aktivieren
+        enable_user: Benutzer aktivieren
+        memorialize_account: Konto in ein Konto von einer verstorbenen Person umwandeln
+        promote_user: Benutzer befördern
+        remove_avatar_user: Profilbild entfernen
+        reopen_report: Meldung wieder eröffnen
+        reset_password_user: Passwort zurücksetzen
+        resolve_report: Bericht lösen
+        silence_account: Konto stummschalten
+        suspend_account: Konto sperren
+        unassigned_report: Berichtszuweisung entfernen
+        unsilence_account: Konto nicht mehr stummschalten
+        unsuspend_account: Konto nicht mehr sperren
+        update_announcement: Ankündigung aktualisieren
+        update_custom_emoji: Benutzerdefiniertes Emoji aktualisieren
+        update_status: Beitrag aktualisieren
       actions:
         assigned_to_self_report: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
         change_email_user: "%{name} hat die E-Mail-Adresse des Nutzers %{target} geändert"
@@ -230,6 +268,9 @@ de:
         update_custom_emoji: "%{name} hat das %{target} Emoji geändert"
         update_status: "%{name} hat einen Beitrag von %{target} aktualisiert"
       deleted_status: "(gelöschter Beitrag)"
+      empty: Keine Protokolle gefunden.
+      filter_by_action: Nach Aktion filtern
+      filter_by_user: Nach Benutzer filtern
       title: Überprüfungsprotokoll
     announcements:
       destroyed_msg: Ankündigung erfolgreich gelöscht!
@@ -358,6 +399,7 @@ de:
       destroyed_msg: E-Mail-Domain-Blockade erfolgreich gelöscht
       domain: Domain
       empty: Keine E-Mail-Domains sind momentan auf der Blacklist.
+      from_html: von %{domain}
       new:
         create: Blockade erstellen
         title: Neue E-Mail-Domain-Blockade
@@ -537,6 +579,9 @@ de:
       trends:
         desc_html: Zuvor überprüfte Hashtags öffentlich anzeigen, die derzeit angesagt sind
         title: Trendende Hashtags
+    site_uploads:
+      delete: Hochgeladene Datei löschen
+      destroyed_msg: Upload erfolgreich gelöscht!
     statuses:
       back_to_account: Zurück zum Konto
       batch:
@@ -573,7 +618,6 @@ de:
     warning_presets:
       add_new: Neu hinzufügen
       delete: Löschen
-      edit: Bearbeiten
       edit_preset: Warnungsvorlage bearbeiten
       title: Warnungsvorlagen verwalten
   admin_mailer:
@@ -661,6 +705,7 @@ de:
     trouble_logging_in: Schwierigkeiten beim Anmelden?
   authorize_follow:
     already_following: Du folgst diesem Konto bereits
+    already_requested: Du hast bereits eine Anfrage zum Folgen diesen Accounts versendet
     error: Das Remote-Konto konnte nicht geladen werden
     follow: Folgen
     follow_request: 'Du hast eine Folgeanfrage gesendet an:'
@@ -849,6 +894,7 @@ de:
   media_attachments:
     validations:
       images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthält, angehängt werden
+      not_ready: Dateien die noch nicht bearbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
       too_many: Es können nicht mehr als 4 Dateien angehängt werden
   migrations:
     acct: benutzername@domain des neuen Kontos
@@ -1070,6 +1116,8 @@ de:
     disallowed_hashtags:
       one: 'enthält einen verbotenen Hashtag: %{tags}'
       other: 'enthält verbotene Hashtags: %{tags}'
+    errors:
+      in_reply_not_found: Der Beitrag, auf den du antworten möchtest, scheint nicht zu existieren.
     language_detection: Sprache automatisch erkennen
     open_in_web: Im Web öffnen
     over_character_limit: Zeichenlimit von %{max} überschritten
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 3fe043754..acfa884b4 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -27,7 +27,15 @@ br:
       reset_password_instructions:
         action: Cheñch ar ger-tremen
         explanation: Goulennet ho peus ur ger-tremen nevez evit ho kont.
+        title: Adderaouekaat ar ger-tremen
+      two_factor_disabled:
+        title: 2FA diweredekaet
+      two_factor_enabled:
+        title: 2FA gweredekaet
     passwords:
       updated_not_active: Kemmet eo bet ho ker-tremen ent reizh.
     registrations:
       signed_up: Donemat ! Kevreet oc'h.
+  errors:
+    messages:
+      not_found: digavet
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 71c647f2b..3edd348e6 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -67,16 +67,16 @@ fr:
       no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d’utiliser l’URL complète.
       send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre adresse électronique existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
-      updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté⋅e.
+      updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté·e.
       updated_not_active: Votre mot de passe a été modifié avec succès.
     registrations:
       destroyed: Au revoir ! Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt.
-      signed_up: Bienvenue ! Vous êtes connecté⋅e.
-      signed_up_but_inactive: Vous êtes bien enregistré⋅e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
-      signed_up_but_locked: Vous êtes bien enregistré⋅e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
-      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous étudierons votre demande. Vous serez informé·e si elle a été approuvée.
+      signed_up: Bienvenue ! Vous êtes connecté·e.
+      signed_up_but_inactive: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
+      signed_up_but_locked: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
+      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous examinerons votre demande. Vous serez informé·e si elle a été approuvée.
       signed_up_but_unconfirmed: Un message contenant un lien de confirmation a été envoyé à votre adresse courriel. Ouvrez ce lien pour activer votre compte. Veuillez vérifier votre dossier d'indésirables si vous ne recevez pas le courriel.
-      update_needs_confirmation: Votre compte a bien été mis à jour, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse. Si vous n'avez pas reçu le courriel, vérifiez votre dossier d'indésirables.
+      update_needs_confirmation: Votre compte a bien été mis à jour, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse. Si vous n'avez pas reçu le courriel, vérifiez votre dossier de spams.
       updated: Votre compte a été modifié avec succès.
     sessions:
       already_signed_out: Déconnecté·e.
@@ -85,14 +85,14 @@ fr:
     unlocks:
       send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
-      unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté⋅e.
+      unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté·e.
   errors:
     messages:
       already_confirmed: a déjà été validée, veuillez essayer de vous connecter
       confirmation_period_expired: à confirmer dans les %{period}, merci de faire une nouvelle demande
       expired: a expiré, merci d’en faire une nouvelle demande
-      not_found: n’a pas été trouvé⋅e
-      not_locked: n’était pas verrouillé⋅e
+      not_found: n’a pas été trouvé·e
+      not_locked: n’était pas verrouillé·e
       not_saved:
-        one: 'Une erreur a empêché ce(tte) %{resource} d’être sauvegardé⋅e :'
+        one: 'Une erreur a empêché ce·tte %{resource} d’être sauvegardé·e :'
         other: "%{count} erreurs ont empêché %{resource} d’être sauvegardé⋅e :"
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index c40654016..666c4c996 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -1 +1,7 @@
+---
 hy:
+  devise:
+    confirmations:
+      confirmed: Ձեր էլփոստի հասցեն հաջողությամբ հաստատվեց։
+    sessions:
+      signed_in: Մուտքը հաջողվեց։
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 288617be8..4d6fb3902 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -8,10 +8,10 @@ is:
     failure:
       already_authenticated: Þú ert nú þegar skráð(ur) inn.
       inactive: Aðgangur þinn hefur ekki enn verið virkjaður.
-      invalid: Ógildur %{authentication_keys} eða lykilorð.
+      invalid: Ógilt %{authentication_keys} eða lykilorð.
       last_attempt: Þú getur reynt einu sinni í viðbót áður en aðgangnum þínum verður læst.
       locked: Notandaaðgangurinn þinn er læstur.
-      not_found_in_database: Ógildur %{authentication_keys} eða lykilorð.
+      not_found_in_database: Ógilt %{authentication_keys} eða lykilorð.
       pending: Notandaaðgangurinn þinn er enn til yfirferðar.
       timeout: Setan þín er útrunnin. Skráðu þig aftur inn til að halda áfram.
       unauthenticated: Þú þarft að skrá þig inn eða nýskrá þig áður en lengra er haldið.
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 650ade1e4..0149c4512 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -10,7 +10,7 @@ kab:
       inactive: Amiḍan-inek mazal ur yermed ara.
       invalid: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       last_attempt: Γur-k yiwen n uɛraḍ-nniḍen kan send ad yettucekkel umiḍan-ik.
-      locked: Amiḍan-ik yewḥel.
+      locked: Amiḍan-ik yettwargel.
       not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
       timeout: Tiγimit n tuqqna tezri. Ma ulac aγilif ɛiwed tuqqna akken ad tkemmleḍ.
@@ -22,10 +22,11 @@ kab:
         action_with_app: Wekked sakkin uγal γer %{app}
         explanation: Aqla-k terniḍ amiḍan deg %{host} s tansa imayl-agi. Mazal-ak yiwen utekki akken ad t-tremdeḍ. Ma mačči d kečč i yessutren ay-agi, ttxil-k ssinef izen-a.
         explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nγeṛ asuter-ik ticki tsentmeḍ tansa-ik imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ γer umiḍan-ik. Ma yella nugi asuter-ik, isefka-ik ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč i yellan deffir n usuter-agi, ttxil-k ssinef izen-agi.
-        extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec</a>.
+        extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec-nneγ</a>.
         subject: 'Maṣṭudun: Asentem n ujerred deg uqeddac %{instance}'
         title: Senqed tansa-inek imayl
       email_changed:
+        explanation: 'Tansa n yimayl n umiḍan-ik ibeddel ɣer:'
         extra: Ma mačči d kečč i ibeddlen tansa imayl, ihi yezmer d alebɛaḍ i ikecmen γer umiḍan-ik. Ttxil-k beddel awal-ik uffir tura neγ siwel i unedbal n uqeddac ma tḥesleḍ berra n umiḍan-ik.
         subject: 'Maṣṭudun: Imayl-ik yettubeddel'
         title: Tansa imayl tamaynut
@@ -42,6 +43,10 @@ kab:
         action: Beddel awal uffir
         explanation: Tessutreḍ awal uffir amaynut i umiḍan-ik.
         title: Aɛiwed n wawal uffir
+      two_factor_disabled:
+        title: Asesteb s snat n tarrayin insa
+      two_factor_enabled:
+        title: Asesteb s snat n tarrayin irmed
     passwords:
       send_paranoid_instructions: Ma nufa tansa-inek imayl tella deg uzadur-nneγ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaγ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k ẓer deg ukaram spam.
       updated: Awal-ik uffir yettwabeddel mebla ugur. Aqla-k tura tjerrḍeḍ.
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index d578b8dc5..42eb0690a 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -2,7 +2,7 @@
 nn:
   devise:
     confirmations:
-      confirmed: E-posten din er stadefesta.
+      confirmed: E-posten din er stadfesta.
       send_instructions: Om nokre få minutt får du ein e-post som fortel deg korleis du skal stadfesta e-postadressa di. Sjekk søppelpostmappa di om du ikkje fekk e-posten.
       send_paranoid_instructions: Om vi har e-postadressa di i databasen vår, får du ein e-post som fortel deg korleis du skal stadfesta e-postadressa om nokre få minutt. Ver venleg og sjekk søppelpostmappa di om du ikkje fekk denne e-posten.
     failure:
@@ -12,21 +12,22 @@ nn:
       last_attempt: Du har eitt forsøk igjen før kontoen din vert låst.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
-      pending: Kontoen din er fortsatt under gjennomgang.
-      timeout: Økten din løp ut på tid. Logg inn på nytt for å fortsette.
-      unauthenticated: Du må logge inn eller registrere deg før du kan fortsette.
+      pending: Kontoen din er vert gjennomgått enno.
+      timeout: Økta di er utgått. Logg inn omatt for å halde fram.
+      unauthenticated: Du må logge inn eller registere deg før du kan halde fram.
       unconfirmed: Du må stadfesta e-postadressa di før du kan gå vidare.
     mailer:
       confirmation_instructions:
         action: Stadfest e-postadresse
         action_with_app: Stadfest og gå tilbake til %{app}
-        explanation: Du har laget en konto på %{host} med denne e-postadressen. Du er ett klikk unna å aktivere den. Hvis dette ikke var deg, vennligst se bort fra denne e-posten.
-        extra_html: Vennligst også sjekk ut <a href="%{terms_path}">instansens regler </a> og <a href="%{policy_path}">våre bruksvilkår</a>.
-        subject: 'Mastodon: Instruksjoner for å bekrefte e-postadresse %{instance}'
+        explanation: Du har registrert deg på %{host} med denne e-postadressa. Du er eitt klikk unna aktivere kontoen. Om det ikkje var deg, berre oversjå denne e-posten.
+        explanation_when_pending: Du har søkt om en invitasjon til %{host} med denne e-postadressa. Når du har stadfesta e-postadressa di, vil vi gå gjennom søknaden. Du kan logge på for å endre detaljar eller slette kontoen, men du har ikke tilgang til dei fleste funksjonane før kontoen din er godkjent. Dersom søknaden din vert avslått, vil dataene dine verte sletta, så du treng ikkje gjera meir. Dersom dette ikke var deg, berre oversjå denne e-posten.
+        extra_html: Ta ein kikk på <a href="%{terms_path}">reglane på instansen</a> og <a href="%{policy_path}">bruksvilkåra våre</a>.
+        subject: 'Mastodon: Instruksjonar for stadfesting hos %{instance}'
         title: Stadfest e-postadresse
       email_changed:
         explanation: 'E-postadressa til kontoen din vert endra til:'
-        extra: Hvis du ikke endret din e-postadresse, er det sannsynlig at noen har fått tilgang til din konto. Vennligst endre ditt passord umiddelbart eller kontakt instansens administrator dersom du er utestengt fra kontoen din.
+        extra: Dersom du ikkje har endra e-postadressa di, er det truleg at nokon har fått tilgang til kontoen din. Bytt straks passordet ditt, eller kontakt tenaradministratoren dersom du har vorte låst ut av kontoen.
         subject: 'Mastodon: E-postadressa er endra'
         title: Ny e-postadresse
       password_change:
@@ -36,8 +37,8 @@ nn:
         title: Passord endra
       reconfirmation_instructions:
         explanation: Stadfest den nye adressa for å byta e-postadressa di.
-        extra: Se bort fra denne e-posten dersom du ikke gjorde denne endringen. E-postadressen for Mastadon-kontoen blir ikke endret før du trykker på lenken over.
-        subject: 'Mastodon: Bekreft e-postadresse for %{instance}'
+        extra: Oversjå denne eposten dersom du ikkje gjorde endra. E-postadressa for Mastodon-kontoen vert ikkje endra før lenka over vert trykt på.
+        subject: 'Mastodon: Stadfest e-post for %{instance}'
         title: Stadfest e-postadresse
       reset_password_instructions:
         action: Endr passord
@@ -46,22 +47,25 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
-        subject: 'Mastodon: To-faktor autentisering deaktivert'
+        explanation: To-faktor-autentisering har vorte slått av for kontoen din. Det går no an logge inn med berre e-postadresse og passord.
+        subject: 'Mastodon: To-faktor-autentisering deaktivert'
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: To-faktor autentisering er aktivert for kontoen din. Et symbol som er generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
-        subject: 'Mastodon: To-faktor autentisering aktivert'
+        explanation: To-faktor-autentisering har vorte slått på for kontoen din. Ein kode frå den samankopla TOTP-appen er kravd for å logge inn.
+        subject: 'Mastodon: To-faktor-autentisering aktivert'
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
-        explanation: De forrige gjenopprettingskodene er ugyldig og nye generert.
+        explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
+        subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
+        title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
-        subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
+        subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
     omniauth_callbacks:
-      failure: Kunne ikke autentisere deg fra %{kind} fordi "%{reason}".
-      success: Vellykket autentisering fra %{kind}.
+      failure: Du kunne ikkje verte autentisert frå %{kind} av di "%{reason}".
+      success: Autentisert frå %{kind}-konto.
     passwords:
-      no_token: Du har ingen tilgang til denne siden hvis ikke klikket på en e-post om nullstilling av passord. Hvis du kommer fra en sådan bør du dobbelsjekke at du limte inn hele URLen.
-      send_instructions: Du vil motta en e-post med instruksjoner om nullstilling av passord om noen få minutter.
+      no_token: Du har ikkje tilgang til denne sida utan ha gått via ein e-post som gjeld å nullstille passordet. Dersom det er kva du har gjort, dobbelsjekk at du har kopiert heile URLen.
+      send_instructions: Om vi har e-postadressa di i databasen vår, får du ein e-post med lenke til gjenopprette passordet om nokre få minutt. Sjekk søppelpostmappa di om du ikkje fekk denne e-posten.
       send_paranoid_instructions: Om vi har e-postadressa di i databasen vår, får du ei lenkje til å endra passordet om nokre få minutt. Ver venleg og sjekk søppelpostmappa om du ikkje fekk denne e-posten.
       updated: Passordet ditt er endra. No er du logga inn.
       updated_not_active: Passordet ditt er endra.
@@ -71,24 +75,24 @@ nn:
       signed_up_but_inactive: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er ikkje aktivert enno.
       signed_up_but_locked: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er låst.
       signed_up_but_pending: Ei melding med ei stadfestingslenkje er vorten send til e-postadressa di. Når du klikkar på lenkja skal vi sjå gjennom søknaden din. Du får ei melding om han vert godkjend.
-      signed_up_but_unconfirmed: En e-post med en bekreftelseslenke har blitt sendt til din innboks. Klikk på lenken i e-posten for å aktivere kontoen din.
-      update_needs_confirmation: Du har oppdatert kontoen din, men vi må bekrefte din nye e-postadresse. Sjekk e-posten din og følg bekreftelseslenken for å bekrefte din nye e-postadresse.
-      updated: Kontoen din ble oppdatert.
+      signed_up_but_unconfirmed: Ei melding med ei lenke for å stadfeste kontoen har vorte sendt e-postadressa di. Klikk på lenka for å aktivere kontoen. Sjekk søppelpostmappa dersom du ikkje har fått e-posten.
+      update_needs_confirmation: Du har oppdatert kontoen din, men vi må stadfeste den nye e-postadressa. Sjekk innboksen og følg lenka for å stadfeste adressa di. Sjekk søppelpostmappa dersom du ikkje har fått den e-posten.
+      updated: Kontoen har vorte oppdatert.
     sessions:
       already_signed_out: Logga ut.
       signed_in: Logga inn.
       signed_out: Logga ut.
     unlocks:
-      send_instructions: Du vil motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      send_paranoid_instructions: Hvis kontoen din eksisterer vil du motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      unlocked: Kontoen din ble åpnet uten problemer. Logg på for å fortsette.
+      send_instructions: Om nokre minutt får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din. Sjekk søppelpostmappa om du ikkje finn den mailen.
+      send_paranoid_instructions: Dersom du har konto her, får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din om nokre minutt. Sjekk søppelpostmappa om du ikkje finn den mailen.
+      unlocked: Kontoen din har vorte låst opp. Logg inn for å halde fram.
   errors:
     messages:
-      already_confirmed: har allerede blitt bekreftet, prøv å logge på istedet
-      confirmation_period_expired: må bekreftes innen %{period}. Spør om en ny e-post for bekreftelse istedet
+      already_confirmed: er allereie stadfesta, prøv logge inn
+      confirmation_period_expired: må verte stadfesta innan %{period}, spør etter ein ny
       expired: er utgått, ver venleg å beda om ein ny ein
       not_found: ikkje funne
       not_locked: var ikkje låst
       not_saved:
-        one: '1 feil hindret denne %{resource} i å bli lagret:'
-        other: "%{count} feil hindret denne %{resource} i å bli lagret:"
+        one: '1 feil hindra %{resource} frå verte lagra:'
+        other: "%{count} feil hindra %{resource} frå verte lagra:"
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 92ac2948e..5f46a4ba1 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -3,96 +3,96 @@ pt-BR:
   devise:
     confirmations:
       confirmed: O seu endereço de e-mail foi confirmado.
-      send_instructions: Você receberá uma mensagem em sua caixa de entrada com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nossa base de dados, você receberá uma mensagem em sua caixa de entrada com instruções sobre confirmá-lo dentro de alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
+      send_instructions: Você receberá um e-mail com instruções sobre como confirmar o endereço de e-mail dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para confirmá-lo dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
     failure:
-      already_authenticated: A sua sessão já está aberta.
-      inactive: A sua contra ainda não está ativada.
+      already_authenticated: Você entrou na sua conta.
+      inactive: Sua conta não foi confirmada ainda.
       invalid: "%{authentication_keys} ou senha inválida."
       last_attempt: Você tem apenas mais uma tentativa sobrando antes que a sua conta seja bloqueada.
-      locked: A sua conta está bloqueada.
+      locked: Sua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou senha inválida."
-      pending: Sua conta ainda está sendo revisada.
-      timeout: A sua sessão expirou. Por favor, entre novamente para continuar.
-      unauthenticated: Você precisa entrar ou cadastrar-se antes de continuar.
+      pending: Sua conta está sendo revisada.
+      timeout: Você saiu de sua conta. Por favor, entre novamente para continuar.
+      unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
       unconfirmed: Você precisa confirmar o seu endereço de e-mail antes de continuar.
     mailer:
       confirmation_instructions:
-        action: Verificar endereço de e-mail
+        action: Confirmar endereço de e-mail
         action_with_app: Confirmar e voltar para %{app}
-        explanation: Você criou uma conta em %{host} com esse endereço de e-mail. Você está a um clique de ativá-la. Se não foi você, por favor ignore esse e-mail.
-        explanation_when_pending: Você pediu um convite para %{host} com esse endereço de email. Assim que você confirmar o seu endereço de e-mail, iremos revisar o seu pedido. Você não poderá fazer login até então. Se sua aplicação for rejeitada, seus dados serão removidos e nenhuma ação será necessária da sua parte. Se você não pediu por isso, por favor ignore esse e-mail.
+        explanation: Você criou uma conta em %{host} com esse endereço de e-mail. Se não foi você, por favor, ignore este e-mail.
+        explanation_when_pending: Você solicitou um convite para %{host} com esse endereço de e-mail. Após você confirmar o seu endereço de e-mail, espere o resultado da revisão de sua solicitação. Se sua conta por vetada, seus dados serão excluídos e nenhuma ação será necessária de sua parte. Se você não solicitou nada, por favor, ignore este e-mail.
         extra_html: Por favor confira também <a href="%{terms_path}">as regras da instância</a> e <a href="%{policy_path}">nossos termos de serviço</a>.
         subject: 'Mastodon: Instruções de confirmação para %{instance}'
-        title: Verifique o endereço de e-mail
+        title: Confirme o endereço de e-mail
       email_changed:
-        explanation: 'O e-mail associado à sua conta será mudado para:'
-        extra: Se você não mudou seu e-mail é possível que alguém tenha conseguido acesso à sua conta. Por favor mude sua senha imediatamente ou entre em contato com um administrador da sua instância se você ficou sem acesso à sua conta.
-        subject: 'Mastodon: Email alterado'
+        explanation: 'O e-mail vinculado à sua conta será alterado para:'
+        extra: Se você não alterou seu e-mail, é possível que alguém tenha acessado a sua conta. Altere sua senha imediatamente ou entre em contato com o administrador da sua instância se você perdeu o acesso à sua conta.
+        subject: 'Mastodon: Endereço de e-mail alterado'
         title: Novo endereço de e-mail
       password_change:
-        explanation: A senha da sua conta foi mudada.
-        extra: Se você não mudou a sua senha, é possível que alguém tenha conseguido acesso à sua conta. Por favor mude sua senha imediatamente ou entre em contato com um administrador da sua instância se você ficou sem acesso à sua conta.
-        subject: 'Mastodon: Senha modificada'
+        explanation: A senha da sua conta foi alterada.
+        extra: Se você não alterou sua senha, é possível que alguém tenha acessado a sua conta. Altere sua senha imediatamente ou entre em contato com o administrador da sua instância se você perdeu o acesso à sua conta.
+        subject: 'Mastodon: Senha alterada'
         title: Senha alterada
       reconfirmation_instructions:
-        explanation: Confirme o seu novo endereço para mudar seu e-mail.
-        extra: Se essa mudança não foi iniciada por você, por favor ignore esse e-mail. O endereço de e-mail para essa conta do Mastodon não irá mudar até que você acesse o link acima.
-        subject: 'Mastodon: Confirmar emai para %{instance}'
-        title: Verificar o endereço de e-mail
+        explanation: Confirme seu novo endereço para alterar seu e-mail.
+        extra: Se essa alteração não foi feita por você, por favor, ignore este e-mail. O endereço de e-mail para essa conta do Mastodon não será alterado até que você entre no link acima.
+        subject: 'Mastodon: Confirmar endereço de e-mail para %{instance}'
+        title: Confirmar endereço de e-mail
       reset_password_instructions:
-        action: Mudar a senha
-        explanation: Você pediu uma nova senha para sua conta.
-        extra: Se você não fez esse pedido, por favor ignore esse e-mail. Sua senha não irá mudar até que você acesse o link acima e crie uma nova.
-        subject: 'Mastodon: Instruções para mudança de senha'
-        title: Redefinir a senha
+        action: Alterar senha
+        explanation: Você solicitou uma nova senha para sua conta.
+        extra: Se você não solicitou nada, por favor, ignore este e-mail. Sua senha não será alterada até que você entre no link acima e crie uma nova.
+        subject: 'Mastodon: Instruções para alterar senha'
+        title: Redefinir senha
       two_factor_disabled:
         explanation: A autenticação de dois fatores para sua conta foi desativada. Agora é possível acessar apenas com seu endereço de e-mail e senha.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
         title: 2FA desativada
       two_factor_enabled:
-        explanation: A autenticação de dois fatores foi habilitada para sua conta. Um token gerado pelo app TOTP pareado será necessário para o login.
+        explanation: A autenticação de dois fatores foi ativada para sua conta. Um código gerado no aplicativo TOTP pareado será necessário para entrar.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
         title: 2FA ativada
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos códigos foram gerados.
-        subject: 'Mastodon: códigos de recuperação de dois fatores gerados novamente'
-        title: Códigos de recuperação de 2FA alterados
+        subject: 'Mastodon: Novos códigos de recuperação de dois fatores'
+        title: Códigos de recuperação de dois fatores alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções de desbloqueio'
     omniauth_callbacks:
-      failure: Não foi possível autenticá-lo como %{kind} porque "%{reason}".
-      success: Autenticado com sucesso como %{kind}.
+      failure: Não foi possível entrar como %{kind} porque "%{reason}".
+      success: Entrou como %{kind}.
     passwords:
-      no_token: Você não pode acessar esta página se não tiver vindo de uma mensagem de mudança de senha. Se este for o caso, por favor verifique se a URL utilizada está completa.
-      send_instructions: Se o seu endereço de e-mail já estiver cadastrado em nossa base de dados, você receberá uma mensagem com um link para realizar a mudança de senha em alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se o seu endereço de e-mail já estiver cadastrado em nossa base de dados, você receberá uma mensagem com um link para realizar a mudança de senha em alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      updated: A sua senha foi alterada. A sua sessão está aberta.
-      updated_not_active: A sua senha foi alterada.
+      no_token: Você não pode acessar esta página sem vir de um e-mail de alteração de senha. Se este for o caso, por favor, verifique se o link fornecido está completo.
+      send_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para alterar a senha dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para alterar a senha dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      updated: Sua senha foi alterada e você entrou na sua conta.
+      updated_not_active: Sua senha foi alterada com sucesso.
     registrations:
-      destroyed: Adeus! A sua conta foi cancelada. Esperamos vê-lo em breve.
-      signed_up: Bem vindo! A sua conta foi registrada com sucesso.
-      signed_up_but_inactive: A sua conta foi registrada. No entanto, não abrimos a sua sessão porque a sua conta ainda não foi ativada.
-      signed_up_but_locked: A sua conta foi registrada. No entanto, não abrimos a sua sessão porque a sua conta está bloqueada.
-      signed_up_but_pending: Uma mensagem com um link de confirmação foi enviada ao seu endereço de e-mail. Depois que você clicar no link, revisaremos seu pedido. Você será notificado se seu pedido for aprovado.
-      signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o seu endereço de e-mail. Por favor, siga o link para ativar a sua conta e, caso não tenha recebido esta mensagem, cheque a sua pasta de spam.
-      update_needs_confirmation: Você mudou o seu endereço de e-mail ou a sua senha, mas é necessário confirmar a mudança. Por favor siga o link que foi enviado para o seu novo endereço de e-mail e, caso não tenha recebido esta mensagem, cheque a sua pasta de spam.
-      updated: A sua conta foi alterada com sucesso.
+      destroyed: Adeus! Sua conta foi cancelada. Talvez um dia possamos nos ver de novo.
+      signed_up: Boas vindas! Conta criada.
+      signed_up_but_inactive: Conta criada! Agora você deve confirmá-la.
+      signed_up_but_locked: Conta criada! Porém, você deve desbloqueá-la.
+      signed_up_but_pending: Um e-mail com um link de confirmação foi enviado para o seu endereço de e-mail. Após você entrar no link, revisaremos sua solicitação e você será notificado caso seja aprovado.
+      signed_up_but_unconfirmed: Um e-mail com instruções para confirmar o seu endereço de e-mail foi enviado. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      update_needs_confirmation: Você alterou seu endereço de e-mail ou sua senha, porém é preciso confirmar a alteração. Por favor, entre no link que foi enviado para o seu novo endereço de e-mail e verifique sua pasta de spam caso ainda não o tenha recebido.
+      updated: Sua conta foi alterada com sucesso.
     sessions:
-      already_signed_out: Sessão encerrada.
-      signed_in: Sessão iniciada.
-      signed_out: Sessão encerrada.
+      already_signed_out: Você saiu de sua conta.
+      signed_in: Você entrou na sua conta.
+      signed_out: Você saiu de sua conta.
     unlocks:
-      send_instructions: Você receberá uma mensagem com instruções para desbloquear a sua conta em alguns instantes. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se a sua conta já existe, você receberá uma mensagem com instruções para desbloquear a sua conta em alguns instantes. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      unlocked: A sua conta foi desbloqueada com sucesso. Por favor inicie sessão para continuar.
+      send_instructions: Você receberá um e-mail com instruções para desbloquear a sua conta dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se a sua conta já existe, você receberá um e-mail com instruções para desbloqueá-la dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      unlocked: Sua conta foi desbloqueada. Por favor, entre na sua conta para continuar.
   errors:
     messages:
-      already_confirmed: já foi confirmado, por favor tente iniciar sessão
+      already_confirmed: confirmado, agora tente entrar na sua conta
       confirmation_period_expired: precisa ser confirmada em até %{period}, por favor, solicite novo link de confirmação
       expired: expirou, por favor solicite uma nova
       not_found: não encontrado
-      not_locked: não está bloqueada
+      not_locked: Sua conta não está bloqueada.
       not_saved:
         one: '1 erro impediu este %{resource} de ser salvo(a):'
         other: "%{count} erros impediram este %{resource} de ser salvo(a):"
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 9689b01f5..c6cfe0c37 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -27,12 +27,12 @@ pt-PT:
         title: Verificar o endereço de e-mail
       email_changed:
         explanation: 'O e-mail associado à tua conta será alterado para:'
-        extra: Se não alteraste o teu e-mail é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
+        extra: Se não alterou o seu email, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entra em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
         subject: 'Mastodon: Email alterado'
         title: Novo endereço de e-mail
       password_change:
         explanation: A palavra-passe da tua conta foi alterada.
-        extra: Se não alteraste a tua palavra-passe, é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
+        extra: Se não alterou a sua palavra-passe, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
         subject: 'Mastodon: Nova palavra-passe'
         title: Palavra-passe alterada
       reconfirmation_instructions:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index 5d7e33422..52b229ca0 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -18,7 +18,7 @@ ru:
       unconfirmed: Вам необходимо подтвердить ваш адрес e-mail для продолжения.
     mailer:
       confirmation_instructions:
-        action: Подтвердите e-mail адрес
+        action: Подтвердить смену e-mail
         action_with_app: Подтвердить и вернуться в %{app}
         explanation: Вы создали учётную запись на сайте %{host}, используя этот e-mail адрес. Остался лишь один шаг для активации. Если это были не вы, просто игнорируйте письмо.
         explanation_when_pending: Вы подали заявку на %{host}, используя этот адрес e-mail. Как только вы его подтвердите, мы начнём изучать вашу заявку. До тех пор вы не сможете войти на сайт. Если ваша заявка будет отклонена, все данные будут автоматически удалены, от вас не потребуется никаких дополнительных действий. Если это были не вы, пожалуйста, проигнорируйте данное письмо.
@@ -28,7 +28,7 @@ ru:
       email_changed:
         explanation: 'E-mail адрес вашей учётной записи будет изменён на:'
         extra: Если вы не меняли e-mail адрес, возможно кто-то получил доступ к вашей учётной записи. Пожалуйста, немедленно смените пароль или свяжитесь с администратором узла, если вы уже потеряли доступ к ней.
-        subject: 'Mastodon: изменён e-mail адрес'
+        subject: 'Mastodon: Изменён e-mail адрес'
         title: Новый адрес e-mail
       password_change:
         explanation: Пароль Вашей учётной записи был изменён.
@@ -36,28 +36,28 @@ ru:
         subject: 'Mastodon: Пароль изменен'
         title: Пароль изменён
       reconfirmation_instructions:
-        explanation: Подтвердите новый адрес для смены e-mail.
-        extra: Если смену e-mail инициировали не вы, пожалуйста, игнорируйте это письмо. Адрес e-mail для учётной записи Mastodon не будет изменён, пока вы не перейдёте по ссылке выше.
-        subject: 'Mastodon: Подтверждение e-mail для узла %{instance}'
+        explanation: Для завершения смены e-mail, нажмите кнопку ниже.
+        extra: Если вы не изменяли e-mail, пожалуйста, игнорируйте это письмо. Новый адрес не будет привязан к учётной записи, пока вы не перейдёте по ссылке ниже.
+        subject: 'Mastodon: Подтвердите свой новый e-mail на %{instance}'
         title: Подтвердите e-mail адрес
       reset_password_instructions:
         action: Смена пароля
         explanation: Вы запросили новый пароль для вашей учётной записи.
         extra: Если это сделали не вы, пожалуйста, игнорируйте письмо. Ваш пароль не будет изменён, пока вы не перейдёте по ссылке выше и не создадите новый пароль.
-        subject: 'Mastodon: инструкция по смене пароля'
+        subject: 'Mastodon: Инструкция по сбросу пароля'
         title: Сброс пароля
       two_factor_disabled:
         explanation: Для вашей учётной записи была отключена двухфакторная авторизация. Выполнить вход теперь можно используя лишь e-mail и пароль.
-        subject: 'Mastodon: двухфакторная авторизация отключена'
-        title: Двухфакторная авторизация отключена
+        subject: 'Mastodon: Двухфакторная авторизация отключена'
+        title: 2ФА отключена
       two_factor_enabled:
         explanation: Для вашей учётной записи была настроена двухфакторная авторизация. Отныне для входа потребуется также временный код из приложения-аутентификатора.
-        subject: 'Mastodon: настроена двухфакторная авторизация'
-        title: Двухфакторная авторизация включена
+        subject: 'Mastodon: Настроена двухфакторная авторизация'
+        title: 2ФА включена
       two_factor_recovery_codes_changed:
         explanation: Предыдущие резервные коды были аннулированы и созданы новые.
-        subject: 'Mastodon: резервные коды двуфакторной авторизации обновлены'
-        title: Резервные коды двухфакторной авторизации изменены
+        subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
+        title: Резервные коды 2ФА изменены
       unlock_instructions:
         subject: 'Mastodon: Инструкция по разблокировке'
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index ceae8b238..e1bb9f959 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -12,13 +12,16 @@ zh-HK:
       last_attempt: 若你再一次嘗試失敗，我們將鎖定你的帳號，以策安全。
       locked: 你的帳號已被鎖定。
       not_found_in_database: 不正確的 %{authentication_keys} 或密碼。
+      pending: 您的帳戶仍在審核中。
       timeout: 你的登入階段已經過期，請重新登入以繼續使用。
       unauthenticated: 你必須先登入或登記，以繼續使用。
       unconfirmed: 你必須先確認電郵地址，繼續使用。
     mailer:
       confirmation_instructions:
         action: 驗證電子郵件地址
+        action_with_app: 確認並返回 %{app}
         explanation: 你在 %{host} 上使用這個電子郵件地址建立了一個帳戶。只需點擊下面的連結，即可啟用帳戶。如果你並沒有建立過帳戶，請忽略此郵件。
+        explanation_when_pending: 您使用此電子信箱位址申請了 %{host} 的邀請。當您確認電子信箱後我們將審核您的申請，而直到核准前您都無法登入。當您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您，請忽略此信件。
         extra_html: 請記得閱讀本服務站的<a href="%{terms_path}">相關規定</a>和<a href="%{policy_path}">使用條款</a>。
         subject: 'Mastodon: 確認電郵地址 %{instance}'
         title: 驗證電子郵件地址
@@ -43,6 +46,18 @@ zh-HK:
         extra: 如果你沒有請求本次變更，請忽略此郵件。你的密碼只有在你點擊上面的連結並輸入新密碼後才會更改。
         subject: 'Mastodon: 重設密碼'
         title: 重設密碼
+      two_factor_disabled:
+        explanation: 您帳戶的兩步驟驗證已停用。現在只能使用電子信箱位址及密碼登入。
+        subject: Mastodon：已停用兩步驟驗證
+        title: 已停用 2FA
+      two_factor_enabled:
+        explanation: 已對您的帳戶啟用兩步驟驗證。登入時將需要配對之 TOTP 應用程式所產生的 Token。
+        subject: Mastodon：已啟用兩步驟驗證
+        title: 已啟用 2FA
+      two_factor_recovery_codes_changed:
+        explanation: 上一次的復原碼已經失效，且已產生新的。
+        subject: Mastodon：兩步驟驗證復原碼已經重新產生
+        title: 2FA 復原碼已變更
       unlock_instructions:
         subject: 'Mastodon: 解除用戶鎖定'
     omniauth_callbacks:
@@ -59,6 +74,7 @@ zh-HK:
       signed_up: 歡迎你！你的登記已經成功。
       signed_up_but_inactive: 你的登記已經成功，可是由於你的用戶還被被啟用，暫時還不能讓你登入。
       signed_up_but_locked: 你的登記已經成功，可是由於你的用戶已被鎖定，我們無法讓你登入。
+      signed_up_but_pending: 包含確認連結的訊息已寄到您的電子信箱。按下此連結後我們將審核您的申請。核准後將通知您。
       signed_up_but_unconfirmed: 一條確認連結已經電郵到你的郵址。請使用讓連結啟用你的用戶。
       update_needs_confirmation: 你的用戶已經更新，但我們需要確認你的電郵地址。請打開你的郵箱，使用確認電郵的連結來確認的地郵址。
       updated: 你的用戶已經成功更新。
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index c7677c850..a9b8d5b90 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -1 +1,52 @@
+---
 br:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Anv an arload
+        website: Lec'hienn an arload
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Aotren
+        cancel: Nullañ
+        destroy: Distrujañ
+        edit: Aozañ
+      confirmations:
+        destroy: Ha sur oc'h ?
+      index:
+        application: Arload
+        delete: Dilemel
+        name: Anv
+        new: Arload nevez
+        show: Diskouez
+        title: Hoc'h arloadoù
+      new:
+        title: Arload nevez
+      show:
+        title: 'Arload : %{name}'
+    authorizations:
+      buttons:
+        authorize: Aotren
+    authorized_applications:
+      confirmations:
+        revoke: Ha sur oc'h ?
+      index:
+        application: Arload
+        date_format: "%d-%m-%Y %H:%M:%S"
+    flash:
+      applications:
+        create:
+          notice: Savet eo bet an arload.
+        destroy:
+          notice: Dilamet eo bet an arload.
+        update:
+          notice: Hizivaet eo bet an arload.
+    layouts:
+      admin:
+        nav:
+          applications: Arloadoù
+    scopes:
+      read:lists: gwelout ho listennoù
+      write:lists: krouiñ listennoù
+      write:statuses: embann toudoù
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index e9bf70cd2..8a628538b 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -25,7 +25,7 @@ fr:
         edit: Modifier
         submit: Envoyer
       confirmations:
-        destroy: Êtes-vous certain·e ?
+        destroy: Voulez-vous vraiment faire ça ?
       edit:
         title: Modifier l’application
       form:
@@ -37,7 +37,7 @@ fr:
       index:
         application: Application
         callback_url: URL de retour d’appel
-        delete: Effacer
+        delete: Supprimer
         empty: Vous n’avez pas d’application.
         name: Nom
         new: Nouvelle application
@@ -69,7 +69,7 @@ fr:
       buttons:
         revoke: Annuler
       confirmations:
-        revoke: Êtes-vous certain·e ?
+        revoke: Voulez-vous vraiment faire ça ?
       index:
         application: Application
         created_at: Créé le
@@ -145,7 +145,7 @@ fr:
       write:follows: suivre des personnes
       write:lists: créer des listes
       write:media: téléverser des fichiers média
-      write:mutes: masquer des gens et des conversations
-      write:notifications: nettoyer vos notifications
+      write:mutes: masquer des comptes et des conversations
+      write:notifications: effacer vos notifications
       write:reports: signaler d’autres personnes
       write:statuses: publier des statuts
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index b384b76b1..dd141a10e 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -51,12 +51,12 @@ kab:
     authorizations:
       buttons:
         authorize: Ssireg
-        deny: Ggami
+        deny: Aggi
       error:
         title: Tella-d tuccḍa
       new:
-        able_to: Asnas-agi yezmer
-        prompt: Eǧǧ i %{client_name} ad yekcem γer umiḍan-ik
+        able_to: Asnas-agi yezmer ad
+        prompt: Yessutred wesnan n %{client_name} akečum γer umiḍan-ik
         title: Tlaq tsiregt
       show:
         title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
@@ -102,7 +102,7 @@ kab:
       read:favourites: ẓer ismenyifen-ik
       read:filters: ẓer imsizedgen-ik
       read:follows: ẓer imeḍfaṛen-ik
-      read:lists: ẓer tibdarin-ik
+      read:lists: ẓer umuγen-ik·im
       read:mutes: ẓer wid i tesgugmeḍ
       read:notifications: ẓer tilγa-ik
       read:statuses: ẓer meṛṛa tisuffaγ
@@ -112,5 +112,5 @@ kab:
       write:bookmarks: ad yernu tisuffγin γer ticraḍ
       write:filters: rnu-d imsizedgen
       write:follows: ḍfeṛ imdanen
-      write:lists: rnu-d tibdarin
+      write:lists: yesnulfu umuγen
       write:media: ad yessali ifayluyen n teγwalt
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 6f4192ebe..16a2d0490 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -126,7 +126,7 @@ ko:
       read: 계정의 모든 데이터를 읽기
       read:accounts: 계정의 정보를 보기
       read:blocks: 차단을 보기
-      read:bookmarks: 내 갈무리 보기
+      read:bookmarks: 내 보관함 보기
       read:favourites: 관심글을 보기
       read:filters: 필터를 보기
       read:follows: 팔로우를 보기
@@ -139,7 +139,7 @@ ko:
       write: 계정 정보 수정
       write:accounts: 프로필 수정
       write:blocks: 계정이나 도메인 차단
-      write:bookmarks: 게시글을 갈무리하기
+      write:bookmarks: 게시글을 보관함에 넣기
       write:favourites: 관심글 지정
       write:filters: 필터 만들기
       write:follows: 사람을 팔로우
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index f670d5a8b..f5437672a 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -5,7 +5,7 @@ nn:
       doorkeeper/application:
         name: Applikasjonsnamn
         redirect_uri: Omdirigerings-URI
-        scopes: Omfang
+        scopes: Skop
         website: Applikasjonsnettside
     errors:
       models:
@@ -33,15 +33,15 @@ nn:
       help:
         native_redirect_uri: Bruk %{native_redirect_uri} for lokale testar
         redirect_uri: Bruk ei linjer per URI
-        scopes: Adskill omfang med mellomrom. La det være blankt for å bruke standard omfang.
+        scopes: Skil skop med mellomrom. Ikkje fyll inn noko som helst for å bruke standardskop.
       index:
         application: Applikasjon
         callback_url: Callback-URL
         delete: Slett
-        empty: Du har ingen søknader.
+        empty: Du har ikkje nokon applikasjonar.
         name: Namn
         new: Ny applikasjon
-        scopes: Omfang
+        scopes: Skop
         show: Vis
         title: Dine applikasjonar
       new:
@@ -49,8 +49,8 @@ nn:
       show:
         actions: Handlingar
         application_id: Klientnøkkel
-        callback_urls: Callback-URLer
-        scopes: Omfang
+        callback_urls: Callback-URLar
+        scopes: Skop
         secret: Klienthemmelegheit
         title: 'Applikasjon: %{name}'
     authorizations:
@@ -60,8 +60,8 @@ nn:
       error:
         title: Ein feil har oppstått
       new:
-        able_to: Den vil ha mulighet til
-        prompt: Applikasjon %{client_name} spør om tilgang til din konto
+        able_to: Applikasjonen vil kunne
+        prompt: Applikasjonen %{client_name} spør om tilgang til kontoen din
         title: Autorisasjon nødvendig
       show:
         title: Kopier denne autorisasjonskoden og lim den inn i applikasjonen.
@@ -74,15 +74,15 @@ nn:
         application: Applikasjon
         created_at: Autorisert
         date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfang
+        scopes: Skop
         title: Dine autoriserte applikasjonar
     errors:
       messages:
-        access_denied: Ressurseieren eller autoriseringstjeneren avviste forespørslen.
-        credential_flow_not_configured: Ressurseiers passordflyt feilet fordi Doorkeeper.configure.resource_owner_from_credentials ikke var konfigurert.
+        access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden.
+        credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje verte fullført av di «Doorkeeper.configure.resource_owner_from_credentials» er ikkje konfigurert.
         invalid_client: Klientautentisering feilet på grunn av ukjent klient, ingen autentisering inkludert, eller autentiseringsmetode er ikke støttet.
         invalid_grant: Autoriseringen er ugyldig, utløpt, opphevet, stemmer ikke overens med omdirigerings-URIen eller var utstedt til en annen klient.
-        invalid_redirect_uri: Den inkluderte omdirigerings-URLen er ikke gyldig.
+        invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig.
         invalid_request: Forespørslen mangler en eller flere parametere, inkluderte en parameter som ikke støttes eller har feil struktur.
         invalid_resource_owner: Ressurseierens detaljer er ikke gyldige, eller så er det ikke mulig å finne eieren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 90d8f9358..7d18fb2bb 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -38,7 +38,7 @@ pt-BR:
         application: Aplicativos
         callback_url: Link de retorno
         delete: Excluir
-        empty: Não tem aplicações.
+        empty: Você não tem aplicativos.
         name: Nome
         new: Novo aplicativo
         scopes: Autorizações
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 4cd80a4e0..bf414361d 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -60,7 +60,7 @@ sk:
         title: Nastala chyba
       new:
         able_to: Bude môcť
-        prompt: Aplikácia %{client_name} žiada prístup k vašemu účtu
+        prompt: Aplikácia %{client_name} vyžaduje prístup k tvojmu účtu
         title: Je potrebná autorizácia
       show:
         title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
@@ -73,7 +73,7 @@ sk:
         application: Aplikácia
         created_at: Autorizované
         scopes: Oprávnenia
-        title: Vaše autorizované aplikácie
+        title: Tvoje povolené aplikácie
     errors:
       messages:
         access_denied: Prístup zamietnutý.
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index be009af4d..8ca87578b 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -29,7 +29,7 @@ th:
       edit:
         title: แก้ไขแอปพลิเคชัน
       help:
-        native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบในเว็บ
+        native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบในเซิร์ฟเวอร์
         redirect_uri: ใช้หนึ่งบรรทัดต่อ URI
         scopes: แยกขอบเขตด้วยช่องว่าง เว้นว่างไว้เพื่อใช้ขอบเขตเริ่มต้น
       index:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 85c7bc648..e2fe9056b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -51,7 +51,7 @@ el:
   accounts:
     choices_html: 'Επιλογές από %{name}:'
     endorsements_hint: Μπορεις να εγκρίνεις ανθρώπους που ακολουθείς μέσω της δικτυακής εφαρμογής και αυτοί θα εμφανίζονται εδώ.
-    featured_tags_hint: Μπορείς να επιλέξεις συγκεκριμένες ταμπέλες που θα εμφανίζονται εδώ.
+    featured_tags_hint: Μπορείς να επιλέξεις συγκεκριμένες ετικέτες που θα εμφανίζονται εδώ.
     follow: Ακολούθησε
     followers:
       one: Ακόλουθος
@@ -92,6 +92,7 @@ el:
       delete: Διαγραφή
       destroyed_msg: Επιτυχής καταστροφή σημειώματος μεσολάβησης!
     accounts:
+      add_email_domain_block: Εγγραφή τομέα email σε μαύρη λίστα
       approve: Έγκριση
       approve_all: Έγκριση όλων
       are_you_sure: Σίγουρα;
@@ -172,6 +173,7 @@ el:
         staff: Προσωπικό
         user: Χρήστης
       search: Αναζήτηση
+      search_same_email_domain: Άλλοι χρήστες με τον ίδιο τομέα e-mail
       search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP
       shared_inbox_url: URL κοινόχρηστων εισερχομένων
       show:
@@ -193,6 +195,18 @@ el:
       web: Διαδίκτυο
       whitelisted: Εγκεκριμένοι
     action_logs:
+      action_types:
+        change_email_user: Αλλαγή email για χρήστη
+        destroy_status: Διαγραφή Κατάστασης
+        disable_2fa_user: Απενεργοποίηση 2FA
+        disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
+        disable_user: Απενεργοποίηση Χρήστη
+        enable_custom_emoji: Ενεργοποίηση Προσαρμοσμένων Emoji
+        enable_user: Ενεργοποίηση Χρήστη
+        promote_user: Προαγωγή Χρήστη
+        remove_avatar_user: Αφαίρεση Avatar
+        silence_account: Σίγαση Λογαριασμού
+        update_status: Ενημέρωση Κατάστασης
       actions:
         assigned_to_self_report: Ο/Η %{name} ανάθεσε την καταγγελία %{target} στον εαυτό του/της
         change_email_user: Ο/Η %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
@@ -230,6 +244,9 @@ el:
         update_custom_emoji: Ο/Η %{name} ενημέρωσε το emoji %{target}
         update_status: Ο/Η %{name} ενημέρωσε την κατάσταση του/της %{target}
       deleted_status: "(διαγραμμένη δημοσίευση)"
+      empty: Δεν βρέθηκαν αρχεία καταγραφής.
+      filter_by_action: Φιλτράρισμα ανά ενέργεια
+      filter_by_user: Φιλτράρισμα ανά χρήστη
       title: Αρχείο ελέγχου
     announcements:
       destroyed_msg: Επιτυχής διαγραφή ανακοίνωσης!
@@ -292,7 +309,7 @@ el:
       features: Λειτουργίες
       hidden_service: Ομοσπονδία με κρυμμένες υπηρεσίες
       open_reports: ανοιχτές καταγγελίες
-      pending_tags: ταμπέλες προς έγκριση
+      pending_tags: ετικέτες προς έγκριση
       pending_users: χρήστες προς έγκριση
       recent_users: Πρόσφατοι χρήστες
       search: Αναζήτηση πλήρους κειμένου
@@ -358,6 +375,7 @@ el:
       destroyed_msg: Επιτυχής διαγραφή email τομέα από τη μαύρη λίστα
       domain: Τομέας
       empty: Δεν έχουν οριστεί αποκλεισμένοι τομείς email.
+      from_html: από %{domain}
       new:
         create: Πρόσθεση τομέα
         title: Νέα εγγραφή email στη μαύρη λίστα
@@ -532,11 +550,14 @@ el:
         title: Προεπισκόπιση ροής
       title: Ρυθμίσεις ιστότοπου
       trendable_by_default:
-        desc_html: Επηρεάζει τις ταμπέλες που δεν είχαν απαγορευτεί νωρίτερα
-        title: Επέτρεψε στις ταμπέλες να εμφανιστούν στις τάσεις χωρίς προηγούμενη έγκριση
+        desc_html: Επηρεάζει όσες ετικέτες δεν είχαν απαγορευτεί νωρίτερα
+        title: Επέτρεψε στις ετικέτες να εμφανίζονται στις τάσεις χωρίς να χρειάζεται πρώτα έγκριση
       trends:
-        desc_html: Δημόσια εμφάνιση ταμπελών που έχουν ήδη εγκριθεί και είναι δημοφιλείς
-        title: Δημοφιλείς ταμπέλες
+        desc_html: Δημόσια εμφάνιση ετικετών που έχουν ήδη εγκριθεί και είναι δημοφιλείς
+        title: Δημοφιλείς ετικέτες
+    site_uploads:
+      delete: Διαγραφή μεταφορτωμένου αρχείου
+      destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
     statuses:
       back_to_account: Επιστροφή στη σελίδα λογαριασμού
       batch:
@@ -561,19 +582,18 @@ el:
       last_active: Τελευταία δραστηριότητα
       most_popular: Δημοφιλέστερες
       most_recent: Πιο πρόσφατες
-      name: Ταμπέλα
+      name: Ετικέτα
       review: Κατάσταση έγκρισης
       reviewed: Εγκεκριμένες
-      title: Ταμπέλες
+      title: Ετικέτες
       trending_right_now: Δημοφιλείς αυτή τη στιγμή
       unique_uses_today: "%{count} σημερινές δημοσιεύσεις"
       unreviewed: Εκκρεμεί έγκριση
-      updated_msg: Οι ρυθμίσεις των ταμπελών ενημερώθηκαν επιτυχώς
+      updated_msg: Οι ρυθμίσεις των ετικετών ενημερώθηκαν επιτυχώς
     title: Διαχείριση
     warning_presets:
       add_new: Πρόσθεση νέου
       delete: Διαγραφή
-      edit: Ενημέρωση
       edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
       title: Διαχείριση προκαθορισμένων προειδοποιήσεων
   admin_mailer:
@@ -585,8 +605,8 @@ el:
       body_remote: Κάποιος/α από τον τομέα %{domain} κατήγγειλε τον/την %{target}
       subject: Νέα καταγγελία για %{instance} (#%{id})
     new_trending_tag:
-      body: 'Η ταμπέλα #%{name} είναι δημοφιλής σήμερα, αλλά δεν έχει εγκριθεί μέχρι τώρα. Δεν θα εμφανίζεται δημοσίως μέχρι να δοθεί έγκρισή, αλλιώς αποθηκεύστε τη φόρμα ως έχει για να μην την δείτε ξανά.'
-      subject: Νέα ταμπέλα προς έγκριση στο %{instance} (#%{name})
+      body: 'Η ετικέτα #%{name} είναι δημοφιλής σήμερα, αλλά δεν έχει εγκριθεί μέχρι τώρα. Δεν θα εμφανίζεται δημοσίως μέχρι να δοθεί έγκριση, αλλιώς αποθήκευση τη φόρμα ως έχει για να μην την δεις ξανά.'
+      subject: Νέα ετικέτα προς έγκριση στο %{instance} (#%{name})
   aliases:
     add_new: Δημιουργία ψευδώνυμου
     created_msg: Δημιουργήθηκε νέο ψευδώνυμο. Τώρα μπορείς να ξεκινήσεις τη μεταφορά από τον παλιό λογαριασμό.
@@ -595,7 +615,7 @@ el:
     remove: Αφαίρεση ψευδώνυμου
   appearance:
     advanced_web_interface: Προηγμένη λειτουργία χρήσης
-    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές κολώνες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ομοσπονδιακή ροή και όσες λίστες και ταμπέλες θέλεις.'
+    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές κολώνες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ομοσπονδιακή ροή και όσες λίστες και ετικέτες θέλεις.'
     animations_and_accessibility: Κίνηση και προσβασιμότητα
     confirmation_dialogs: Ερωτήσεις επιβεβαίωσης
     discovery: Εξερεύνηση
@@ -661,6 +681,7 @@ el:
     trouble_logging_in: Πρόβλημα σύνδεσης;
   authorize_follow:
     already_following: Ήδη ακολουθείς αυτό το λογαριασμό
+    already_requested: Έχετε ήδη στείλει ένα αίτημα ακολούθησης σε αυτόν τον λογαριασμό
     error: Δυστυχώς παρουσιάστηκε ένα σφάλμα κατά την αναζήτηση του απομακρυσμένου λογαριασμού
     follow: Ακολούθησε
     follow_request: 'Έστειλες αίτημα παρακολούθησης προς:'
@@ -750,8 +771,8 @@ el:
   featured_tags:
     add_new: Προσθήκη νέας
     errors:
-      limit: Έχεις ήδη προσθέσει το μέγιστο αριθμό ταμπελών
-    hint_html: "<strong>Τι είναι οι προβεβλημένες ταμπέλες;</strong> Προβάλλονται στο δημόσιο προφίλ σου επιτρέποντας σε όποιον το βλέπει να χαζέψει τις δημοσιεύσεις που τις χρησιμοποιούν. Είναι ωραίος τρόπος να παρακολουθείς κάποια δημιουργία ή ένα μακροπρόθεσμο έργο."
+      limit: Έχεις ήδη προσθέσει το μέγιστο αριθμό ετικετών
+    hint_html: "<strong>Τι είναι οι προβεβλημένες ετικέτες;</strong> Προβάλλονται στο δημόσιο προφίλ σου επιτρέποντας σε όποιον το βλέπει να χαζέψει τις δημοσιεύσεις που τις χρησιμοποιούν. Είναι ένας ωραίος τρόπος να παρακολουθείς την πορεία μιας δημιουργία ή ενός μακροπρόθεσμου έργου."
   filters:
     contexts:
       account: Προφίλ
@@ -849,6 +870,7 @@ el:
   media_attachments:
     validations:
       images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ενημέρωση που ήδη περιέχει εικόνες
+      not_ready: Δεν μπορούν να επισυναφθούν αρχεία για τα οποία δεν έχει τελειώσει η επεξεργασία. Προσπαθήστε ξανά σε λίγο!
       too_many: Δεν γίνεται να προσθέσεις περισσότερα από 4 αρχεία
   migrations:
     acct: ΌνομαΧρήστη@Τομέας του νέου λογαριασμού
@@ -1044,7 +1066,7 @@ el:
     development: Ανάπτυξη
     edit_profile: Επεξεργασία προφίλ
     export: Εξαγωγή δεδομένων
-    featured_tags: Χαρακτηριστικές ταμπέλες
+    featured_tags: Χαρακτηριστικές ετικέτες
     identity_proofs: Αποδείξεις ταυτοτήτων
     import: Εισαγωγή
     import_and_export: Εισαγωγή & Εξαγωγή
@@ -1068,8 +1090,10 @@ el:
     boosted_from_html: Προωθήθηκε από %{acct_link}
     content_warning: 'Προειδοποίηση περιεχομένου: %{warning}'
     disallowed_hashtags:
-      one: 'περιέχει μη επιτρεπτή ταμπέλα: %{tags}'
-      other: 'περιέχει μη επιτρεπτές ταμπέλες: %{tags}'
+      one: 'περιέχει μη επιτρεπτή ετικέτα: %{tags}'
+      other: περιέχει μη επιτρεπτές ετικέτες %{tags}
+    errors:
+      in_reply_not_found: Η κατάσταση στην οποία προσπαθείτε να απαντήσετε δεν υπάρχει.
     language_detection: Αυτόματη αναγνώριση γλώσσας
     open_in_web: Δες στο διαδίκτυο
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 44c116dfb..b806b7779 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,6 +92,7 @@ en:
       delete: Delete
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
+      add_email_domain_block: Blacklist e-mail domain
       approve: Approve
       approve_all: Approve all
       are_you_sure: Are you sure?
@@ -172,6 +173,7 @@ en:
         staff: Staff
         user: User
       search: Search
+      search_same_email_domain: Other users with the same e-mail domain
       search_same_ip: Other users with the same IP
       shared_inbox_url: Shared inbox URL
       show:
@@ -193,6 +195,42 @@ en:
       web: Web
       whitelisted: Whitelisted
     action_logs:
+      action_types:
+        assigned_to_self_report: Assign Report
+        change_email_user: Change E-mail for User
+        confirm_user: Confirm User
+        create_account_warning: Create Warning
+        create_announcement: Create Announcement
+        create_custom_emoji: Create Custom Emoji
+        create_domain_allow: Create Domain Allow
+        create_domain_block: Create Domain Block
+        create_email_domain_block: Create E-mail Domain Block
+        demote_user: Demote User
+        destroy_announcement: Delete Announcement
+        destroy_custom_emoji: Delete Custom Emoji
+        destroy_domain_allow: Delete Domain Allow
+        destroy_domain_block: Delete Domain Block
+        destroy_email_domain_block: Delete e-mail domain block
+        destroy_status: Delete Status
+        disable_2fa_user: Disable 2FA
+        disable_custom_emoji: Disable Custom Emoji
+        disable_user: Disable User
+        enable_custom_emoji: Enable Custom Emoji
+        enable_user: Enable User
+        memorialize_account: Memorialize Account
+        promote_user: Promote User
+        remove_avatar_user: Remove Avatar
+        reopen_report: Reopen Report
+        reset_password_user: Reset Password
+        resolve_report: Resolve Report
+        silence_account: Silence Account
+        suspend_account: Suspend Account
+        unassigned_report: Unassign Report
+        unsilence_account: Unsilence Account
+        unsuspend_account: Unsuspend Account
+        update_announcement: Update Announcement
+        update_custom_emoji: Update Custom Emoji
+        update_status: Update Status
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
         change_email_user: "%{name} changed the e-mail address of user %{target}"
@@ -230,6 +268,9 @@ en:
         update_custom_emoji: "%{name} updated emoji %{target}"
         update_status: "%{name} updated status by %{target}"
       deleted_status: "(deleted status)"
+      empty: No logs found.
+      filter_by_action: Filter by action
+      filter_by_user: Filter by user
       title: Audit log
     announcements:
       destroyed_msg: Announcement successfully deleted!
@@ -358,6 +399,7 @@ en:
       destroyed_msg: Successfully deleted e-mail domain from blacklist
       domain: Domain
       empty: No e-mail domains currently blacklisted.
+      from_html: from %{domain}
       new:
         create: Add domain
         title: New e-mail blacklist entry
@@ -537,6 +579,9 @@ en:
       trends:
         desc_html: Publicly display previously reviewed hashtags that are currently trending
         title: Trending hashtags
+    site_uploads:
+      delete: Delete uploaded file
+      destroyed_msg: Site upload successfully deleted!
     statuses:
       back_to_account: Back to account page
       batch:
@@ -573,7 +618,6 @@ en:
     warning_presets:
       add_new: Add new
       delete: Delete
-      edit: Edit
       edit_preset: Edit warning preset
       title: Manage warning presets
   admin_mailer:
@@ -725,7 +769,7 @@ en:
     '422':
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
-    '429': Throttled
+    '429': Too many requests
     '500':
       content: We're sorry, but something went wrong on our end.
       title: This page is not correct
@@ -850,6 +894,7 @@ en:
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a status that already contains images
+      not_ready: Cannot attach files that have not finished processing. Try again in a moment!
       too_many: Cannot attach more than 4 files
   migrations:
     acct: Moved to
@@ -1072,6 +1117,8 @@ en:
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'
       other: 'contained the disallowed hashtags: %{tags}'
+    errors:
+      in_reply_not_found: The status you are trying to reply to does not appear to exist.
     language_detection: Automatically detect language
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 0742559ed..1375ebb33 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -474,7 +474,6 @@ en_GB:
     warning_presets:
       add_new: Add new
       delete: Delete
-      edit: Edit
       edit_preset: Edit warning preset
       title: Manage warning presets
   admin_mailer:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index b3cb2b523..a558efc51 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -33,7 +33,7 @@ eo:
       one: mesaĝo
       other: mesaĝoj
     status_count_before: Kie skribiĝis
-    tagline: Sekvi amikojn kaj trovi novan onin
+    tagline: Sekvi amikojn kaj trovi iujn novajn
     terms: Uzkondiĉoj
     unavailable_content: Nedisponebla enhavo
     unavailable_content_description:
@@ -557,7 +557,6 @@ eo:
     warning_presets:
       add_new: Aldoni novan
       delete: Forigi
-      edit: Redakti
       edit_preset: Redakti avertan antaŭagordon
       title: Administri avertajn antaŭagordojn
   admin_mailer:
@@ -819,11 +818,12 @@ eo:
       images_and_video: Aldoni videon al mesaĝo, kiu jam havas bildojn ne eblas
       too_many: Aldoni pli ol 4 dosierojn ne eblas
   migrations:
-    acct: uzantnomo@domajno de la nova konto
+    acct: Movigita al
     cancel: Nuligi alidirekton
     cancelled_msg: Sukcese forigis la alidirekton.
     errors:
       already_moved: estas la saman konton vi jam translokiĝis al
+      missing_also_known_as: ne returne referencas al ĉi tiu konto
       move_to_self: ne povas esti nuna konto
       not_found: ne povis trovi
       on_cooldown: Vi estas ĉe malvarmiĝi
@@ -907,11 +907,16 @@ eo:
     other: Aliaj aferoj
     posting_defaults: Afiŝadoj defaŭltoj
     public_timelines: Publikaj templinioj
+  reactions:
+    errors:
+      limit_reached: Limito de malsamaj reagoj atinginta
+      unrecognized_emoji: ne estas rekonita emoĝio
   relationships:
     activity: Konta aktiveco
     dormant: Dormanta
     followers: Sekvantoj
     following: Sekvatoj
+    invited: Invitita
     last_active: Laste aktiva
     most_recent: Plej lasta
     moved: Moviĝita
@@ -1035,7 +1040,7 @@ eo:
         one: "%{count} voĉdono"
         other: "%{count} voĉdonoj"
       vote: Voĉdoni
-    show_more: Montri pli
+    show_more: Malfoldi
     show_thread: Montri la fadenon
     sign_in_to_participate: Ensaluti por partopreni en la konversacio
     title: "%{name}: “%{quote}”"
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 6eec00cb6..b71ea5f39 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -92,6 +92,7 @@ es-AR:
       delete: Eliminar
       destroyed_msg: "¡Nota de moderación destruída exitosamente!"
     accounts:
+      add_email_domain_block: Desaprobar el dominio del correo electrónico
       approve: Aprobar
       approve_all: Aprobar todas
       are_you_sure: "¿Estás seguro?"
@@ -172,6 +173,7 @@ es-AR:
         staff: Equipo
         user: Usuario
       search: Buscar
+      search_same_email_domain: Otros usuarios con el mismo dominio de correo electrónico
       search_same_ip: Otros usuarios con la misma dirección IP
       shared_inbox_url: Dirección web de la bandeja de entrada compartida
       show:
@@ -193,6 +195,42 @@ es-AR:
       web: Web
       whitelisted: Aprobadas
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar denuncia
+        change_email_user: Cambiar correo electrónico del usuario
+        confirm_user: Confirmar usuario
+        create_account_warning: Crear advertencia
+        create_announcement: Crear anuncio
+        create_custom_emoji: Crear emoji personalizado
+        create_domain_allow: Crear permiso de dominio
+        create_domain_block: Crear bloqueo de dominio
+        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
+        demote_user: Descender usuario
+        destroy_announcement: Eliminar anuncio
+        destroy_custom_emoji: Eliminar emoji personalizado
+        destroy_domain_allow: Eliminar permiso de dominio
+        destroy_domain_block: Eliminar bloquedo de dominio
+        destroy_email_domain_block: Eliminar bloquedo de dominio de correo electrónico
+        destroy_status: Eliminar estado
+        disable_2fa_user: Deshabilitar 2FA
+        disable_custom_emoji: Deshabilitar emoji personalizado
+        disable_user: Deshabilitar usuario
+        enable_custom_emoji: Habilitar emoji personalizado
+        enable_user: Habilitar usuario
+        memorialize_account: Volver cuenta conmemorativa
+        promote_user: Promover usuario
+        remove_avatar_user: Quitar avatar
+        reopen_report: Reabrir denuncia
+        reset_password_user: Cambiar contraseña
+        resolve_report: Resolver denuncia
+        silence_account: Silenciar cuenta
+        suspend_account: Suspender cuenta
+        unassigned_report: Desasignar denuncia
+        unsilence_account: Dejar de silenciar cuenta
+        unsuspend_account: Dejar de suspender cuenta
+        update_announcement: Actualizar anuncio
+        update_custom_emoji: Actualizar emoji personalizado
+        update_status: Actualizar estado
       actions:
         assigned_to_self_report: "%{name} se asignó la denuncia %{target} a sí"
         change_email_user: "%{name} cambió la dirección de correo electrónico del usuario %{target}"
@@ -230,6 +268,9 @@ es-AR:
         update_custom_emoji: "%{name} actualizó el emoji %{target}"
         update_status: "%{name} actualizó el estado de %{target}"
       deleted_status: "(estado borrado)"
+      empty: No se encontraron registros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Registro de auditoría
     announcements:
       destroyed_msg: "¡Anuncio eliminado exitosamente!"
@@ -358,6 +399,7 @@ es-AR:
       destroyed_msg: Se aprobó dominio de correo electrónico exitosamente
       domain: Dominio
       empty: Actualmente no hay dominios de correo electrónico desaprobados.
+      from_html: de %{domain}
       new:
         create: Agregar dominio
         title: Nueva desaprobación de correo electrónico
@@ -537,6 +579,9 @@ es-AR:
       trends:
         desc_html: Mostrar públicamente etiquetas previamente revisadas que son tendencia actualmente
         title: Etiquetas tendencias
+    site_uploads:
+      delete: Eliminar archivo subido
+      destroyed_msg: "¡Subida al sitio eliminada exitosamente!"
     statuses:
       back_to_account: Volver a la página de la cuenta
       batch:
@@ -573,7 +618,6 @@ es-AR:
     warning_presets:
       add_new: Agregar nuevo
       delete: Eliminar
-      edit: Editar
       edit_preset: Editar preajuste de advertencia
       title: Administrar preajustes de advertencia
   admin_mailer:
@@ -661,6 +705,7 @@ es-AR:
     trouble_logging_in: "¿Tenés problemas para iniciar sesión?"
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
+    already_requested: Ya enviaste una solicitud de seguimiento a esa cuenta
     error: Lamentablemente, ocurrió un error buscando la cuenta remota
     follow: Seguir
     follow_request: 'Enviaste una solicitud de seguimiento a:'
@@ -849,6 +894,7 @@ es-AR:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+      not_ready: No se pueden adjuntar archivos que no terminaron de procesarse. ¡Intentá de nuevo en un rato!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
     acct: Mudada a
@@ -1070,6 +1116,8 @@ es-AR:
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
       other: 'contenía las etiquetas no permitidas: %{tags}'
+    errors:
+      in_reply_not_found: El estado al que intentás responder no existe.
     language_detection: Detectar idioma automáticamente
     open_in_web: Abrir en web
     over_character_limit: se excedió el límite de %{max} caracteres
@@ -1099,7 +1147,7 @@ es-AR:
       unlisted_long: Todos pueden ver, pero no está listado en las líneas temporales públicas
   stream_entries:
     pinned: Toot fijado
-    reblogged: retooteado
+    reblogged: retooteó
     sensitive_content: Contenido sensible
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a26143018..fac96aadf 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -92,6 +92,7 @@ es:
       delete: Borrar
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
+      add_email_domain_block: Poner en lista negra el dominio del correo
       approve: Aprobar
       approve_all: Aprobar todos
       are_you_sure: "¿Estás seguro?"
@@ -172,6 +173,7 @@ es:
         staff: Personal
         user: Usuario
       search: Buscar
+      search_same_email_domain: Otros usuarios con el mismo dominio de correo
       search_same_ip: Otros usuarios con la misma IP
       shared_inbox_url: URL de bandeja compartida
       show:
@@ -193,6 +195,42 @@ es:
       web: Web
       whitelisted: Añadido a la lista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar Reporte
+        change_email_user: Cambiar Correo Electrónico del Usuario
+        confirm_user: Confirmar Usuario
+        create_account_warning: Crear Advertencia
+        create_announcement: Crear Anuncio
+        create_custom_emoji: Crear Emoji Personalizado
+        create_domain_allow: Crear Permiso de Dominio
+        create_domain_block: Crear Bloqueo de Dominio
+        create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
+        demote_user: Degradar Usuario
+        destroy_announcement: Eliminar Anuncio
+        destroy_custom_emoji: Eliminar Emoji Personalizado
+        destroy_domain_allow: Eliminar Permiso de Dominio
+        destroy_domain_block: Eliminar Bloqueo de Dominio
+        destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+        destroy_status: Eliminar Estado
+        disable_2fa_user: Deshabilitar 2FA
+        disable_custom_emoji: Deshabilitar Emoji Personalizado
+        disable_user: Deshabilitar Usuario
+        enable_custom_emoji: Habilitar Emoji Personalizado
+        enable_user: Habilitar Usuario
+        memorialize_account: Transformar en Cuenta Conmemorativa
+        promote_user: Promover Usuario
+        remove_avatar_user: Eliminar Avatar
+        reopen_report: Reabrir Reporte
+        reset_password_user: Restablecer Contraseña
+        resolve_report: Resolver Reporte
+        silence_account: Silenciar Cuenta
+        suspend_account: Suspender Cuenta
+        unassigned_report: Desasignar Reporte
+        unsilence_account: Dejar de Silenciar Cuenta
+        unsuspend_account: Dejar de Suspender Cuenta
+        update_announcement: Actualizar Anuncio
+        update_custom_emoji: Actualizar Emoji Personalizado
+        update_status: Actualizar Estado
       actions:
         assigned_to_self_report: "%{name} se ha asignado la denuncia %{target} a sí mismo"
         change_email_user: "%{name} ha cambiado la dirección de correo del usuario %{target}"
@@ -230,6 +268,9 @@ es:
         update_custom_emoji: "%{name} actualizó el emoji %{target}"
         update_status: "%{name} actualizó el estado de %{target}"
       deleted_status: "(estado borrado)"
+      empty: No se encontraron registros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Log de auditoría
     announcements:
       destroyed_msg: "¡Anuncio eliminado con éxito!"
@@ -358,6 +399,7 @@ es:
       destroyed_msg: Dominio de correo borrado de la lista negra con éxito
       domain: Dominio
       empty: Actualmente no hay dominios de correo electrónico en la lista negra.
+      from_html: de %{domain}
       new:
         create: Añadir dominio
         title: Nueva entrada en la lista negra de correo
@@ -537,6 +579,9 @@ es:
       trends:
         desc_html: Mostrar públicamente hashtags previamente revisados que son tendencia
         title: Hashtags de tendencia
+    site_uploads:
+      delete: Eliminar archivo subido
+      destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     statuses:
       back_to_account: Volver a la cuenta
       batch:
@@ -573,7 +618,6 @@ es:
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
-      edit: Editar
       edit_preset: Editar aviso predeterminado
       title: Editar configuración predeterminada de avisos
   admin_mailer:
@@ -661,6 +705,7 @@ es:
     trouble_logging_in: "¿Problemas para iniciar sesión?"
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
+    already_requested: Ya has enviado una solicitud de seguimiento a esa cuenta
     error: Desafortunadamente, ha ocurrido un error buscando la cuenta remota
     follow: Seguir
     follow_request: 'Tienes una solicitud de seguimiento de:'
@@ -849,6 +894,7 @@ es:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+      not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
     acct: username@domain de la nueva cuenta
@@ -1070,6 +1116,8 @@ es:
     disallowed_hashtags:
       one: 'contenía un hashtag no permitido: %{tags}'
       other: 'contenía los hashtags no permitidos: %{tags}'
+    errors:
+      in_reply_not_found: El estado al que intentas responder no existe.
     language_detection: Detección automática de idioma
     open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 716da9010..8e3d56622 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -576,7 +576,6 @@ et:
     warning_presets:
       add_new: Lisa uus
       delete: Kustuta
-      edit: Redigeeri
       edit_preset: Redigeeri hoiatuse eelseadistust
       title: Halda hoiatuste eelseadistusi
   admin_mailer:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 3ca68d321..4c81c1617 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -72,8 +72,8 @@ eu:
     posts:
       one: Toot
       other: Toot
-    posts_tab_heading: Toot-ak
-    posts_with_replies: Toot-ak eta erantzunak
+    posts_tab_heading: Tootak
+    posts_with_replies: Tootak eta erantzunak
     reserved_username: Erabiltzaile-izena erreserbatuta dago
     roles:
       admin: Administratzailea
@@ -92,6 +92,7 @@ eu:
       delete: Ezabatu
       destroyed_msg: Moderazio ohara ongi suntsitu da!
     accounts:
+      add_email_domain_block: Sartu domeinua zerrenda beltzean
       approve: Onartu
       approve_all: Onartu denak
       are_you_sure: Ziur zaude?
@@ -172,6 +173,7 @@ eu:
         staff: Langilea
         user: Erabiltzailea
       search: Bilatu
+      search_same_email_domain: E-mail domeinu bera duten beste erabiltzailean
       search_same_ip: IP bera duten beste erabiltzaileak
       shared_inbox_url: Partekatutako sarrera ontziaren URL-a
       show:
@@ -358,6 +360,7 @@ eu:
       destroyed_msg: Ongi ezabatu da e-mail domeinua zerrenda beltzetik
       domain: Domeinua
       empty: Ez dago e-mail domeinurik zerrenda beltzean.
+      from_html: "%{domain} domeinutik"
       new:
         create: Gehitu domeinua
         title: Sarrera berria e-mail zerrenda beltzean
@@ -503,7 +506,7 @@ eu:
           open: Edonork eman dezake izena
         title: Erregistratzeko modua
       show_known_fediverse_at_about_page:
-        desc_html: Txandakatzean, fedibertso ezagun osoko toot-ak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko.
+        desc_html: Txandakatzean, fedibertso ezagun osoko tootak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko
         title: Erakutsi fedibertsu ezagun osoko denbora-lerroa aurrebistan
       show_staff_badge:
         desc_html: Erakutsi langile banda erabiltzailearen orrian
@@ -537,6 +540,9 @@ eu:
       trends:
         desc_html: Erakutsi publikoki orain joeran dauden aurretik errebisatutako traolak
         title: Traolak joeran
+    site_uploads:
+      delete: Ezabatu igotako fitxategia
+      destroyed_msg: Guneko igoera ongi ezabatu da!
     statuses:
       back_to_account: Atzera kontuaren orrira
       batch:
@@ -573,7 +579,6 @@ eu:
     warning_presets:
       add_new: Gehitu berria
       delete: Ezabatu
-      edit: Editatu
       edit_preset: Editatu abisu aurre-ezarpena
       title: Kudeatu abisu aurre-ezarpenak
   admin_mailer:
@@ -661,6 +666,7 @@ eu:
     trouble_logging_in: Arazoak saioa hasteko?
   authorize_follow:
     already_following: Kontu hau aurretik jarraitzen duzu
+    already_requested: Bidali duzu dagoeneko kontu hori jarraitzeko eskaera bat
     error: Zoritxarrez, urruneko kontua bilatzean errore bat gertatu da
     follow: Jarraitu
     follow_request: 'Jarraitzeko eskari bat bidali duzu hona:'
@@ -849,6 +855,7 @@ eu:
   media_attachments:
     validations:
       images_and_video: Ezin da irudiak dituen mezu batean bideo bat erantsi
+      not_ready: Ezin dira prozesatzen amaitu gabeko fitxategiak erantsi. Saiatu geroago!
       too_many: Ezin dira 4 fitxategi baino gehiago erantsi
   migrations:
     acct: Kontu berriaren erabiltzaile@domeinua
@@ -1076,7 +1083,7 @@ eu:
     pin_errors:
       limit: Gehienez finkatu daitekeen toot kopurua finkatu duzu jada
       ownership: Ezin duzu beste norbaiten toot bat finkatu
-      private: Ezin dira publikoak ez diren toot-ak finkatu
+      private: Ezin dira publikoak ez diren tootak finkatu
       reblog: Bultzada bat ezin da finkatu
     poll:
       total_people:
@@ -1098,7 +1105,7 @@ eu:
       unlisted: Zerrendatu gabea
       unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
   stream_entries:
-    pinned: Finkatutako toot-a
+    pinned: Finkatutako toota
     reblogged: "(r)en bultzada"
     sensitive_content: 'Kontuz: Eduki hunkigarria'
   tags:
@@ -1218,7 +1225,7 @@ eu:
     warning:
       explanation:
         disable: Zure kontua izoztuta dagoen bitartean, zure kontua bere horretan dirau, baina ezin duzu ekintzarik burutu desblokeatzen den arte.
-        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure Toot-ak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
+        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure tootak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
         suspend: Zure kontua kanporatua izan da, zure toot guztiak eta multimedia fitxategiak behin betiko ezabatu dira zerbitzari honetatik, eta zure jarraitzaileen zerbitzarietatik.
       get_in_touch: "%{instance} instantziako jendearekin harremanetan jartzeko e-mail honi erantzun ahal diozu."
       review_server_policies: Berrikusi zerbitzariko politikak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 02bbd2938..868dd8bcf 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -94,6 +94,7 @@ fa:
       delete: حذف
       destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
     accounts:
+      add_email_domain_block: مسدود کردن دامنهٔ رایانامه
       approve: پذیرفتن
       approve_all: پذیرفتن همه
       are_you_sure: مطمئنید؟
@@ -174,6 +175,7 @@ fa:
         staff: کارمند
         user: کاربر
       search: جستجو
+      search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
       search_same_ip: دیگر کاربران با IP یکسان
       shared_inbox_url: نشانی صندوق ورودی مشترک
       show:
@@ -195,6 +197,41 @@ fa:
       web: وب
       whitelisted: فهرست مجاز
     action_logs:
+      action_types:
+        assigned_to_self_report: واگذاری گزارش
+        change_email_user: تغییر رایانامه برای کاربر
+        confirm_user: تأیید کاربر
+        create_account_warning: ایجاد هشدار
+        create_announcement: ایجاد اعلامیه
+        create_custom_emoji: ایجاد اموجی سفارشی
+        create_domain_allow: ایجاد اجازهٔ دامنه
+        create_domain_block: ایجاد انسداد دامنه
+        create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
+        demote_user: تنزل کاربر
+        destroy_announcement: حذف اعلامیه
+        destroy_custom_emoji: حذف اموجی سفارشی
+        destroy_domain_allow: حذف اجازهٔ دامنه
+        destroy_domain_block: حذف انسداد دامنه
+        destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
+        destroy_status: حذف وضعیت
+        disable_2fa_user: از کار انداختن ورود دومرحله‌ای
+        disable_custom_emoji: از کار انداختن اموجی سفارشی
+        disable_user: از کار انداختن کاربر
+        enable_custom_emoji: به کار انداختن اموجی سفارشی
+        enable_user: به کار انداختن کاربر
+        promote_user: ترفیع کاربر
+        remove_avatar_user: برداشتن تصویر نمایه
+        reopen_report: بازگشایی گزارش
+        reset_password_user: بازنشانی گذرواژه
+        resolve_report: رفع گزارش
+        silence_account: خموشی حساب
+        suspend_account: تعلیق حساب
+        unassigned_report: رفع واگذاری گزارش
+        unsilence_account: رفع خموشی حساب
+        unsuspend_account: رفع تعلیق حساب
+        update_announcement: به‌روز رسانی اعلامیه
+        update_custom_emoji: به‌روز رسانی اموجی سفارشی
+        update_status: به‌روز رسانی وضعیت
       actions:
         assigned_to_self_report: "%{name} رسیدگی به گزارش %{target} را به عهده گرفت"
         change_email_user: "%{name} نشانی ایمیل کاربر %{target} را تغییر داد"
@@ -232,6 +269,9 @@ fa:
         update_custom_emoji: "%{name} شکلک %{target} را به‌روز کرد"
         update_status: "%{name} نوشتهٔ %{target} را به‌روز کرد"
       deleted_status: "(نوشتهٔ پاک‌شده)"
+      empty: هیچ گزارشی پیدا نشد.
+      filter_by_action: پالایش بر اساس کنش
+      filter_by_user: پالایش بر اساس کاربر
       title: سیاههٔ بازرسی
     announcements:
       destroyed_msg: اعلامیه با موفقیت حذف شد!
@@ -360,6 +400,7 @@ fa:
       destroyed_msg: مسدودسازی دامین ایمیل با موفقیت پاک شد
       domain: دامین
       empty: هیچ دامنه ایمیلی در حال حاضر در لیست‌سیاه قرار نگرفته است.
+      from_html: از %{domain}
       new:
         create: ساختن مسدودسازی
         title: مسدودسازی دامین ایمیل تازه
@@ -539,6 +580,9 @@ fa:
       trends:
         desc_html: برچسب‌های عمومی که پیش‌تر بازبینی شده‌اند و هم‌اینک پرطرفدارند
         title: برچسب‌های پرطرفدار
+    site_uploads:
+      delete: پرونده بارگذاری شده را پاک کنید
+      destroyed_msg: بارگذاری پایگاه با موفقیت حذف شد!
     statuses:
       back_to_account: بازگشت به صفحهٔ حساب
       batch:
@@ -575,7 +619,6 @@ fa:
     warning_presets:
       add_new: افزودن تازه
       delete: زدودن
-      edit: ویرایش
       edit_preset: ویرایش هشدار پیش‌فرض
       title: مدیریت هشدارهای پیش‌فرض
   admin_mailer:
@@ -663,6 +706,7 @@ fa:
     trouble_logging_in: برای ورود مشکلی دارید؟
   authorize_follow:
     already_following: شما همین الان هم این حساب را پی‌می‌گیرید
+    already_requested: درخواست پی‌گیری‌ای برای آن حساب فرستاده‌ بودید
     error: متأسفانه حین یافتن آن حساب خطایی رخ داد
     follow: پی بگیرید
     follow_request: 'شما درخواست پیگیری فرستاده‌اید به:'
@@ -762,16 +806,16 @@ fa:
       public: فهرست عمومی
       thread: گفتگوها
     edit:
-      title: ویرایش فیلتر
+      title: ویرایش پالایه
     errors:
       invalid_context: زمینه‌ای موجود نیست یا نامعتبر است
-      invalid_irreversible: فیلترهای برگشت‌ناپذیر تنها در زمینهٔ پیگیری‌ها یا اعلان‌ها کار می‌کنند
+      invalid_irreversible: پالایش برگشت‌ناپذیر تنها در زمینهٔ خانه یا آگاهی‌ها کار می‌کنند
     index:
       delete: پاک‌کردن
-      empty: شما هیچ فیلتری ندارید.
-      title: فیلترها
+      empty: هیچ پالایه‌ای ندارید.
+      title: پالایه‌ها
     new:
-      title: افزودن فیلتر تازه
+      title: افزودن پالایهٔ جدید
   footer:
     developers: برنامه‌نویسان
     more: بیشتر…
@@ -851,6 +895,7 @@ fa:
   media_attachments:
     validations:
       images_and_video: نمی‌توان برای نوشته‌ای که تصویر دارد ویدیو بارگذاری کرد
+      not_ready: پرونده‌هایی که پردازش را تمام نکرده‌اند نمی‌توانند پیوست شوند. یکبار دیگر امتحان کنید!
       too_many: نمی‌توان بیشتر از ۴ تصویر بارگذاری کرد
   migrations:
     acct: username@domain حساب تازه
@@ -1072,6 +1117,8 @@ fa:
     disallowed_hashtags:
       one: 'دارای هشتگ غیرمجاز: %{tags}'
       other: 'دارای هشتگ‌های غیرمجاز: %{tags}'
+    errors:
+      in_reply_not_found: به نظر نمی‌رسد وضعیتی که می‌خواهید به آن پاسخ دهید، وجود داشته باشد.
     language_detection: زبان نوشته خودبه‌خود شناخته شود
     open_in_web: بازکردن در وب
     over_character_limit: از حد مجاز %{max} حرف فراتر رفتید
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 063e3bb91..c5703e596 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -17,11 +17,13 @@ fi:
     hosted_on: Mastodon palvelimella %{domain}
     learn_more: Lisätietoja
     privacy_policy: Tietosuojaseloste
+    server_stats: 'Palvelimen tilastot:'
     source_code: Lähdekoodi
     status_count_after:
       one: tila
       other: tilanne
     status_count_before: He ovat luoneet
+    tagline: Seuraa ja löydä uusia kavereita
     terms: Käyttöehdot
     unavailable_content_description:
       domain: Palvelin
@@ -59,6 +61,7 @@ fi:
     roles:
       admin: Ylläpitäjä
       bot: Botti
+      group: Ryhmä
       moderator: Moderaattori
     unavailable: Profiili ei saatavilla
     unfollow: Lopeta seuraaminen
@@ -190,19 +193,27 @@ fi:
         update_custom_emoji: "%{name} päivitti emojin %{target}"
         update_status: "%{name} päivitti käyttäjän %{target} tilan"
       title: Auditointiloki
+    announcements:
+      title: Ilmoitukset
     custom_emojis:
+      assign_category: Aseta kategoria
       by_domain: Verkkotunnus
       copied_msg: Emojin paikallisen kopion luonti onnistui
       copy: Kopioi
       copy_failed_msg: Emojista ei voitu tehdä paikallista kopiota
+      create_new_category: Luo uusi kategoria
       created_msg: Emojin luonti onnistui!
       delete: Poista
       destroyed_msg: Emojon poisto onnistui!
       disable: Poista käytöstä
+      disabled: Ei käytössä
       disabled_msg: Emojin poisto käytöstä onnistui
+      emoji: Emoji
       enable: Ota käyttöön
+      enabled: Käytössä
       enabled_msg: Emojin käyttöönotto onnistui
       image_hint: PNG enintään 50 kt
+      list: Listaa
       listed: Listassa
       new:
         title: Lisää uusi mukautettu emoji
@@ -210,12 +221,20 @@ fi:
       shortcode: Lyhennekoodi
       shortcode_hint: Vähintään kaksi merkkiä, vain kirjaimia, numeroita ja alaviivoja
       title: Mukautetut emojit
+      uncategorized: Luokittelemattomat
+      unlist: Poista listalta
       unlisted: Ei listassa
       update_failed_msg: Emojin päivitys epäonnistui
       updated_msg: Emojin päivitys onnistui!
       upload: Lähetä
     dashboard:
       authorized_fetch_mode: Suojattu tila
+      config: Asetukset
+      feature_deletions: Tilien poistot
+      feature_invites: Kutsulinkit
+      feature_profile_directory: Profiilihakemisto
+      feature_registrations: Rekisteröitymiset
+      title: Hallintapaneeli
     domain_blocks:
       add_new: Lisää uusi
       created_msg: Verkkotunnuksen estoa käsitellään
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index bf79bc0ff..1b259d7c9 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,7 +4,7 @@ fr:
     about_hashtag_html: Voici les pouets tagués avec <strong>#%{hashtag}</strong>. Vous pouvez interagir avec eux si vous avez un compte n’importe où dans le Fédiverse.
     about_mastodon_html: 'Le réseau social de l''avenir : Pas d''annonces, pas de surveillance institutionnelle, conception éthique et décentralisation ! Possédez vos données avec Mastodon !'
     about_this: À propos
-    active_count_after: actif·ve
+    active_count_after: actif·ve·s
     active_footnote: Utilisateur·rice·s actif·ve·s mensuels (MAU)
     administered_by: 'Administrée par :'
     api: API
@@ -25,7 +25,7 @@ fr:
       Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un utilisateur individuel.
       Il est utilisé à des fins de fédération et ne doit pas être bloqué à moins que vous ne vouliez bloquer l’instance entière, dans ce cas vous devriez utiliser un bloqueur de domaine.
     learn_more: En savoir plus
-    privacy_policy: Politique de vie privée
+    privacy_policy: Politique de confidentialité
     see_whats_happening: Voir ce qui se passe
     server_stats: 'Statistiques du serveur :'
     source_code: Code source
@@ -40,25 +40,25 @@ fr:
       domain: Serveur
       reason: Motif
       rejecting_media: 'Les fichiers média de ces serveurs ne seront pas traités ou stockés et aucune miniature ne sera affichée, nécessitant un clic vers le fichier d’origine :'
-      silenced: 'Les messages de ces serveurs seront cachés des flux publics et conversations, et les interactions de leurs utilisateur·ice·s ne donneront lieu à aucune notification, à moins que vous ne les suiviez :'
-      suspended: 'Aucune donnée venant de ces serveurs ne sera traitée, stockée ou échangée, rendant toute interaction ou communication avec les utilisateurs de ces serveurs impossible :'
-    unavailable_content_html: Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateurs de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.
+      silenced: 'Les messages de ces serveurs seront cachés des flux publics et conversations, et les interactions de leurs utilisateur·rice·s ne donneront lieu à aucune notification, à moins que vous ne les suiviez :'
+      suspended: 'Aucune donnée venant de ces serveurs ne sera traitée, stockée ou échangée, rendant toute interaction ou communication avec les utilisateur·rice·s de ces serveurs impossible :'
+    unavailable_content_html: Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur·rice·s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.
     user_count_after:
-      one: utilisateur
-      other: utilisateurs
+      one: utilisateur·rice
+      other: utilisateur·rice·s
     user_count_before: Abrite
     what_is_mastodon: Qu’est-ce que Mastodon ?
   accounts:
     choices_html: "%{name} recommande :"
     endorsements_hint: Vous pouvez recommander des personnes que vous suivez depuis l’interface web, et elles apparaîtront ici.
-    featured_tags_hint: Vous pouvez recommander des hashtags spécifiques qui seront affichés ici.
+    featured_tags_hint: Vous pouvez mettre en avant certains hashtags qui seront affichés ici.
     follow: Suivre
     followers:
       one: Abonné·e
-      other: Abonné⋅e⋅s
+      other: Abonné·e·s
     following: Abonnements
     joined: Inscrit·e en %{date}
-    last_active: actif·ve dernièrement
+    last_active: dernière activité
     link_verified_on: La propriété de ce lien a été vérifiée le %{date}
     media: Médias
     moved_html: "%{name} a changé de compte pour %{new_profile_link} :"
@@ -74,7 +74,7 @@ fr:
       other: Pouets
     posts_tab_heading: Pouets
     posts_with_replies: Pouets & réponses
-    reserved_username: Ce nom d’utilisateur⋅ice est réservé
+    reserved_username: Ce nom d’utilisateur·ice est réservé
     roles:
       admin: Admin
       bot: Robot
@@ -92,9 +92,10 @@ fr:
       delete: Supprimer
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
+      add_email_domain_block: Mettre le domaine du courriel sur liste noire
       approve: Approuver
       approve_all: Tout approuver
-      are_you_sure: Êtes-vous certain⋅e ?
+      are_you_sure: Voulez-vous vraiment faire ça ?
       avatar: Avatar
       by_domain: Domaine
       change_email:
@@ -119,7 +120,7 @@ fr:
       email_status: État du courriel
       enable: Activer
       enabled: Activé
-      followers: Abonné⋅e⋅s
+      followers: Abonné·e·s
       follows: Abonnements
       header: Entête
       inbox_url: URL d’entrée
@@ -159,7 +160,7 @@ fr:
       remove_avatar: Supprimer l’avatar
       remove_header: Supprimer l’entête
       resend_confirmation:
-        already_confirmed: Cet·te utilisateur·ice est déjà confirmé·e
+        already_confirmed: Cet·te utilisateur·rice est déjà confirmé·e
         send: Renvoyer un courriel de confirmation
         success: Courriel de confirmation envoyé avec succès !
       reset: Réinitialiser
@@ -172,6 +173,7 @@ fr:
         staff: Équipe
         user: Utilisateur
       search: Rechercher
+      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       shared_inbox_url: URL de la boite de réception partagée
       show:
@@ -188,35 +190,71 @@ fr:
       undo_silenced: Démasquer
       undo_suspension: Annuler la suspension
       unsubscribe: Se désabonner
-      username: Nom d’utilisateur⋅ice
+      username: Nom d’utilisateur·ice
       warn: Avertissement
       web: Web
       whitelisted: Sur liste blanche
     action_logs:
+      action_types:
+        assigned_to_self_report: Affecter le signalement
+        change_email_user: Modifier le courriel pour
+        confirm_user: Confirmer l’utilisateur
+        create_account_warning: Créer une alerte
+        create_announcement: Créer une annonce
+        create_custom_emoji: Créer des émojis personnalisés
+        create_domain_allow: Créer un domaine autorisé
+        create_domain_block: Créer un blocage de domaine
+        create_email_domain_block: Créer un blocage de domaine de courriel
+        demote_user: Rétrograder l’utilisateur·ice
+        destroy_announcement: Supprimer l’annonce
+        destroy_custom_emoji: Supprimer des émojis personnalisés
+        destroy_domain_allow: Supprimer le domaine autorisé
+        destroy_domain_block: Supprimer le blocage de domaine
+        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
+        destroy_status: Supprimer le statut
+        disable_2fa_user: Désactiver l’A2F
+        disable_custom_emoji: Désactiver les émojis personnalisés
+        disable_user: Désactiver l’utilisateur·ice
+        enable_custom_emoji: Activer les émojis personnalisées
+        enable_user: Activer l’utilisateur
+        memorialize_account: Mémorialiser le compte
+        promote_user: Promouvoir l’utilisateur
+        remove_avatar_user: Supprimer l’avatar
+        reopen_report: Rouvrir le signalement
+        reset_password_user: Réinitialiser le mot de passe
+        resolve_report: Résoudre le signalement
+        silence_account: Rendre le compte silencieux
+        suspend_account: Suspendre le compte
+        unassigned_report: Ne plus assigner le signalement
+        unsilence_account: Désactiver le silence du compte
+        unsuspend_account: Annuler la suspension du compte
+        update_announcement: Modifier l’annonce
+        update_custom_emoji: Mettre à jour les émojis personnalisés
+        update_status: Mettre à jour le statut
       actions:
         assigned_to_self_report: "%{name} s’est assigné·e le signalement de %{target}"
         change_email_user: "%{name} a modifié l’adresse de courriel de l’utilisateur·rice %{target}"
-        confirm_user: "%{name} adresse courriel confirmée de l’utilisateur·ice %{target}"
+        confirm_user: "%{name} adresse courriel confirmée pour l’utilisateur·rice %{target}"
         create_account_warning: "%{name} a envoyé un avertissement à %{target}"
         create_announcement: "%{name} a créé une nouvelle annonce %{target}"
         create_custom_emoji: "%{name} a importé de nouveaux émojis %{target}"
         create_domain_allow: "%{name} a inscrit le domaine %{target} sur liste blanche"
         create_domain_block: "%{name} a bloqué le domaine %{target}"
         create_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste noire"
-        demote_user: "%{name} a rétrogradé l’utilisateur·ice %{target}"
+        demote_user: "%{name} a rétrogradé l’utilisateur·rice %{target}"
         destroy_announcement: "%{name} a supprimé l’annonce %{target}"
         destroy_custom_emoji: "%{name} a détruit l’émoticône %{target}"
         destroy_domain_allow: "%{name} a supprimé le domaine %{target} de la liste blanche"
         destroy_domain_block: "%{name} a débloqué le domaine %{target}"
         destroy_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste blanche"
         destroy_status: "%{name} a enlevé le statut de %{target}"
-        disable_2fa_user: "%{name} a désactivé l’authentification à deux facteurs pour l’utilisateur·ice %{target}"
+        disable_2fa_user: "%{name} a désactivé l’authentification à deux facteurs pour l’utilisateur·rice %{target}"
         disable_custom_emoji: "%{name} a désactivé l’émoji %{target}"
-        disable_user: "%{name} a désactivé le login pour l’utilisateur·ice %{target}"
+        disable_user: "%{name} a désactivé la connexion pour l’utilisateur·rice %{target}"
         enable_custom_emoji: "%{name} a activé l’émoji %{target}"
-        enable_user: "%{name} a activé le login pour l’utilisateur·ice %{target}"
+        enable_user: "%{name} a activé la connexion pour l’utilisateur·rice %{target}"
         memorialize_account: "%{name} a transformé le compte de %{target} en une page de mémorial"
-        promote_user: "%{name} a promu l’utilisateur·ice %{target}"
+        promote_user: "%{name} a promu l’utilisateur·rice %{target}"
         remove_avatar_user: "%{name} a supprimé l’avatar de %{target}"
         reopen_report: "%{name} a rouvert le signalement %{target}"
         reset_password_user: "%{name} a réinitialisé le mot de passe de %{target}"
@@ -230,6 +268,9 @@ fr:
         update_custom_emoji: "%{name} a mis à jour l’émoji %{target}"
         update_status: "%{name} a mis à jour le statut de %{target}"
       deleted_status: "(statut supprimé)"
+      empty: Aucun journal trouvé.
+      filter_by_action: Filtrer par action
+      filter_by_user: Filtrer par utilisateur·ice
       title: Journal d’audit
     announcements:
       destroyed_msg: Annonce supprimée avec succès !
@@ -296,7 +337,7 @@ fr:
       pending_users: utilisateur·rice·s en attente d’approbation
       recent_users: Utilisateur·rice·s récent·e·s
       search: Recherche plein texte
-      single_user_mode: Mode utilisateur·ice unique
+      single_user_mode: Mode utilisateur·rice unique
       software: Logiciel
       space: Espace utilisé
       title: Tableau de bord
@@ -347,7 +388,7 @@ fr:
         retroactive:
           silence: Annuler le masquage des comptes existants affectés pour ce domaine
           suspend: Annuler la suspension des comptes existants affectés pour ce domaine
-        title: Annuler le blocage de domaine pour %{domain}
+        title: Annuler le blocage du domaine %{domain}
         undo: Annuler
       undo: Annuler le bloqueur de domaine
       view: Afficher les bloqueurs de domaines
@@ -358,6 +399,7 @@ fr:
       destroyed_msg: Le blocage de domaine de courriel a été désactivé
       domain: Domaine
       empty: Aucun domaine de courriel n’est actuellement sur liste noire.
+      from_html: de %{domain}
       new:
         create: Créer le blocage
         title: Nouveau blocage de domaine de courriel
@@ -394,7 +436,7 @@ fr:
       title: Relations de %{acct}
     relays:
       add_new: Ajouter un nouveau relais
-      delete: Effacer
+      delete: Supprimer
       description_html: Un <strong>relai de fédération</strong> est un serveur intermédiaire qui échange de grandes quantités de pouets publics entre les serveurs qui publient dessus et ceux qui y sont abonnés. <strong>Il peut aider les petits et moyen serveurs à découvrir du contenu sur le fediverse</strong>, ce qui normalement nécessiterait que les membres locaux suivent des gens inscrits sur des serveurs distants.
       disable: Désactiver
       disabled: Désactivé
@@ -420,7 +462,7 @@ fr:
           one: "%{count} signalement"
           other: "%{count} signalements"
       action_taken_by: Intervention de
-      are_you_sure: Êtes vous certain⋅e ?
+      are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
       by_target_domain: Domaine du compte signalé
@@ -433,7 +475,7 @@ fr:
         create: Ajouter une note
         create_and_resolve: Résoudre avec une note
         create_and_unresolve: Ré-ouvrir avec une note
-        delete: Effacer
+        delete: Supprimer
         placeholder: Décrivez quelles actions ont été prises, ou toute autre mise à jour…
       reopen: Ré-ouvrir le signalement
       report: 'Signalement #%{id}'
@@ -448,14 +490,14 @@ fr:
       updated_at: Mis à jour
     settings:
       activity_api_enabled:
-        desc_html: Nombre de statuts affichés localement, d’utilisateur·ice·s actif·ve·s et de nouveaux·elles utilisateur·ice·s regroupé·e·s par semaine
-        title: Publier des statistiques agrégées sur l’activité des utilisateur·ice·s
+        desc_html: Nombre de statuts affichés localement, de comptes actifs et de nouvelles inscriptions regroupé·e·s par semaine
+        title: Publier des statistiques agrégées sur l’activité des utilisateur·rice·s
       bootstrap_timeline_accounts:
-        desc_html: Séparez les noms d’utilisateur·ice par des virgules. Ne fonctionne qu’avec des comptes locaux et non verrouillés. Si laissé vide, tous les administrateur⋅ice⋅s locaux sont sélectionné⋅e⋅s.
-        title: Abonnements par défaut pour les nouveaux·elles utilisateur·ice·s
+        desc_html: Séparez les noms d’utilisateur·rice·s par des virgules. Ne fonctionne qu’avec des comptes locaux et non verrouillés. Si laissé vide, tous les administrateur·rice·s locaux sont sélectionné⋅e⋅s.
+        title: Abonnements par défaut pour les nouveaux·elles utilisateur·rice·s
       contact_information:
         email: Entrez une adresse courriel publique
-        username: Entrez un nom d’utilisateur⋅ice
+        username: Entrez un nom d’utilisateur·ice
       custom_css:
         desc_html: Modifier l’apparence avec une CSS chargée sur chaque page
         title: CSS personnalisé
@@ -466,11 +508,11 @@ fr:
         all: À tout le monde
         disabled: À personne
         title: Afficher les bloqueurs de domaines
-        users: Pour les utilisateurs locaux connectés
+        users: Aux utilisateur·rice·s connecté·e·s localement
       domain_blocks_rationale:
         title: Montrer la raison
       enable_bootstrap_timeline_accounts:
-        title: Activer le suivi par défaut pour les nouveaux·elles utilisateur·ice·s
+        title: Activer les abonnements par défaut pour les nouveaux·elles utilisateur·rice·s
       hero:
         desc_html: Affichée sur la page d’accueil. Au moins 600x100px recommandé. Lorsqu’elle n’est pas définie, se rabat sur la vignette du serveur
         title: Image d’en-tête
@@ -482,7 +524,7 @@ fr:
         title: Publier la liste des serveurs découverts
       preview_sensitive_media:
         desc_html: Les liens de prévisualisation sur les autres sites web afficheront une vignette même si le média est sensible
-        title: Afficher les médias sensibles dans les prévisualisations OpenGraph
+        title: Montrer les médias sensibles dans les prévisualisations OpenGraph
       profile_directory:
         desc_html: Permettre aux utilisateur·ice·s d’être découvert·e·s
         title: Activer l’annuaire des profils
@@ -491,7 +533,7 @@ fr:
           desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées. Vous pouvez utiliser des balises HTML
           title: Message de fermeture des inscriptions
         deletion:
-          desc_html: Permettre à tou·te·s les utilisateur·ice·s de supprimer leur compte
+          desc_html: Permettre à tou·te·s les utilisateur·rice·s de supprimer leur compte
           title: Autoriser les suppressions de compte
         min_invite_role:
           disabled: Personne
@@ -503,10 +545,10 @@ fr:
           open: N’importe qui peut s’inscrire
         title: Mode d’enregistrement
       show_known_fediverse_at_about_page:
-        desc_html: Lorsque l’option est activée, les pouets provenant de toutes les serveurs connus sont affichés dans la prévisualisation. Sinon, seuls les pouets locaux sont affichés
+        desc_html: Lorsque l’option est activée, les pouets provenant de toutes les serveurs connus sont montrés dans la prévisualisation. Sinon, seuls les pouets locaux sont montrés
         title: Afficher le fediverse connu dans la prévisualisation du fil
       show_staff_badge:
-        desc_html: Montrer un badge de responsable sur une page utilisateur·ice
+        desc_html: Montrer un badge de responsable sur une page utilisateur·rice
         title: Montrer un badge de responsable
       site_description:
         desc_html: Paragraphe introductif sur la page d’accueil. Décrivez ce qui rend spécifique ce serveur Mastodon et toute autre chose importante. Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
@@ -528,15 +570,18 @@ fr:
         desc_html: Utilisée pour les prévisualisations via OpenGraph et l’API. 1200x630px recommandé
         title: Vignette du serveur
       timeline_preview:
-        desc_html: Afficher le fil public sur la page d’accueil et autoriser l'accès anonyme à l'API du fil public
+        desc_html: Afficher un lien vers le fil public sur la page d’accueil et autoriser l'accès anonyme au fil public via l'API
         title: Autoriser la prévisualisation anonyme du fil global
       title: Paramètres du serveur
       trendable_by_default:
         desc_html: Affecte les hashtags qui n'ont pas été précédemment non autorisés
-        title: Autoriser les hashtags à apparaître dans les tendances sans examen préalable
+        title: Autoriser les hashtags à apparaître dans les tendances sans approbation préalable
       trends:
         desc_html: Afficher publiquement les hashtags approuvés qui sont populaires en ce moment
         title: Hashtags populaires
+    site_uploads:
+      delete: Supprimer le fichier téléversé
+      destroyed_msg: Téléversement sur le site supprimé avec succès !
     statuses:
       back_to_account: Retour à la page du compte
       batch:
@@ -556,13 +601,13 @@ fr:
       accounts_week: Utilisation unique cette semaine
       breakdown: Répartition de l’utilisation actuelle par source
       context: Contexte
-      directory: Dans le répertoire
-      in_directory: "%{count} dans le répertoire"
+      directory: Dans l’annuaire
+      in_directory: "%{count} dans l’annuaire"
       last_active: Dernière activité
       most_popular: Plus populaire
       most_recent: Plus récent
-      name: Mot-clé
-      review: État de traitement
+      name: Hashtag
+      review: État du traitement
       reviewed: Traité
       title: Hashtags
       trending_right_now: Populaire en ce moment
@@ -572,8 +617,7 @@ fr:
     title: Administration
     warning_presets:
       add_new: Ajouter un nouveau
-      delete: Effacer
-      edit: Éditer
+      delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       title: Gérer les avertissements prédéfinis
   admin_mailer:
@@ -585,12 +629,12 @@ fr:
       body_remote: Quelqu’un de %{domain} a signalé %{target}
       subject: Nouveau signalement sur %{instance} (#%{id})
     new_trending_tag:
-      body: 'Le hashtag #%{name} est populaire aujourd’hui, mais il n’a pas été approuvé. Il ne sera pas affiché publiquement à moins que vous l’autorisiez, ou sauvegardiez simplement ce formulaire tel quel pour ne plus jamais en entendre parler.'
-      subject: Nouveau hashtag en attente de traitement sur %{instance} (#%{name})
+      body: 'Le hashtag #%{name} est dans les tendances aujourd’hui, mais il n’a pas été approuvé. Il ne sera pas affiché publiquement à moins que vous l’autorisiez, ou sauvegardez simplement ce formulaire tel quel pour ne plus jamais en entendre parler.'
+      subject: Nouveau hashtag en attente d’approbation sur %{instance} (#%{name})
   aliases:
     add_new: Créer un alias
     created_msg: Un nouvel alias a été créé avec succès. Vous pouvez maintenant déménager depuis l'ancien compte.
-    deleted_msg: Suppression réussie de l'alias. Le déménagement de ce compte vers celui-ci ne sera plus possible.
+    deleted_msg: Alias supprimé avec succès. Le déménagement de ce compte vers celui-ci ne sera plus possible.
     hint_html: Si vous voulez déménager d’un autre compte vers celui-ci, vous pouvez créer ici un alias, qui est nécessaire avant de pouvoir migrer les abonné·e·s de l’ancien compte vers celui-ci. Cette action en soi est <strong>inoffensive et réversible</strong>. <strong>La migration du compte est initiée à partir de l’ancien compte</strong>.
     remove: Détacher l'alias
   appearance:
@@ -618,7 +662,7 @@ fr:
     invalid_url: L’URL fournie est invalide
     regenerate_token: Régénérer le jeton d’accès
     token_regenerated: Jeton d’accès régénéré avec succès
-    warning: Soyez prudent⋅e avec ces données. Ne les partagez pas !
+    warning: Soyez prudent·e avec ces données. Ne les partagez pas !
     your_token: Votre jeton d’accès
   auth:
     apply_for_account: Demander une invitation
@@ -630,7 +674,7 @@ fr:
     description:
       prefix_invited_by_user: "@%{name} vous invite à rejoindre ce serveur Mastodon !"
       prefix_sign_up: Inscrivez-vous aujourd’hui sur Mastodon !
-      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateurs de n'importe quel serveur Mastodon et bien plus !
+      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateur·rice·s de n'importe quel serveur Mastodon et bien plus !
     didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
     forgot_password: Mot de passe oublié ?
     invalid_reset_password_token: Le lien de réinitialisation du mot de passe est invalide ou a expiré. Merci de réessayer.
@@ -661,13 +705,14 @@ fr:
     trouble_logging_in: Vous avez un problème pour vous connecter ?
   authorize_follow:
     already_following: Vous suivez déjà ce compte
+    already_requested: Vous avez déjà envoyé une demande d’abonnement à ce compte
     error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
     follow: Suivre
     follow_request: 'Vous avez demandé à suivre :'
     following: 'Youpi ! Vous suivez maintenant  :'
     post_follow:
       close: Ou bien, vous pouvez fermer cette fenêtre.
-      return: Afficher le profil de l’utilisateur⋅ice
+      return: Afficher le profil de l’utilisateur·ice
       web: Retour à l’interface web
     title: Suivre %{acct}
   challenge:
@@ -707,11 +752,11 @@ fr:
       email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
-      username_available: Votre nom d’utilisateur·ice sera à nouveau disponible
-      username_unavailable: Votre nom d’utilisateur·ice restera indisponible
+      username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
+      username_unavailable: Votre nom d’utilisateur·rice restera indisponible
   directories:
     directory: Annuaire des profils
-    explanation: Découvrir des utilisateurs en se basant sur leurs centres d’intérêt
+    explanation: Découvrir des utilisateur·rice·s en selon leurs centres d’intérêt
     explore_mastodon: Explorer %{title}
   domain_validator:
     invalid_domain: n’est pas un nom de domaine valide
@@ -748,10 +793,10 @@ fr:
     mutes: Vous masquez
     storage: Médias stockés
   featured_tags:
-    add_new: Ajouter un nouvel hashtag
+    add_new: Ajouter un nouveau hashtag
     errors:
-      limit: Vous avez déjà recommandé le nombre maximum de hashtags
-    hint_html: "<strong>Que sont les hashtags vedettes ?</strong> Ils sont affichés avec emphase sur votre flux d'actualités publique et permettent aux gens de parcourir vos messages publics spécifiquement sous ces hashtags. Ils sont un excellent outil pour garder trace des œuvres créatives ou des projets à long terme."
+      limit: Vous avez déjà mis en avant le nombre maximum de hashtags
+    hint_html: "<strong>Que sont les hashtags mis en avant ?</strong> Ils sont affichés en évidence sur votre profil public et permettent aux gens de parcourir vos messages publics qui utilisent ces hashtags. Ils sont un excellent outil pour garder la trace d’activités créatrices ou de projets de long terme."
   filters:
     contexts:
       account: Profils
@@ -765,7 +810,7 @@ fr:
       invalid_context: Contexte invalide ou insuffisant
       invalid_irreversible: Le filtrage irréversible ne fonctionne que pour l’accueil et les notifications
     index:
-      delete: Effacer
+      delete: Supprimer
       empty: Vous n'avez aucun filtre.
       title: Filtres
     new:
@@ -817,8 +862,8 @@ fr:
     types:
       blocking: Liste de comptes bloqués
       domain_blocking: Liste des serveurs bloqués
-      following: Liste d’utilisateur⋅ice⋅s suivi⋅e⋅s
-      muting: Liste d’utilisateur⋅ice⋅s que vous masquez
+      following: Liste d’utilisateur·rice·s suivi·e·s
+      muting: Liste d’utilisateur·rice·s que vous masquez
     upload: Importer
   in_memoriam_html: En mémoire de.
   invites:
@@ -849,6 +894,7 @@ fr:
   media_attachments:
     validations:
       images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
+      not_ready: Impossible de joindre les fichiers en traitements. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
     acct: A déménagé vers
@@ -857,7 +903,7 @@ fr:
     cancelled_msg: Suppression de la redirection réussie.
     errors:
       already_moved: est le même compte que vous avez déjà déplacé vers
-      missing_also_known_as: ne référence pas rétroactivement ce compte
+      missing_also_known_as: ne référence pas ce compte en retour
       move_to_self: ne peut pas être le compte actuel
       not_found: n'a pas été trouvé
       on_cooldown: Vous êtes soumis·e à un temps de rechargement
@@ -905,7 +951,7 @@ fr:
     follow_request:
       action: Gérer les demandes d’abonnement
       body: "%{name} a demandé à vous suivre"
-      subject: 'Abonné⋅e·s en attente : %{name}'
+      subject: 'Abonné·e·s en attente : %{name}'
       title: Nouvelle demande d’abonnement
     mention:
       action: Répondre
@@ -1044,7 +1090,7 @@ fr:
     development: Développement
     edit_profile: Modifier le profil
     export: Export de données
-    featured_tags: Hashtags recommandés
+    featured_tags: Hashtags mis en avant
     identity_proofs: Preuves d’identité
     import: Import de données
     import_and_export: Import et export
@@ -1070,6 +1116,8 @@ fr:
     disallowed_hashtags:
       one: 'contient un hashtag désactivé : %{tags}'
       other: 'contient les hashtags désactivés : %{tags}'
+    errors:
+      in_reply_not_found: Le statut auquel vous essayez de répondre ne semble pas exister.
     language_detection: Détecter automatiquement la langue
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
@@ -1086,13 +1134,13 @@ fr:
         one: "%{count} vote"
         other: "%{count} votes"
       vote: Voter
-    show_more: Afficher plus
+    show_more: Déplier
     show_thread: Afficher le fil de discussion
     sign_in_to_participate: Inscrivez-vous pour prendre part à la conversation
     title: '%{name} : "%{quote}"'
     visibilities:
       private: Abonné⋅e⋅s uniquement
-      private_long: Seul⋅e⋅s vos abonné⋅e⋅s verront vos statuts
+      private_long: Afficher seulement à vos vos abonné·e·s
       public: Public
       public_long: Tout le monde peut voir vos statuts
       unlisted: Public sans être affiché sur le fil public
@@ -1111,7 +1159,7 @@ fr:
       <ul>
       <li><em>Informations de base sur votre compte</em> : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.</li>
       <li><em>Posts, liste d’abonnements et autres informations publiques</em> : La liste de vos abonnements ainsi que la liste de vos abonné·e·s sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistré·e·s. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonné·e·s, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimer un post, il est probable que vos abonné·e·s en soient informé·e·s. Partager un message ou le marquer comme favori est toujours une action publique.</li>
-      <li><em>Posts directs et abonné·e·s uniquement</em> : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. <em>Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partager aucune information sensible à l’aide de Mastodon.</em></li>
+      <li><em>Posts directs et abonné·e·s uniquement</em> : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne foi pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. <em>Gardez s’il vous plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partager aucune information sensible à l’aide de Mastodon.</em></li>
       <li><em>IP et autres métadonnées</em> : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.</li>
       </ul>
 
@@ -1124,7 +1172,7 @@ fr:
       <ul>
       <li>Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.</li>
       <li>Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.</li>
-      <li>L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.</li>
+      <li>L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyer des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour touts autres requêtes ou questions.</li>
       </ul>
 
       <hr class="spacer" />
@@ -1152,7 +1200,7 @@ fr:
 
       <h3 id="cookies">Utilisons-nous des témoins de connexion ?</h3>
 
-      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transféres sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et de, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
+      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transfère sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et de, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
 
       <p>Nous utilisons les témoins de connexion comme un moyen de comprendre et de nous souvenir de vos préférences pour vos prochaines visites.</p>
 
@@ -1164,13 +1212,13 @@ fr:
 
       <p>Votre contenu public peut être téléchargé par d’autres serveurs du réseau. Dans le cas où vos abonné·e·s et vos destinataires résideraient sur des serveurs différents du vôtre, vos posts publics et abonné·e·s uniquement peuvent être délivrés vers les serveurs de vos abonné·e·s tandis que vos messages directs sont délivrés aux serveurs de vos destinataires.</p>
 
-      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, votre liste d’abonnements, votre liste d’abonné·e·s, vos listes, tout vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
+      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, votre liste d’abonnements, votre liste d’abonné·e·s, vos listes, tous vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
 
       <hr class="spacer" />
 
       <h3 id="children">Utilisation de ce site par les enfants</h3>
 
-      <p>Si ce serveur est situé dans dans l’UE ou l’EEE : Notre site, produits et services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
+      <p>Si ce serveur est situé dans l’UE ou l’EEE : Notre site, produits et services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
 
       <p>Si ce serveur est situé dans aux États-Unis d’Amérique : Notre site, produits et services sont tous destinés à des personnes âgées de 13 ans ou plus. Si vous avez moins de 13 ans, en application du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), merci de ne pas utiliser ce site.</p>
 
@@ -1218,8 +1266,8 @@ fr:
     warning:
       explanation:
         disable: Lorsque votre compte est gelé, les données de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusqu’à ce qu’il soit débloqué.
-        silence: Lorsque votre compte est limité, seulement les utilisateurs qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d’autres utilisateurs peuvent vous suivre manuellement.
-        suspend: Votre compte a été suspendu, et tous vos pouets et vos fichiers multimédia téléversés ont été supprimés irréversiblement de ce serveur, et des serveurs où vous aviez des abonné⋅e⋅s.
+        silence: Lorsque votre compte est limité, seul·e·s les utilisateur·rice·s qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d’autres utilisateur·rice·s peuvent vous suivre manuellement.
+        suspend: Votre compte a été suspendu, et tous vos pouets et vos fichiers multimédia téléversés ont été supprimés irréversiblement de ce serveur, et des serveurs où vous aviez des abonné·e·s.
       get_in_touch: Vous pouvez répondre à cette adresse pour entrer en contact avec l’équipe de %{instance}.
       review_server_policies: Passer en revue les politiques du serveur
       statuses: 'Spécialement, pour :'
@@ -1242,7 +1290,7 @@ fr:
       full_handle: Votre identifiant complet
       full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
       review_preferences_action: Modifier les préférences
-      review_preferences_step: Assurez-vous de définir vos préférences, telles que les courriels que vous aimeriez recevoir ou le niveau de confidentialité auquel vous aimeriez que vos messages soient soumis par défaut. Si vous n’avez pas le mal des transports, vous pouvez choisir d’activer la lecture automatique des GIF.
+      review_preferences_step: Assurez-vous de définir vos préférences, telles que les courriels que vous aimeriez recevoir ou le niveau de confidentialité auquel vous publier vos messages par défaut. Si vous n’avez pas le mal des transports, vous pouvez choisir d’activer la lecture automatique des GIF.
       subject: Bienvenue sur Mastodon
       tip_federated_timeline: La fil public global est une vue en direct du réseau Mastodon. Mais elle n’inclut que les personnes auxquelles vos voisin·es sont abonné·e·s, donc elle n’est pas complète.
       tip_following: Vous suivez les administrateur·rice·s de votre serveur par défaut. Pour trouver d’autres personnes intéressantes, consultez les fils publics local et global.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c3a33932d..35d8ac2d6 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -92,6 +92,7 @@ gl:
       delete: Eliminar
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
+      add_email_domain_block: Bloquear o dominio do email
       approve: Aprobar
       approve_all: Aprobar todos
       are_you_sure: Está segura?
@@ -172,6 +173,7 @@ gl:
         staff: Persoal (staff)
         user: Usuaria
       search: Procurar
+      search_same_email_domain: Outras usuarias co mesmo dominio de email
       search_same_ip: Outras usuarias co mesmo IP
       shared_inbox_url: URL da caixa de entrada compartida
       show:
@@ -193,6 +195,42 @@ gl:
       web: Web
       whitelisted: Lista branca
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar denuncia
+        change_email_user: Editar email do usuario
+        confirm_user: Confirmar usuario
+        create_account_warning: Crear aviso
+        create_announcement: Crear anuncio
+        create_custom_emoji: Crear emoticonas personalizadas
+        create_domain_allow: Crear permiso de dominio
+        create_domain_block: Crear bloqueo de dominio
+        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
+        demote_user: Degradar usuario
+        destroy_announcement: Eliminar anuncio
+        destroy_custom_emoji: Eliminar emoticona personalizada
+        destroy_domain_allow: Eliminar permiso de dominio
+        destroy_domain_block: Eliminar bloqueo de dominio
+        destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
+        destroy_status: Eliminar estado
+        disable_2fa_user: Desactivar autenticación de dous factores
+        disable_custom_emoji: Deshabilitar emoticona personalizada
+        disable_user: Deshabilitar usuario
+        enable_custom_emoji: Habilitar emoticona personalizada
+        enable_user: Activar usuario
+        memorialize_account: Transformar en conta conmemorativa
+        promote_user: Promover usuario
+        remove_avatar_user: Eliminar avatar
+        reopen_report: Reabrir denuncia
+        reset_password_user: Restabelecer contrasinal
+        resolve_report: Resolver denuncia
+        silence_account: Silenciar conta
+        suspend_account: Suspender conta
+        unassigned_report: Desasignar denuncia
+        unsilence_account: Deixar de silenciar conta
+        unsuspend_account: Retirar suspensión de conta
+        update_announcement: Actualizar anuncio
+        update_custom_emoji: Actualizar emoticona personalizada
+        update_status: Actualizar estado
       actions:
         assigned_to_self_report: "%{name} atribuíu a denuncia %{target} a el mesmo"
         change_email_user: "%{name} cambiou o enderezo de correo-e da usuaria %{target}"
@@ -230,6 +268,9 @@ gl:
         update_custom_emoji: "%{name} actualizou a emoticona %{target}"
         update_status: "%{name} actualizou o estado de %{target}"
       deleted_status: "(estado eliminado)"
+      empty: Non se atoparon rexistros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Rexistro de auditoría
     announcements:
       destroyed_msg: Anuncio eliminado de xeito correcto!
@@ -358,6 +399,7 @@ gl:
       destroyed_msg: Eliminouse de xeito correcto o dominio de email da listaxe negra
       domain: Dominio
       empty: Actualmente non hai dominios de email na listaxe negra.
+      from_html: desde %{domain}
       new:
         create: Engadir dominio
         title: Nova entrada na listaxe negra de email
@@ -537,6 +579,9 @@ gl:
       trends:
         desc_html: Amosar de xeito público cancelos revisados previamente que actualmente son tendencia
         title: Cancelos en tendencia
+    site_uploads:
+      delete: Eliminar o ficheiro subido
+      destroyed_msg: Eliminado correctamente o subido!
     statuses:
       back_to_account: Voltar a páxina da conta
       batch:
@@ -573,7 +618,6 @@ gl:
     warning_presets:
       add_new: Engadir novo
       delete: Eliminar
-      edit: Editar
       edit_preset: Editar aviso preestablecido
       title: Xestionar avisos preestablecidos
   admin_mailer:
@@ -661,6 +705,7 @@ gl:
     trouble_logging_in: Problemas para conectar?
   authorize_follow:
     already_following: Xa está a seguir esta conta
+    already_requested: Xa tes enviada unha solicitude de seguimento a esa conta
     error: Desgraciadamente, algo fallou ao buscar a conta remota
     follow: Seguir
     follow_request: 'Enviou unha petición de seguimento a:'
@@ -849,6 +894,7 @@ gl:
   media_attachments:
     validations:
       images_and_video: Non pode anexar un vídeo a un estado que xa contén imaxes
+      not_ready: Non se poden anexar ficheiros que aínda se están a procesar. Agarda un intre!
       too_many: Non pode anexar máis de 4 ficheiros
   migrations:
     acct: nomeusuaria@dominio da nova conta
@@ -1070,6 +1116,8 @@ gl:
     disallowed_hashtags:
       one: 'contiña un cancelo non permitido: %{tags}'
       other: 'contiña uns cancelos non permitidos: %{tags}'
+    errors:
+      in_reply_not_found: O estado ó cal tentas respostar semella que non existe.
     language_detection: Detección automática do idioma
     open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 401d07cf6..fc4805625 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -19,7 +19,7 @@ hi:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 9dd14c1dd..d7bd91c7a 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -50,7 +50,7 @@ hr:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2d7f3a137..30331b2cb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -11,9 +11,7 @@ hu:
     apps: Mobil appok
     apps_platforms: Használd a Mastodont iOS-ről, Androidról vagy más platformról
     browse_directory: Böngészd a profilokat és szűrj érdeklődési körre
-    browse_local_posts: 'Nézz bele a szerver publikus, élő adatfolyamába
-
-'
+    browse_local_posts: Nézz bele a szerver publikus, élő adatfolyamába
     browse_public_posts: Nézz bele a Mastodon élő adatfolyamába
     contact: Kapcsolat
     contact_missing: Nincs megadva
@@ -94,6 +92,7 @@ hu:
       delete: Törlés
       destroyed_msg: Moderációs bejegyzés törölve!
     accounts:
+      add_email_domain_block: Email domain tiltólistára vétele
       approve: Jóváhagyás
       approve_all: Mindet jóváhagy
       are_you_sure: Biztos vagy benne?
@@ -174,6 +173,7 @@ hu:
         staff: Stáb
         user: Felhasználó
       search: Keresés
+      search_same_email_domain: Felhasználók ugyanezzel az email domainnel
       search_same_ip: Más felhasználók ugyanezzel az IP-vel
       shared_inbox_url: Megosztott bejövő üzenetek URL
       show:
@@ -195,27 +195,63 @@ hu:
       web: Web
       whitelisted: Engedélyező-listán
     action_logs:
+      action_types:
+        assigned_to_self_report: Jelentés hozzárendelése
+        change_email_user: Felhasználó e-mail címének módosítása
+        confirm_user: Felhasználó megerősítése
+        create_account_warning: Figyelmeztetés létrehozása
+        create_announcement: Közlemény létrehozása
+        create_custom_emoji: Egyéni emodzsi létrehozása
+        create_domain_allow: Domain engedélyezés létrehozása
+        create_domain_block: Domain blokkolás létrehozása
+        create_email_domain_block: E-mail domain blokkolás létrehozása
+        demote_user: Felhasználó lefokozása
+        destroy_announcement: Közlemény törlése
+        destroy_custom_emoji: Egyéni emodzsi törlése
+        destroy_domain_allow: Domain engedélyezés törlése
+        destroy_domain_block: Domain blokkolás törlése
+        destroy_email_domain_block: E-mail domain blokkolás törlése
+        destroy_status: Állapot törlése
+        disable_2fa_user: Kétlépcsős hitelesítés letiltása
+        disable_custom_emoji: Egyéni emodzsi letiltása
+        disable_user: Felhasználói letiltása
+        enable_custom_emoji: Egyéni emodzsi engedélyezése
+        enable_user: Felhasználó engedélyezése
+        memorialize_account: Fiók emlékké nyilvánítása
+        promote_user: Felhasználó előléptetése
+        remove_avatar_user: Profilkép eltávolítása
+        reopen_report: Jelentés újranyitása
+        reset_password_user: Jelszó visszaállítása
+        resolve_report: Jelentés megoldása
+        silence_account: Fiók némítása
+        suspend_account: Fiók felfüggesztése
+        unassigned_report: Jelentés hozzárendelésének megszüntetése
+        unsilence_account: Fiók némításának feloldása
+        unsuspend_account: Fiók felfüggesztésének feloldása
+        update_announcement: Közlemény frissítése
+        update_custom_emoji: Egyéni emodzsi frissítése
+        update_status: Állapot frissítése
       actions:
         assigned_to_self_report: "%{name} a %{target} bejelentést magához rendelte"
         change_email_user: "%{name} megváltoztatta %{target} felhasználó e-mail címét"
         confirm_user: "%{name} megerősítette e-mail címét: %{target}"
         create_account_warning: "%{name} figyelmeztetést küldött %{target} felhasználónak"
         create_announcement: "%{name} új közleményt hozott létre %{target}"
-        create_custom_emoji: "%{name} új emojit töltött fel: %{target}"
+        create_custom_emoji: "%{name} új emodzsit töltött fel: %{target}"
         create_domain_allow: "%{name} engedélyező listára vette %{target} domaint"
         create_domain_block: "%{name} letiltotta az alábbi domaint: %{target}"
         create_email_domain_block: "%{name} feketelistára tette az alábbi e-mail domaint: %{target}"
         demote_user: "%{name} lefokozta az alábbi felhasználót: %{target}"
         destroy_announcement: "%{name} törölte a közleményt %{target}"
-        destroy_custom_emoji: "%{name} törölte az emojit: %{target}"
+        destroy_custom_emoji: "%{name} törölte az emodzsit: %{target}"
         destroy_domain_allow: "%{name} leszedte %{target} domaint az engedélyező listáról"
         destroy_domain_block: "%{name} engedélyezte az alábbi domaint: %{target}"
         destroy_email_domain_block: "%{name} fehérlistára tette az alábbi e-mail domaint: %{target}"
         destroy_status: "%{name} eltávolította az alábbi felhasználó tülkjét: %{target}"
         disable_2fa_user: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
-        disable_custom_emoji: "%{name} letiltotta az alábbi emojit: %{target}"
+        disable_custom_emoji: "%{name} letiltotta az alábbi emodzsit: %{target}"
         disable_user: "%{name} letiltotta az alábbi felhasználó bejelentkezését: %{target}"
-        enable_custom_emoji: "%{name} engedélyezte az alábbi emojit: %{target}"
+        enable_custom_emoji: "%{name} engedélyezte az alábbi emodzsit: %{target}"
         enable_user: "%{name} engedélyezte az alábbi felhasználó bejelentkezését: %{target}"
         memorialize_account: "%{name} emléket állított az alábbi felhasználónak: %{target}"
         promote_user: "%{name} előléptette az alábbi felhasználót: %{target}"
@@ -229,9 +265,12 @@ hu:
         unsilence_account: "%{name} feloldotta a némítást %{target} felhasználói fiókján"
         unsuspend_account: "%{name} feloldotta %{target} felhasználói fiókjának felfüggesztését"
         update_announcement: "%{name} frissítette a közleményt %{target}"
-        update_custom_emoji: "%{name} frissítette az alábbi emojit: %{target}"
+        update_custom_emoji: "%{name} frissítette az alábbi emodzsit: %{target}"
         update_status: "%{name} frissítette %{target} felhasználó tülkjét"
       deleted_status: "(törölt tülk)"
+      empty: Nem található napló.
+      filter_by_action: Szűrés művelet alapján
+      filter_by_user: Szűrés felhasználó alapján
       title: Audit napló
     announcements:
       destroyed_msg: A közlemény sikeresen törölve!
@@ -251,34 +290,34 @@ hu:
     custom_emojis:
       assign_category: Kategóriák
       by_domain: Domain
-      copied_msg: Sikeresen létrehoztuk az emoji helyi másolatát
+      copied_msg: Sikeresen létrehoztuk az emodzsi helyi másolatát
       copy: Másolás
-      copy_failed_msg: Emoji helyi másolatának létrehozása sikertelen
+      copy_failed_msg: Emodzsi helyi másolatának létrehozása sikertelen
       create_new_category: Új kategória létrehozása
-      created_msg: Emoji létrehozva!
+      created_msg: Emodzsi létrehozva!
       delete: Törlés
-      destroyed_msg: Emoji törlése sikeres!
+      destroyed_msg: Emodzsi törlése sikeres!
       disable: Letiltás
       disabled: Letiltva
-      disabled_msg: Emoji letiltva
-      emoji: Emoji
+      disabled_msg: Emodzsi letiltva
+      emoji: Emodzsi
       enable: Engedélyezés
       enabled: Engedélyezve
-      enabled_msg: Emoji engedélyezve
+      enabled_msg: Emodzsji engedélyezve
       image_hint: PNG (maximális méret 50KB)
       list: Listázás
       listed: Listázva
       new:
-        title: Új egyedi emoji hozzáadása
+        title: Új egyedi emodzsi hozzáadása
       overwrite: Felülírás
       shortcode: Rövidítés
       shortcode_hint: Legalább két karakter, csak betűk, számok és alsóvonás
-      title: Egyedi emojik
+      title: Egyedi emodzsik
       uncategorized: Nem kategorizált
       unlist: Elrejtés a listáról
       unlisted: Nincs listázva
-      update_failed_msg: Nem sikerült frissíteni az emojit
-      updated_msg: Emoji sikeresen frissítve!
+      update_failed_msg: Nem sikerült frissíteni az emodzsit
+      updated_msg: Emodzsi sikeresen frissítve!
       upload: Feltöltés
     dashboard:
       authorized_fetch_mode: Áttöltő üzemmód engedélyezve
@@ -360,6 +399,7 @@ hu:
       destroyed_msg: E-mail domain sikeresen eltávolítva a feketelistáról
       domain: Domain
       empty: Nincs email domain a feketelistán.
+      from_html: "%{domain}-ról"
       new:
         create: Domain hozzáadása
         title: Új e-mail feketelista bejegyzés
@@ -539,6 +579,9 @@ hu:
       trends:
         desc_html: Előzetesen engedélyezett és most trendi hashtagek nyilvános mutatása
         title: Trendi hashtagek
+    site_uploads:
+      delete: Feltöltött fájl törlése
+      destroyed_msg: Sikeresen töröltük a site feltöltését!
     statuses:
       back_to_account: Vissza a fiók oldalára
       batch:
@@ -575,7 +618,6 @@ hu:
     warning_presets:
       add_new: Új hozzáadása
       delete: Törlés
-      edit: Szerkesztés
       edit_preset: Figyelmeztetés szerkesztése
       title: Figyelmeztetések
   admin_mailer:
@@ -663,6 +705,7 @@ hu:
     trouble_logging_in: Problémád van a bejelentkezéssel?
   authorize_follow:
     already_following: Már követed ezt a felhasználót
+    already_requested: Már küldtél követési kérelmet ennek a fióknak
     error: Hiba történt a távoli felhasználó keresésekor
     follow: Követés
     follow_request: 'Engedélyt kértél az alábbi felhasználó követésére:'
@@ -851,6 +894,7 @@ hu:
   media_attachments:
     validations:
       images_and_video: Nem csatolhatsz videót olyan tülkhöz, amelyhez már csatoltál képet
+      not_ready: Nem lehet olyan fájlt csatolni, melynek még nem fejeződött be a feldolgozása. Próbáld kicsit később!
       too_many: Maximum négy fájlt csatolhatsz a tülkhöz
   migrations:
     acct: Az új fiók felhasznalonev@domain formátumban
@@ -956,7 +1000,7 @@ hu:
   reactions:
     errors:
       limit_reached: A különböző reakciók száma elérte a határértéket
-      unrecognized_emoji: nem ismert emoji
+      unrecognized_emoji: nem ismert emodzsi
   relationships:
     activity: Fiók aktivitás
     dormant: Elhagyott
@@ -1072,6 +1116,8 @@ hu:
     disallowed_hashtags:
       one: 'tiltott hashtaget tartalmaz: %{tags}'
       other: 'tiltott hashtageket tartalmaz: %{tags}'
+    errors:
+      in_reply_not_found: Már nem létezik az a tülk, melyre válaszolni szeretnél.
     language_detection: Nyelv automatikus felismerése
     open_in_web: Megnyitás a weben
     over_character_limit: Túllépted a maximális %{max} karakteres keretet
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 2c692235b..a0bed56fd 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -20,6 +20,11 @@ hy:
       other: Հետևորդներ
     media: Մեդիա
     never_active: Երբեք
+    roles:
+      admin: Ադմինիստրատոր
+      bot: Բոտ
+      group: Խումբ
+      moderator: Մոդերատոր
     unfollow: Չհետևել
   admin:
     account_moderation_notes:
@@ -33,7 +38,7 @@ hy:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ca222946c..27bfccc22 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -88,6 +88,7 @@ id:
       delete: Hapus
       destroyed_msg: Catatan moderasi berhasil dihapus!
     accounts:
+      add_email_domain_block: Masukkan domain surel ke daftar hitam
       approve: Terima
       approve_all: Terima semua
       are_you_sure: Anda yakin?
@@ -168,6 +169,7 @@ id:
         staff: Staf
         user: Pengguna
       search: Cari
+      search_same_email_domain: Pengguna lain dengan domain surel yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
       shared_inbox_url: URL kotak masuk bersama
       show:
@@ -353,6 +355,7 @@ id:
       destroyed_msg: Berhasil menghapus domain surel dari daftar hitam
       domain: Domain
       empty: Tidak ada domain surel yang masuk daftar hitam.
+      from_html: dari %{domain}
       new:
         create: Tambah domain
         title: Entri daftar hitam surel baru
@@ -529,6 +532,9 @@ id:
       trends:
         desc_html: Tampilkan secara publik tagar tertinjau yang kini sedang tren
         title: Tagar sedang tren
+    site_uploads:
+      delete: Hapus berkas yang diunggah
+      destroyed_msg: Situs yang diunggah berhasil dihapus!
     statuses:
       back_to_account: Kembali ke halaman akun
       batch:
@@ -565,7 +571,6 @@ id:
     warning_presets:
       add_new: Tambah baru
       delete: Hapus
-      edit: Sunting
       edit_preset: Sunting preset peringatan
       title: Kelola preset peringatan
   admin_mailer:
@@ -653,6 +658,7 @@ id:
     trouble_logging_in: Kesulitan masuk?
   authorize_follow:
     already_following: Anda sudah mengikuti akun ini
+    already_requested: Anda sudah mengirimkan permintaan untuk mengikuti akun tersebut
     error: Sayangnya, ada error saat melihat akun remote
     follow: Ikuti
     follow_request: 'Anda telah mengirim permintaan untuk mengikuti ke:'
@@ -716,7 +722,7 @@ id:
     '422':
       content: Verifikasi keamanan gagal. Apa anda memblokir cookie?
       title: Verifikasi keamanan gagal
-    '429': Throttled
+    '429': Lambat
     '500':
       content: Maaf, ada sesuatu yang salah pada sistem kami.
       title: Halaman ini tidak benar
@@ -755,6 +761,7 @@ id:
       title: Ubah saringan
     errors:
       invalid_context: Konteks tidak ada atau invalid
+      invalid_irreversible: Penyaringan yang tidak dapat dipulihkan hanya bekerja di beranda atau konteks notifikasi
     index:
       delete: Hapus
       empty: Anda tidak memiliki filter.
@@ -838,6 +845,7 @@ id:
   media_attachments:
     validations:
       images_and_video: Tidak bisa melampirkan video pada status yang telah memiliki gambar
+      not_ready: Tidak dapat melampirkan berkas yang belum selesai diproses. Coba lagi nanti!
       too_many: Tidak dapat melampirkan lebih dari 4 file
   migrations:
     acct: Pindah ke
@@ -846,21 +854,27 @@ id:
     cancelled_msg: Pembatalan peralihan berhasil.
     errors:
       already_moved: adalah akun yang sama yang sudah Anda pindahkan ke
+      missing_also_known_as: ini bukan back-reference akun ini
       move_to_self: tidak boleh akun sekarang
       not_found: tidak dapat ditemukan
+      on_cooldown: Anda berada di masa tenang
     followers_count: Jumlah pengikut saat migrasi
     incoming_migrations: Pindah dari akun berbeda
     incoming_migrations_html: Untuk pindah dari akun lain ke sini, Anda harus <a href="%{path}">membuat alias akun</a> terlebih dahulu.
     moved_msg: Akun Anda dialihkan ke %{acct} dan pengikut Anda akan ikut dipindahkan.
     not_redirecting: Saat ini akun Anda tidak dialihkan ke akun lain.
     on_cooldown: Anda baru saja memindahkan akun Anda. Fungsi ini akan tersedia kembali %{count} hari lagi.
+    past_migrations: Migrasi lampau
     proceed_with_move: Pindahkan pengikut
     redirecting_to: Akun Anda dialihkan ke %{acct}.
     set_redirect: Atur peralihan
     warning:
+      backreference_required: Akun baru harus dikonfigurasi terlebih dahulu agar merujuk ke akun ini
       before: 'Sebelum lanjut, mohon perhatikan catatan ini:'
       cooldown: Setelah pindah akun adalah masa tenang, masa Anda tidak dapat pindah akun lagi
+      disabled_account: Akun Anda tidak akan dapat dipakai secara penuh. Namun, Anda tetap akan memiliki akses ke ekspor data dan aktivasi ulang.
       followers: Tindakan ini akan memindah semua pengikut Anda dari akun sekarang ke akun baru
+      only_redirect_html: Secara alternatif, Anda <a href="%{path}">hanya dapat menaruh tulisan mengarahkan ke profil Anda</a>.
       other_data: Tidak akan ada data lagi yang dipindahkan secara otomatis
       redirect: Pemberitahuan peralihan akan dimunculkan pada akun profil Anda dan akun akan dikecualikan dari pencarian
   moderation:
@@ -898,6 +912,8 @@ id:
       subject: "%{name} mem-boost status anda"
       title: Boost baru
   notifications:
+    email_events: Event untuk notifikasi surel
+    email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
     other_settings: Pengaturan notifikasi lain
   number:
     human:
@@ -919,6 +935,7 @@ id:
     errors:
       already_voted: Anda sudah mengikuti japat ini
       duplicate_options: berisi item ganda
+      duration_too_long: terlalu jauh ke masa depan
       duration_too_short: terlalu cepat
       expired: Japat telah berakhir
       invalid_choice: Opsi pilihan yang dipilih tidak ada
@@ -929,11 +946,16 @@ id:
     other: Lainnya
     posting_defaults: Kiriman bawaan
     public_timelines: Linimasa publik
+  reactions:
+    errors:
+      limit_reached: Batas reaksi yang berbeda terpenuhi
+      unrecognized_emoji: bukan emoji yang dikenal
   relationships:
     activity: Aktivitas akun
     dormant: Terbengkalai
     followers: Pengikut
     following: Mengikuti
+    invited: Diundang
     last_active: Terakhir aktif
     most_recent: Terkini
     moved: Dipindah
@@ -1040,6 +1062,8 @@ id:
     content_warning: 'Peringatan konten: %{warning}'
     disallowed_hashtags:
       other: 'berisi tagar yang tidak diizinkan: %{tags}'
+    errors:
+      in_reply_not_found: Status yang ingin Anda balas sudah tidak ada.
     language_detection: Deteksi bahasa secara otomatis
     open_in_web: Buka di web
     over_character_limit: melebihi %{max} karakter
@@ -1126,11 +1150,14 @@ id:
       explanation: Beberapa tips sebelum Anda memulai
       final_action: Mulai mengirim
       final_step: 'Mulai mengirim! Tanpa pengikut, pesan publik Anda akan tetap dapat dilihat oleh akun lain, contohnya di linimasa lokal atau di tagar. Anda mungkin ingin memperkenalkan diri dengan tagar #introductions.'
+      full_handle: Penanganan penuh Anda
       full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
       review_preferences_action: Ubah preferensi
       review_preferences_step: Pastikan Anda telah mengatur preferensi Anda, seperti surel untuk menerima pesan, atau tingkat privasi bawaan untuk kiriman Anda. Jika Anda tidak alergi dengan gerakan gambar, Anda dapat mengaktifkan opsi mainkan otomatis GIF.
       subject: Selamat datang di Mastodon
+      tip_federated_timeline: Linimasa gabungan adalah ruang yang menampilkan jaringan Mastodon. Tapi ini hanya berisi tetangga orang-orang yang Anda ikuti, jadi tidak sepenuhnya komplet.
       tip_following: Anda secara otomatis mengikuti admin server. Untuk mencari akun-akun yang menarik, silakan periksa linimasa lokal dan gabungan.
+      tip_local_timeline: Linimasa lokal adalah ruang yang menampilkan orang-orang di %{instance}. Mereka adalah tetangga dekat!
       tip_mobile_webapp: Jika peramban mobile Anda ingin menambahkan Mastodon ke layar utama, Anda dapat menerima notifikasi dorong. Ia akan berjalan seperti aplikasi asli!
       tips: Tips
       title: Selamat datang, %{name}!
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4e426e469..0b09134bb 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -79,7 +79,7 @@ io:
     '406': This page is not available in the requested format.
     '410': La pagino quan tu serchas ne plus existas.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d6cf23966..7e681e736 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -92,6 +92,7 @@ is:
       delete: Eyða
       destroyed_msg: Tókst að eyða minnispunkti umsjónarmanns!
     accounts:
+      add_email_domain_block: Útiloka tölvupóstlén
       approve: Samþykkja
       approve_all: Samþykkja allt
       are_you_sure: Ertu viss?
@@ -115,7 +116,7 @@ is:
       display_name: Birtingarnafn
       domain: Lén
       edit: Breyta
-      email: Tölvupóstur
+      email: Tölvupóstfang
       email_status: Staða tölvupósts
       enable: Virkja
       enabled: Virkt
@@ -133,7 +134,7 @@ is:
         title: Staðsetning
       login_status: Staða innskráningar
       media_attachments: Myndaviðhengi
-      memorialize: Breya í minningargrein
+      memorialize: Breyta í minningargrein
       moderation:
         active: Virkur
         all: Allt
@@ -172,6 +173,7 @@ is:
         staff: Starfsmaður
         user: Notandi
       search: Leita
+      search_same_email_domain: Aðra notendur með sama tölvupóstlén
       search_same_ip: Aðrir notendur með sama IP-vistfang
       shared_inbox_url: Slóð á sameiginlegt innhólf
       show:
@@ -193,6 +195,42 @@ is:
       web: Vefur
       whitelisted: Á lista yfir leyft
     action_logs:
+      action_types:
+        assigned_to_self_report: Úthluta kæru
+        change_email_user: Skipta um tölvupóstfang notanda
+        confirm_user: Staðfesta notanda
+        create_account_warning: Útbúa aðvörun
+        create_announcement: Búa til tilkynningu
+        create_custom_emoji: Búa til sérsniðið tjáningartákn
+        create_domain_allow: Búa til lén leyft
+        create_domain_block: Búa til lén bannað
+        create_email_domain_block: Búa til tölvupóstfang bannað
+        demote_user: Lækka notanda í tign
+        destroy_announcement: Eyða tilkynningu
+        destroy_custom_emoji: Eyða sérsniðnu tjáningartákni
+        destroy_domain_allow: Eyða léni leyft
+        destroy_domain_block: Eyða léni bannað
+        destroy_email_domain_block: Eyða tölvupóstfangi bannað
+        destroy_status: Eyða stöðufærslu
+        disable_2fa_user: Gera tveggja-þátta auðkenningu óvirka
+        disable_custom_emoji: Gera sérsniðið tjáningartákn óvirkt
+        disable_user: Gera notanda óvirkan
+        enable_custom_emoji: Virkja sérsniðið tjáningartákn
+        enable_user: Virkja notanda
+        memorialize_account: Gera aðgang að minningargrein
+        promote_user: Hækka notanda í tign
+        remove_avatar_user: Fjarlægja auðkennismynd
+        reopen_report: Enduropna kæru
+        reset_password_user: Endurstilla lykilorð
+        resolve_report: Leysa kæru
+        silence_account: Hylja notandaaðgang
+        suspend_account: Setja notandaaðgang í bið
+        unassigned_report: Aftengja úthlutun kæru
+        unsilence_account: Hætta að hylja notandaaðgang
+        unsuspend_account: Taka notandaaðgang úr bið
+        update_announcement: Uppfæra tilkynningu
+        update_custom_emoji: Uppfæra sérsniðið tjáningartákn
+        update_status: Uppfæra stöðufærslu
       actions:
         assigned_to_self_report: "%{name} úthlutaði skýrslu %{target} til sín"
         change_email_user: "%{name} breytti tölvupóstfangi fyrir notandann %{target}"
@@ -230,6 +268,9 @@ is:
         update_custom_emoji: "%{name} uppfærði tjáningartákn %{target}"
         update_status: "%{name} uppfærði stöðufærslu frá %{target}"
       deleted_status: "(eydd stöðufærsla)"
+      empty: Engar atvikaskrár fundust.
+      filter_by_action: Sía eftir aðgerð
+      filter_by_user: Sía eftir notanda
       title: Atvikaskrá
     announcements:
       destroyed_msg: Það tókst að eyða auglýsingunni!
@@ -358,6 +399,7 @@ is:
       destroyed_msg: Tókst að eyða póstléni af lista yfir bannað
       domain: Lén
       empty: Engin tölvupóstlén eru á bannlista.
+      from_html: frá %{domain}
       new:
         create: Bæta við léni
         title: Ný færsla á bannlista fyrir tölvupóstföng
@@ -537,6 +579,9 @@ is:
       trends:
         desc_html: Birta opinberlega þau áður yfirförnu myllumerki sem eru núna í umræðunni
         title: Myllumerki í umræðunni
+    site_uploads:
+      delete: Eyða innsendri skrá
+      destroyed_msg: Það tókst að eyða innsendingu á vefsvæði!
     statuses:
       back_to_account: Fara aftur á síðu notandaaðgangsins
       batch:
@@ -573,7 +618,6 @@ is:
     warning_presets:
       add_new: Bæta við nýju
       delete: Eyða
-      edit: Breyta
       edit_preset: Breyta forstilltri aðvörun
       title: Sýsla með forstilltar aðvaranir
   admin_mailer:
@@ -661,6 +705,7 @@ is:
     trouble_logging_in: Vandræði við að skrá inn?
   authorize_follow:
     already_following: Þú ert að þegar fylgjast með þessum aðgangi
+    already_requested: Þú ert þegar búin/n að senda fylgjendabeiðni á þennan notanda
     error: Því miður, það kom upp villa við að fletta upp fjartengda notandaaðgangnum
     follow: Fylgjast með
     follow_request: 'Þú sendir beiðni um að fylgjast með til:'
@@ -849,6 +894,7 @@ is:
   media_attachments:
     validations:
       images_and_video: Ekki er hægt að hengja myndskeið við stöðufærslu sem þegar inniheldur myndir
+      not_ready: Ekki er hægt að hengja við skrár sem ekki er búið að vinna til fulls. Prófaðu aftur eftir augnablik!
       too_many: Ekki er hægt að hengja við fleiri en 4 skrár
   migrations:
     acct: Færði í
@@ -1070,6 +1116,8 @@ is:
     disallowed_hashtags:
       one: 'innihélt óleyfilegt myllumerki: %{tags}'
       other: 'innihélt óleyfilegu myllumerkin: %{tags}'
+    errors:
+      in_reply_not_found: Stöðufærslan sem þú ert að reyna að svara að er líklega ekki til.
     language_detection: Greina tungumál sjálfvirkt
     open_in_web: Opna í vafra
     over_character_limit: hámarksfjölda stafa (%{max}) náð
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2ccdc076c..2cc6d50d2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -92,6 +92,7 @@ it:
       delete: Elimina
       destroyed_msg: Nota di moderazione distrutta con successo!
     accounts:
+      add_email_domain_block: Inserisci il dominio email nella blacklist
       approve: Approva
       approve_all: Approva tutto
       are_you_sure: Sei sicuro?
@@ -172,6 +173,7 @@ it:
         staff: Personale
         user: Utente
       search: Cerca
+      search_same_email_domain: Altri utenti con lo stesso dominio e-mail
       search_same_ip: Altri utenti con lo stesso IP
       shared_inbox_url: URL Inbox Condiviso
       show:
@@ -193,6 +195,42 @@ it:
       web: Web
       whitelisted: Nella whitelist
     action_logs:
+      action_types:
+        assigned_to_self_report: Assegna report
+        change_email_user: Cambia l'e-mail per l'utente
+        confirm_user: Conferma utente
+        create_account_warning: Crea avviso
+        create_announcement: Crea un annuncio
+        create_custom_emoji: Crea emoji personalizzata
+        create_domain_allow: Crea permesso di dominio
+        create_domain_block: Crea blocco di dominio
+        create_email_domain_block: Crea blocco dominio e-mail
+        demote_user: Degrada l'utente
+        destroy_announcement: Cancella annuncio
+        destroy_custom_emoji: Cancella emoji personalizzata
+        destroy_domain_allow: Cancella permesso di dominio
+        destroy_domain_block: Cancella blocco di dominio
+        destroy_email_domain_block: Cancella blocco dominio e-mail
+        destroy_status: Cancella stato
+        disable_2fa_user: Disabilita l'autenticazione a due fattori
+        disable_custom_emoji: Disabilita emoji personalizzata
+        disable_user: Disabilita utente
+        enable_custom_emoji: Abilita emoji personalizzata
+        enable_user: Abilita utente
+        memorialize_account: Trasforma in account commemorativo
+        promote_user: Promuovi utente
+        remove_avatar_user: Elimina avatar
+        reopen_report: Riapri report
+        reset_password_user: Reimposta password
+        resolve_report: Risolvi report
+        silence_account: Silenzia account
+        suspend_account: Sospendi account
+        unassigned_report: Disassegna report
+        unsilence_account: De-silenzia account
+        unsuspend_account: Annulla la sospensione dell'account
+        update_announcement: Aggiorna annuncio
+        update_custom_emoji: Aggiorna emoji personalizzata
+        update_status: Aggiorna stato
       actions:
         assigned_to_self_report: "%{name} ha assegnato il rapporto %{target} a se stesso"
         change_email_user: "%{name} ha cambiato l'indirizzo email per l'utente %{target}"
@@ -230,6 +268,9 @@ it:
         update_custom_emoji: "%{name} ha aggiornato l'emoji %{target}"
         update_status: "%{name} stato aggiornato da %{target}"
       deleted_status: "(stato cancellato)"
+      empty: Nessun log trovato.
+      filter_by_action: Filtra per azione
+      filter_by_user: Filtra per utente
       title: Registro di controllo
     announcements:
       destroyed_msg: Annuncio eliminato!
@@ -244,7 +285,7 @@ it:
       scheduled_for: Programmato per %{time}
       scheduled_msg: Annuncio programmato per la pubblicazione!
       title: Annunci
-      unpublished_msg: Annuncio tolto dalla pubblicazione!
+      unpublished_msg: Annuncio ritirato!
       updated_msg: Annuncio aggiornato!
     custom_emojis:
       assign_category: Assegna categoria
@@ -358,6 +399,7 @@ it:
       destroyed_msg: Dominio email cancellato con successo dalla lista nera
       domain: Dominio
       empty: Nessun dominio di posta elettronica attualmente in blacklist.
+      from_html: da %{domain}
       new:
         create: Aggiungi dominio
         title: Nuova voce della lista nera delle email
@@ -537,6 +579,9 @@ it:
       trends:
         desc_html: Visualizza pubblicamente gli hashtag precedentemente esaminati che sono attualmente in tendenza
         title: Hashtag di tendenza
+    site_uploads:
+      delete: Cancella il file caricato
+      destroyed_msg: Caricamento sito eliminato!
     statuses:
       back_to_account: Torna alla pagina dell'account
       batch:
@@ -573,7 +618,6 @@ it:
     warning_presets:
       add_new: Aggiungi nuovo
       delete: Cancella
-      edit: Modifica
       edit_preset: Modifica avviso predefinito
       title: Gestisci avvisi predefiniti
   admin_mailer:
@@ -662,6 +706,7 @@ it:
     trouble_logging_in: Problemi di accesso?
   authorize_follow:
     already_following: Stai già seguendo questo account
+    already_requested: Hai già mandato una richiesta di seguire questo account
     error: Sfortunatamente c'è stato un errore nel consultare l'account remoto
     follow: Segui
     follow_request: 'Hai mandato una richiesta di diventare seguace a:'
@@ -850,6 +895,7 @@ it:
   media_attachments:
     validations:
       images_and_video: Impossibile allegare video a un post che contiene già immagini
+      not_ready: Impossibile allegare file per cui l'elaborazione non è finita. Riprova tra poco!
       too_many: Impossibile allegare più di 4 file
   migrations:
     acct: utente@dominio del nuovo account
@@ -1071,6 +1117,8 @@ it:
     disallowed_hashtags:
       one: 'contiene un hashtag non permesso: %{tags}'
       other: 'contiene gli hashtags non permessi: %{tags}'
+    errors:
+      in_reply_not_found: Lo stato a cui stai tentando di rispondere non sembra esistere.
     language_detection: Individua lingua automaticamente
     open_in_web: Apri sul Web
     over_character_limit: Limite caratteri superato di %{max}
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 24a159e57..95a2f69c9 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -88,6 +88,7 @@ ja:
       delete: 削除
       destroyed_msg: モデレーションメモを削除しました！
     accounts:
+      add_email_domain_block: ドメインをブラックリストに追加
       approve: 承認
       approve_all: すべて承認
       are_you_sure: 本当に実行しますか？
@@ -168,6 +169,7 @@ ja:
         staff: スタッフ
         user: ユーザー
       search: 検索
+      search_same_email_domain: 同じドメインのメールアドレスを使用しているユーザー
       search_same_ip: 同じ IP のユーザーを検索
       shared_inbox_url: Shared inbox URL
       show:
@@ -189,6 +191,42 @@ ja:
       web: Web
       whitelisted: ホワイトリストに登録済み
     action_logs:
+      action_types:
+        assigned_to_self_report: 通報の担当者に設定
+        change_email_user: ユーザーのメールアドレスを変更
+        confirm_user: ユーザーの確認
+        create_account_warning: 警告を作成
+        create_announcement: お知らせを作成
+        create_custom_emoji: カスタム絵文字を作成
+        create_domain_allow: ドメインホワイトリストに追加
+        create_domain_block: ドメインブロックを作成
+        create_email_domain_block: メールドメインブロックを作成
+        demote_user: ユーザーを降格
+        destroy_announcement: お知らせを削除
+        destroy_custom_emoji: カスタム絵文字を削除
+        destroy_domain_allow: ドメインホワイトリストから削除
+        destroy_domain_block: ドメインブロックを削除
+        destroy_email_domain_block: メールドメインブロックを削除
+        destroy_status: トゥートを削除
+        disable_2fa_user: 二段階認証を無効にする
+        disable_custom_emoji: カスタム絵文字を無効化
+        disable_user: ユーザーを無効化
+        enable_custom_emoji: カスタム絵文字を有効化
+        enable_user: ユーザーを有効化
+        memorialize_account: 追悼アカウント
+        promote_user: ユーザーを昇格
+        remove_avatar_user: アイコンを削除
+        reopen_report: 通報を再度開く
+        reset_password_user: パスワードをリセット
+        resolve_report: 通報を解決済みにする
+        silence_account: アカウントをサイレンス
+        suspend_account: アカウントをサスペンド
+        unassigned_report: 通報の担当を解除
+        unsilence_account: アカウントのサイレンスを解除
+        unsuspend_account: アカウントのサスペンドを解除
+        update_announcement: お知らせを更新
+        update_custom_emoji: カスタム絵文字を更新
+        update_status: ステータスを更新
       actions:
         assigned_to_self_report: "%{name} さんが通報 %{target} を自身の担当に割り当てました"
         change_email_user: "%{name} さんが %{target} さんのメールアドレスを変更しました"
@@ -226,6 +264,9 @@ ja:
         update_custom_emoji: "%{name} さんがカスタム絵文字 %{target} を更新しました"
         update_status: "%{name} さんが %{target} さんの投稿を更新しました"
       deleted_status: "(削除済)"
+      empty: ログが見つかりませんでした
+      filter_by_action: アクションでフィルター
+      filter_by_user: ユーザーでフィルター
       title: 操作履歴
     announcements:
       destroyed_msg: お知らせが削除されました
@@ -353,6 +394,7 @@ ja:
       destroyed_msg: ブラックリストから外しました
       domain: ドメイン
       empty: メールブラックリストに登録されたドメインはありません
+      from_html: "%{domain} から"
       new:
         create: ドメインを追加
         title: メールアドレス用ブラックリスト新規追加
@@ -529,6 +571,9 @@ ja:
       trends:
         desc_html: 現在トレンドになっている承認済みのハッシュタグを公開します
         title: トレンドタグを有効にする
+    site_uploads:
+      delete: ファイルを削除
+      destroyed_msg: ファイルを削除しました！
     statuses:
       back_to_account: アカウントページに戻る
       batch:
@@ -565,7 +610,6 @@ ja:
     warning_presets:
       add_new: 追加
       delete: 削除
-      edit: 編集
       edit_preset: プリセット警告文を編集
       title: プリセット警告文を管理
   admin_mailer:
@@ -653,6 +697,7 @@ ja:
     trouble_logging_in: ログインできませんか？
   authorize_follow:
     already_following: あなたは既にこのアカウントをフォローしています
+    already_requested: 既にこのアカウントへフォローリクエストを送信しています
     error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました
     follow: フォロー
     follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:'
@@ -839,6 +884,7 @@ ja:
   media_attachments:
     validations:
       images_and_video: 既に画像が追加されているため、動画を追加することはできません
+      not_ready: ファイルのアップロードに失敗しました。しばらくしてからもう一度お試しください！
       too_many: 追加できるファイルは4つまでです
   migrations:
     acct: 引っ越し先の ユーザー名@ドメイン
@@ -1055,6 +1101,8 @@ ja:
     content_warning: '閲覧注意: %{warning}'
     disallowed_hashtags:
       other: '許可されていないハッシュタグが含まれています: %{tags}'
+    errors:
+      in_reply_not_found: あなたが返信しようとしているトゥートは存在しないようです。
     language_detection: 自動検出
     open_in_web: Webで開く
     over_character_limit: 上限は %{max}文字までです
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 03f4d8c13..92c14f68c 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -58,7 +58,7 @@ kab:
     posts:
       one: Tajewwiqt
       other: Tijewwiqin
-    posts_tab_heading: Tiberraḥin
+    posts_tab_heading: Tijewwiqin
     posts_with_replies: Tijewwaqin akked tririyin
     reserved_username: Isem-agi n umseqdac yettwaṭṭef yakan
     roles:
@@ -107,6 +107,7 @@ kab:
       location:
         all: Akk
         local: Adigan
+        remote: Ameccaq
         title: Amḍiq
       login_status: Addad n tuqqna
       memorialize: Err amiḍan d asebter n usmekti
@@ -122,8 +123,8 @@ kab:
       protocol: Aneggaf
       public: Azayez
       redownload: Smiren amaγnu
-      reject: Ggami
-      reject_all: Ggami-ten akk
+      reject: Aggi
+      reject_all: Aggi-ten akk
       remove_avatar: Kkes tugna n wummuγ
       resend_confirmation:
         already_confirmed: Amseqdac-agi yettwasentem yakan
@@ -143,26 +144,26 @@ kab:
       statuses: Tisuffγin
       subscribe: Jerred
       time_in_queue: Deg tebdert n uraju %{time}
-      title: Imiḍan
+      title: Imiḍanen
       unconfirmed_email: Imayl ur yettwasentem ara
       undo_silenced: Kkes asgugem
       unsubscribe: Ur ṭafar ara
       username: Isem n useqdac
       web: Web
-      whitelisted: Deg tebdert tamellalt
+      whitelisted: Deg umuγ tamellalt
     action_logs:
       actions:
         change_email_user: "%{name} ibeddel imayl n umseqdac %{target}"
         confirm_user: "%{name} isentem tansa imayl n umseqdac %{target}"
         create_account_warning: "%{name} yuzen alγu i %{target}"
         create_custom_emoji: "%{name} yessuli-d imujiten imaynuten %{target}"
-        create_domain_allow: "%{name} yerna taγult %{target} γer tebdart tamellalt"
+        create_domain_allow: "%{name} yerna taγult %{target} γer wumuγ amellal"
         create_domain_block: "%{name} yesseḥbes taγult %{target}"
-        create_email_domain_block: "%{name} yerna taγult n imayl %{target} γer tebdart taberkant"
+        create_email_domain_block: "%{name} yerna taγult n imayl %{target} γer wumuγ aberkan"
         destroy_custom_emoji: "%{name} ihudd imuji %{target}"
-        destroy_domain_allow: "%{name} yekkes taγult %{target} seg tebdart tamellalt"
+        destroy_domain_allow: "%{name} yekkes taγult %{target} seg wumuγ amellal"
         destroy_domain_block: "%{name} yekkes aseḥbes n taγult %{target}"
-        destroy_email_domain_block: "%{name} yerna taγult n imayl %{target} γer tebdart tamellalt"
+        destroy_email_domain_block: "%{name} yerna taγult n imayl %{target} γer wumuγ amellal"
         destroy_status: "%{name} yekkes tasuffeγt n %{target}"
         disable_custom_emoji: "%{name} yessens imuji %{target}"
         disable_user: "%{name} yessens tuqqna i umseqdac %{target}"
@@ -178,6 +179,7 @@ kab:
       edit:
         title: Ẓreg ulγu
       empty: Ulac kra n ulγuyen.
+      live: Srid
       new:
         create: Rnu-d ulγu
         title: Ulγu amaynut
@@ -198,32 +200,35 @@ kab:
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
       image_hint: PNG n ddaw n 50KT
-      list: Tabdart
+      list: Umuγ
       new:
         title: Timerna n imuji udmawan amaynut
       overwrite: Semselsi
       title: Imujiten udmawanen
-      unlist: Kkes si tabdert
-      unlisted: Yettwakkes si tabdert
+      unlist: Kkes seg wumuγ
+      unlisted: Yettwakkes seg wumuγ
       update_failed_msg: Ur izmir ara ad-issali umuji-a
       upload: Sali
     dashboard:
       config: Tawila
+      feature_invites: Iseγwan n iɛaṛuḍen
       feature_profile_directory: Akaram n imaγnuten
       feature_registrations: Ajerred
+      feature_relay: Anmegli n tfidiṛalitt
       features: Timahaltin
-      open_reports: ad yeldi ineqqisen
+      open_reports: yeldin d ineqqisen
+      pending_users: imseqdacen ttrajun aɛiwed n tmuγli
       recent_users: Iseqdacen n memli kan
       software: Aseγẓan
       title: Tafelwit
       total_users: igellan akk d iseqdacen
-      week_users_active: yermed deg yimalas-agi
+      week_users_active: urmiden deg yimalas-agi
       week_users_new: imseqdacen deg yimalas-agi
     domain_allows:
-      add_new: Timerna n taγult γer tebdart tamellalt
-      created_msg: Taγult-a tettwarna γer tebdart tamellalt mebla ugur
-      destroyed_msg: Taγult-a tettwakkes seg tebdart tamellalt
-      undo: Kkes seg tebdart tamellalt
+      add_new: Timerna n taγult γer wumuγ amellal
+      created_msg: Taγult-a tettwarna γer wumuγ amellal mebla ugur
+      destroyed_msg: Taγult-a tettwakkes seg umuγ amellal
+      undo: Kkes seg umuγ amellal
     domain_blocks:
       domain: Taγult
       new:
@@ -242,13 +247,13 @@ kab:
       domain: Taγult
       new:
         create: Rnu taγult
-        title: Timerna n taγult tamaynut n imayl γer tebdart taberkant
-      title: Tabdart taberkant n imayl
+        title: Timerna n taγult tamaynut n imayl γer wumuγ aberkan
+      title: Umuγ aberkan n imayl
     instances:
       by_domain: Taγult
       delivery_available: Yella usiweḍ
       known_accounts:
-        one: "%{count} n umiḍan i yettwassen"
+        one: "%{count} n umiḍan i yettwasnen"
         other: "%{count} n yimiḍanen i yettwassnen"
       moderation:
         all: Akk
@@ -265,13 +270,19 @@ kab:
         expired: Ifat
         title: Asizdeg
       title: Iɛaruḍen
+    pending_accounts:
+      title: Imiḍanen yettrajun (%{count})
     relays:
+      add_new: Rnu anmegli amaynut
       delete: Kkes
       disable: Gdel
+      disabled: Yettwassens
       enable: Rmed
       enabled: Yermed
+      inbox_url: URL n unmegli
       save_and_enable: Sekles rnu rmed-it
       status: Addad
+      title: Imnegliyen
     reports:
       account:
         reports:
@@ -312,6 +323,8 @@ kab:
         title: Aglam n uqeddac
       site_title: Isem n uqeddac
       title: Iγewwaṛen n usmel
+    site_uploads:
+      delete: Kkes afaylu yulin
     statuses:
       back_to_account: Tuγalin γer usebter n umiḍan
       batch:
@@ -320,6 +333,7 @@ kab:
       media:
         title: Taγwalt
       no_media: Mebla taγwalt
+      title: Tisuffiγin n umiḍan
       with_media: S taγwalt
     tags:
       directory: Deg ukaram
@@ -327,10 +341,11 @@ kab:
       last_active: Armud aneggaru
       most_popular: Ittwasnen aṭas
       most_recent: Melmi kan
+      name: Ahacṭag
+      title: Ihacṭagen
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
-      edit: Ẓreg
   admin_mailer:
     new_report:
       subject: Aneqqis amaynut i %{instance} (#%{id})
@@ -342,9 +357,13 @@ kab:
     sensitive_content: Agbur amḥulfu
   application_mailer:
     salutation: "%{name},"
+    view: 'Ẓaṛ:'
     view_profile: Sken-d amaγnu
+    view_status: Sken-d tasuffiγt
   auth:
     change_password: Awal uffir
+    checkbox_agreement_html: Qebleγ <a href="%{rules_path}" target="_blank">ilugan n uqeddac-a</a> akked <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
+    checkbox_agreement_without_rules_html: Qebleγ <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
     delete_account: Kkes amiḍan
     description:
       prefix_sign_up: Zeddi di Maṣṭudun assa!
@@ -359,7 +378,7 @@ kab:
     register: Jerred
     reset_password: Wennez awal uffir
     security: Taγellist
-    set_new_password: Egr-ed awal uffir amaynut
+    set_new_password: Egr-d awal uffir amaynut
     status:
       account_status: Addad n umiḍan
       functional: Amiḍan-inek·m yettwaheyya.
@@ -369,7 +388,7 @@ kab:
     follow: Ḍfeṛ
     following: 'Igerrez! Aqlik teṭafareḍ tura:'
     post_follow:
-      return: Sken-ed amγnu n useqdac
+      return: Sken-d amγnu n useqdac
       web: Ddu γer Web
     title: Ḍfeṛ %{acct}
   challenge:
@@ -381,18 +400,18 @@ kab:
       default: "%d %b %Y"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}a"
+      about_x_hours: "%{count}isr"
       about_x_months: "%{count}ug"
-      about_x_years: "%{count}i"
-      almost_x_years: "%{count}i"
+      about_x_years: "%{count}isg"
+      almost_x_years: "%{count}isg"
       half_a_minute: Tura kan
-      less_than_x_minutes: "%{count}t"
+      less_than_x_minutes: "%{count}tis"
       less_than_x_seconds: Tura kan
-      over_x_years: "%{count}i"
+      over_x_years: "%{count}isg"
       x_days: "%{count}wu"
-      x_minutes: "%{count}t"
-      x_months: "%{count}ug"
-      x_seconds: "%{count}t"
+      x_minutes: "%{count}tis"
+      x_months: "%{count}agu"
+      x_seconds: "%{count}tas"
   deletes:
     proceed: Kkes amiḍan
   directories:
@@ -405,8 +424,9 @@ kab:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
-    '500': 
+    '429': Too many requests
+    '500':
+      title: Asebter-ayi d arameγtu
     '503': The page could not be served due to a temporary server failure.
   existing_username_validator:
     not_found_multiple: ur yezmir ara ad yaf %{usernames}
@@ -415,7 +435,7 @@ kab:
       date: Azemz
       size: Teγzi
     csv: CSV
-    lists: Tibdarin
+    lists: Umuγen
     mutes: Wid tesgugmeḍ
   featured_tags:
     add_new: Rnu amaynut
@@ -437,6 +457,7 @@ kab:
     more: Ugar…
   generic:
     all: Akk
+    changes_saved_msg: Ttwaskelsen ibelliden-ik·im akken ilaq!
     copy: Nγel
     delete: Kkes
     order_by: Sizwer s
@@ -452,7 +473,8 @@ kab:
     modes:
       overwrite: Semselsi
     types:
-      following: Tabdart n wid teṭafareḍ
+      following: Umuγ n wid teṭafareḍ
+      muting: Umuγ n wid tesgugmeḍ
     upload: Sali
   invites:
     expires_in:
@@ -466,7 +488,8 @@ kab:
     title: Ɛreḍ-d kra n yimdanen
   migrations:
     acct: Ibeddel γer
-    incoming_migrations: Tusiḍ-ed seg umiḍan nniḍen
+    incoming_migrations: Tusiḍ-d seg umiḍan nniḍen
+    proceed_with_move: Awid imeḍfaṛen-ik
   notification_mailer:
     digest:
       action: Wali akk tilγa
@@ -494,6 +517,12 @@ kab:
     status: Addad n umiḍan
   remote_follow:
     no_account_html: Ur tesɛid ara amiḍan? Tzmreḍ <a href='%{sign_up_path}' target='_blank'>ad jerdeḍ da</a>
+    proceed: Kemmel taḍfart
+  remote_interaction:
+    favourite:
+      proceed: Kemmel asmenyef
+    reply:
+      proceed: Kemmel tiririt
   sessions:
     activity: Armud aneggaru
     browser: Iminig
@@ -559,7 +588,7 @@ kab:
       total_people:
         one: "%{count} n wemdan"
         other: "%{count} n yemdanen"
-    show_more: Sken-ed ugar
+    show_more: Sken-d ugar
     sign_in_to_participate: Qqen i waken ad tzeddiḍ deg udiwenni
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 416a5fc7d..bb7a57e87 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -555,7 +555,6 @@ kk:
     warning_presets:
       add_new: Add nеw
       delete: Deletе
-      edit: Еdit
       edit_preset: Edit warning prеset
       title: Manage warning presеts
   admin_mailer:
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index d6c1d98eb..25bee609a 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -7,7 +7,7 @@ kn:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e70fbef21..2ac3fb39d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -88,6 +88,7 @@ ko:
       delete: 삭제
       destroyed_msg: 중재 기록이 성공적으로 삭제되었습니다!
     accounts:
+      add_email_domain_block: 이 이메일 도메인을 차단하기
       approve: 승인
       approve_all: 모두 승인
       are_you_sure: 정말로 실행하시겠습니까?
@@ -168,6 +169,7 @@ ko:
         staff: 스태프
         user: 사용자
       search: 검색
+      search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들
       search_same_ip: 같은 IP의 다른 사용자들
       shared_inbox_url: 공유된 inbox URL
       show:
@@ -189,6 +191,42 @@ ko:
       web: 웹
       whitelisted: 허용 목록
     action_logs:
+      action_types:
+        assigned_to_self_report: 신고 맡기
+        change_email_user: 사용자의 이메일 변경
+        confirm_user: 사용자 확인
+        create_account_warning: 경고 생성
+        create_announcement: 공지사항 생성
+        create_custom_emoji: 커스텀 에모지 생성
+        create_domain_allow: 도메인 허용 생성
+        create_domain_block: 도메인 차단 추가
+        create_email_domain_block: 이메일 도메인 차단 생성
+        demote_user: 사용자 강등
+        destroy_announcement: 공지사항 삭제
+        destroy_custom_emoji: 커스텀 에모지 삭제
+        destroy_domain_allow: 도메인 허용 삭제
+        destroy_domain_block: 도메인 차단 삭제
+        destroy_email_domain_block: 이메일 도메인 차단 삭제
+        destroy_status: 게시물 삭제
+        disable_2fa_user: 2단계 인증 비활성화
+        disable_custom_emoji: 커스텀 에모지 비활성화
+        disable_user: 사용자 비활성화
+        enable_custom_emoji: 커스텀 에모지 활성화
+        enable_user: 사용자 활성화
+        memorialize_account: 계정을 장기 저장
+        promote_user: 사용자 승급
+        remove_avatar_user: 아바타 지우기
+        reopen_report: 신고 다시 열기
+        reset_password_user: 암호 재설정
+        resolve_report: 신고 처리
+        silence_account: 계정 침묵
+        suspend_account: 계정 정지
+        unassigned_report: 신고 맡기 취소
+        unsilence_account: 계정 침묵 취소
+        unsuspend_account: 계정 정지 취소
+        update_announcement: 공지사항 업데이트
+        update_custom_emoji: 커스텀 에모지 업데이트
+        update_status: 게시물 게시
       actions:
         assigned_to_self_report: "%{name}이 리포트 %{target}을 자신에게 할당했습니다"
         change_email_user: "%{name}이 %{target}의 이메일 주소를 변경했습니다"
@@ -226,6 +264,9 @@ ko:
         update_custom_emoji: "%{name}이 에모지 %{target}를 업데이트 했습니다"
         update_status: "%{name}이 %{target}의 상태를 업데이트 했습니다"
       deleted_status: "(삭제됨)"
+      empty: 로그를 찾을 수 없습니다
+      filter_by_action: 행동으로 거르기
+      filter_by_user: 유저로 거르기
       title: 감사 기록
     announcements:
       destroyed_msg: 공지가 성공적으로 삭제되었습니다!
@@ -355,6 +396,7 @@ ko:
       destroyed_msg: 이메일 도메인 차단 규칙을 삭제했습니다
       domain: 도메인
       empty: 현재 블랙리스트에 등록한 이메일 도메인이 없습니다
+      from_html: "%{domain}에서"
       new:
         create: 차단 규칙 생성
         title: 새 이메일 도메인 차단
@@ -531,6 +573,9 @@ ko:
       trends:
         desc_html: 리뷰를 거친 해시태그를 유행하는 해시태그에 공개적으로 보여줍니다
         title: 유행하는 해시태그
+    site_uploads:
+      delete: 업로드한 파일 삭제
+      destroyed_msg: 사이트 업로드를 성공적으로 삭제했습니다!
     statuses:
       back_to_account: 계정으로 돌아가기
       batch:
@@ -567,7 +612,6 @@ ko:
     warning_presets:
       add_new: 새로 추가
       delete: 삭제
-      edit: 편집
       edit_preset: 경고 틀 수정
       title: 경고 틀 관리
   admin_mailer:
@@ -655,6 +699,7 @@ ko:
     trouble_logging_in: 로그인 하는데 문제가 있나요?
   authorize_follow:
     already_following: 이미 이 계정을 팔로우 하고 있습니다
+    already_requested: 이미 이 계정에게 팔로우 요청을 보냈습니다
     error: 리모트 계정을 확인하는 도중 오류가 발생했습니다
     follow: 팔로우
     follow_request: '당신은 다음 계정에 팔로우 신청을 했습니다:'
@@ -841,6 +886,7 @@ ko:
   media_attachments:
     validations:
       images_and_video: 이미 사진이 첨부 된 게시물엔 동영상을 첨부 할 수 없습니다
+      not_ready: 처리가 끝나지 않은 파일은 첨부할 수 없습니다. 잠시 후에 다시 시도해 주세요!
       too_many: 최대 4개까지 첨부할 수 있습니다
   migrations:
     acct: 새 계정의 username@domain
@@ -1057,6 +1103,8 @@ ko:
     content_warning: '열람 주의: %{warning}'
     disallowed_hashtags:
       other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'
+    errors:
+      in_reply_not_found: 답장하려는 게시물이 존재하지 않습니다.
     language_detection: 자동으로 언어 감지
     open_in_web: Web으로 열기
     over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9af094c01..5a4542ea8 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -410,7 +410,6 @@ lt:
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
-      edit: Keisti
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
   admin_mailer:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f6625dd41..5c493be56 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -7,7 +7,7 @@ lv:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index acb18fb5a..c2cafa5a7 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -7,7 +7,7 @@ mk:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 960ab95cc..f2731cf04 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -51,7 +51,7 @@ ml:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 3f83ed785..72228df52 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -7,7 +7,7 @@ mr:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 71dc72d9d..3ab481846 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -291,7 +291,7 @@ ms:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 976072368..7ab26c4ba 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -537,6 +537,9 @@ nl:
       trends:
         desc_html: Eerder beoordeelde hashtags die op dit moment trending zijn openbaar tonen
         title: Trending hashtags
+    site_uploads:
+      delete: Geüpload bestand verwijderen
+      destroyed_msg: Verwijderen website-upload geslaagd!
     statuses:
       back_to_account: Terug naar accountpagina
       batch:
@@ -573,7 +576,6 @@ nl:
     warning_presets:
       add_new: Nieuwe toevoegen
       delete: Verwijderen
-      edit: Bewerken
       edit_preset: Voorinstelling van waarschuwing bewerken
       title: Voorinstellingen van waarschuwingen beheren
   admin_mailer:
@@ -661,6 +663,7 @@ nl:
     trouble_logging_in: Problemen met inloggen?
   authorize_follow:
     already_following: Je volgt dit account al
+    already_requested: Je hebt al een volgverzoek naar dat account verstuurd
     error: Helaas, er is een fout opgetreden bij het opzoeken van de externe account
     follow: Volgen
     follow_request: 'Jij hebt een volgverzoek ingediend bij:'
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index fd61f2156..f83646a7b 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -21,9 +21,7 @@ nn:
     federation_hint_html: Med ein konto på %{instance} kan du fylgja folk på kva som helst slags Mastod-tenar og meir.
     get_apps: Prøv ein mobilapp
     hosted_on: "%{domain} er vert for Mastodon"
-    instance_actor_flash: 'Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet.
-
-'
+    instance_actor_flash: "Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet. \n"
     learn_more: Lær meir
     privacy_policy: Personvernsreglar
     see_whats_happening: Sjå kva som skjer
@@ -566,7 +564,6 @@ nn:
     warning_presets:
       add_new: Legg til ny
       delete: Slett
-      edit: Rediger
       edit_preset: Endr åtvaringsoppsett
       title: Handsam åtvaringsoppsett
   admin_mailer:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 256ed99a3..4a1b859dc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -561,7 +561,6 @@
     warning_presets:
       add_new: Legg til ny
       delete: Slett
-      edit: Rediger
   admin_mailer:
     new_pending_account:
       body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 4a60227ab..0be4f6458 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -186,6 +186,33 @@ oc:
       web: Web
       whitelisted: Mes en lista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assignar lo rapòrt
+        change_email_user: Cambiar l’adreça de l’utilizaire
+        confirm_user: Confirmar l’utilizaire
+        create_account_warning: Crear un avertiment
+        create_announcement: Crear una anóncia
+        create_custom_emoji: Crear un emoji personalizat
+        demote_user: Retrogradar l’utilizaire
+        destroy_announcement: Suprimir l’anóncia
+        destroy_custom_emoji: Suprimir l’emoji personalizat
+        destroy_domain_block: Suprimir lo blocatge de domeni
+        destroy_status: Suprimir l’estatut
+        disable_2fa_user: Desactivar 2FA
+        disable_custom_emoji: Desactivar l’emoji personalizat
+        disable_user: Desactivar l’utilizaire
+        enable_custom_emoji: Activar l’emoji personalizat
+        enable_user: Activar l’utilizaire
+        promote_user: Promòure l’utilizaire
+        remove_avatar_user: Suprimir l’avatar
+        reopen_report: Tornar dobrir lo rapòrt
+        reset_password_user: Reïnicializar lo senhal
+        resolve_report: Resòlver lo rapòrt
+        suspend_account: Suspendre lo compte
+        unassigned_report: Desafectar lo rapòrt
+        update_announcement: Actualizar l’anóncia
+        update_custom_emoji: Actualizar l’emoji personalizat
+        update_status: Actualizar l’estatut
       actions:
         assigned_to_self_report: "%{name} s’assignèt lo rapòrt %{target}"
         change_email_user: "%{name} cambièt l’adreça de corrièl de %{target}"
@@ -223,6 +250,9 @@ oc:
         update_custom_emoji: "%{name} metèt a jorn l’emoji %{target}"
         update_status: "%{name} metèt a jorn l’estatut a %{target}"
       deleted_status: "(estatut suprimit)"
+      empty: Cap de jornal pas trobat.
+      filter_by_action: Filtrar per accion
+      filter_by_user: Filtrar per utilizaire
       title: Audit dels jornals
     announcements:
       destroyed_msg: Anóncia corrèctament tirada !
@@ -558,7 +588,6 @@ oc:
     warning_presets:
       add_new: N’ajustar un nòu
       delete: Escafar
-      edit: Modificar
       edit_preset: Modificar lo tèxt predefinit d’avertiment
       title: Gerir los tèxtes predefinits
   admin_mailer:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 28a486145..c8bad6de3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -100,6 +100,7 @@ pl:
       delete: Usuń
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną!
     accounts:
+      add_email_domain_block: Dodaj domenę e-mail na czarną listę
       approve: Przyjmij
       approve_all: Zatwierdź wszystkie
       are_you_sure: Jesteś tego pewien?
@@ -180,6 +181,7 @@ pl:
         staff: Ekipa
         user: Użytkownik
       search: Szukaj
+      search_same_email_domain: Inni użytkownicy z e-mail w tej domenie
       search_same_ip: Inni użytkownicy z tym samym IP
       shared_inbox_url: Adres udostępnianej skrzynki
       show:
@@ -201,6 +203,42 @@ pl:
       web: Sieć
       whitelisted: Na białej liście
     action_logs:
+      action_types:
+        assigned_to_self_report: Przypisz zgłoszenie
+        change_email_user: Zmień adres e-mail użytkownika
+        confirm_user: Potwierdź użytkownika
+        create_account_warning: Utwórz ostrzeżenie
+        create_announcement: Utwórz ogłoszenie
+        create_custom_emoji: Utwórz niestandardowe emoji
+        create_domain_allow: Utwórz zezwolenie dla domeny
+        create_domain_block: Utwórz blokadę domeny
+        create_email_domain_block: Utwórz blokadę domeny e-mail
+        demote_user: Zdegraduj użytkownika
+        destroy_announcement: Usuń ogłoszenie
+        destroy_custom_emoji: Usuń niestandardowe emoji
+        destroy_domain_allow: Usuń zezwolenie dla domeny
+        destroy_domain_block: Usuń blokadę domeny
+        destroy_email_domain_block: Usuń blokadę domeny e-mail
+        destroy_status: Usuń wpis
+        disable_2fa_user: Wyłącz 2FA
+        disable_custom_emoji: Wyłącz niestandardowe emoji
+        disable_user: Wyłącz użytkownika
+        enable_custom_emoji: Włącz niestandardowe emoji
+        enable_user: Włącz użytkownika
+        memorialize_account: Upamiętnij konto
+        promote_user: Podnieś uprawnienia
+        remove_avatar_user: Usuń awatar
+        reopen_report: Otwórz zgłoszenie ponownie
+        reset_password_user: Resetuj hasło
+        resolve_report: Rozwiąż zgłoszenie
+        silence_account: Wycisz konto
+        suspend_account: Zawieś konto
+        unassigned_report: Cofnij przypisanie zgłoszenia
+        unsilence_account: Cofnij wyciszenie konta
+        unsuspend_account: Cofnij zawieszenie konta
+        update_announcement: Aktualizuj ogłoszenie
+        update_custom_emoji: Aktualizuj niestandardowe emoji
+        update_status: Aktualizuj wpis
       actions:
         assigned_to_self_report: "%{name} przypisał(a) sobie zgłoszenie %{target}"
         change_email_user: "%{name} zmienił(a) adres e-mail użytkownika %{target}"
@@ -238,6 +276,9 @@ pl:
         update_custom_emoji: "%{name} zaktualizował(a) emoji %{target}"
         update_status: "%{name} zaktualizował(a) wpis użytkownika %{target}"
       deleted_status: "(usunięty wpis)"
+      empty: Nie znaleziono aktywności w dzienniku.
+      filter_by_action: Filtruj według działania
+      filter_by_user: Filtruj według użytkownika
       title: Dziennik działań administracyjnych
     announcements:
       destroyed_msg: Pomyślnie usunięto ogłoszenie!
@@ -368,6 +409,7 @@ pl:
       destroyed_msg: Pomyślnie usunięto blokadę domeny e-mail
       domain: Domena
       empty: Żadna domena e-mail nie znajduje się obecnie na czarnej liście.
+      from_html: z %{domain}
       new:
         create: Utwórz blokadę
         title: Nowa blokada domeny e-mail
@@ -424,6 +466,17 @@ pl:
       created_msg: Pomyslnie utworzono notatkę moderacyjną.
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną.
     reports:
+      account:
+        notes:
+          few: "%{count} notatki"
+          many: "%{count} notatek"
+          one: "%{count} notatka"
+          other: "%{count} notatki"
+        reports:
+          few: "%{count} zgłoszenia"
+          many: "%{count} zgłoszeń"
+          one: "%{count} zgłoszenie"
+          other: "%{count} zgłoszenia"
       action_taken_by: Działanie podjęte przez
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
@@ -464,6 +517,18 @@ pl:
       custom_css:
         desc_html: Modyfikuj wygląd pliku CSS ładowanego na każdej stronie
         title: Niestandardowy CSS
+      default_noindex:
+        desc_html: Wpływa na wszystkich użytkowników, którzy nie zmienili tego ustawienia
+        title: Domyślnie żądaj nieindeksowania użytkowników w wyszukiwarkach
+      domain_blocks:
+        all: Każdemu
+        disabled: Nikomu
+        title: Pokazuj zablokowane domeny
+        users: Zalogowanym lokalnym użytkownikom
+      domain_blocks_rationale:
+        title: Pokaż uzasadnienia
+      enable_bootstrap_timeline_accounts:
+        title: Dodawaj domyślne obserwacje nowym użytkownikom
       hero:
         desc_html: Wyświetlany na stronie głównej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. Jeżeli nie ustawiony, zostanie użyta miniatura serwera
         title: Obraz bohatera
@@ -514,6 +579,9 @@ pl:
         desc_html: Miejsce na własną politykę prywatności, zasady użytkowania i inne unormowania prawne. Możesz korzystać ze znaczników HTML
         title: Niestandardowe zasady użytkowania
       site_title: Nazwa serwera
+      spam_check_enabled:
+        desc_html: Mastodon może automatycznie zgłaszać konta, które wysyłają powtarzające się niechciane wiadomości. Część zgłoszeń może być nieprawidłowa.
+        title: Automatyzacja antyspamu
       thumbnail:
         desc_html: 'Używana w podglądzie przez OpenGraph i API. Zalecany rozmiar: 1200x630 pikseli'
         title: Miniatura serwera
@@ -521,12 +589,22 @@ pl:
         desc_html: Wyświetlaj publiczną oś czasu na stronie widocznej dla niezalogowanych
         title: Podgląd osi czasu
       title: Ustawienia strony
+      trendable_by_default:
+        desc_html: Wpływa na hashtagi, które nie były wcześniej niedozwolone
+        title: Hashtagi mogą pojawiać się w trendach bez wcześniejszego zatwierdzenia
+      trends:
+        desc_html: Wyświetlaj publicznie wcześniej sprawdzone hashtagi, które są obecnie na czasie
+        title: Popularne hashtagi
+    site_uploads:
+      delete: Usuń przesłany plik
+      destroyed_msg: Pomyślnie usunięto przesłany plik!
     statuses:
       back_to_account: Wróć na konto
       batch:
         delete: Usuń
         nsfw_off: Cofnij NSFW
         nsfw_on: Oznacz jako NSFW
+      deleted: Usunięto
       failed_to_execute: Nie udało się wykonać
       media:
         title: Multimedia
@@ -535,13 +613,27 @@ pl:
       title: Wpisy konta
       with_media: Z zawartością multimedialną
     tags:
+      accounts_today: Unikalne wykorzystania dzisiaj
+      accounts_week: Unikalne wykorzystania w tym tygodniu
+      breakdown: Podział dzisiejszego wykorzystania według źródła
+      context: Kontekst
+      directory: W katalogu
+      in_directory: "%{count} w katalogu"
+      last_active: Ostatnia aktywność
+      most_popular: Najpopularniejsze
+      most_recent: Ostatnie
       name: Hasztag
+      review: Stan przeglądu
+      reviewed: Przejrzany
       title: Hashtagi
+      trending_right_now: Obecnie na czasie
+      unique_uses_today: "%{count} opublikowanych dzisiaj"
+      unreviewed: Nie przejrzano
+      updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
     title: Administracja
     warning_presets:
       add_new: Dodaj nowy
       delete: Usuń
-      edit: Edytuj
       edit_preset: Edytuj szablon ostrzeżenia
       title: Zarządzaj szablonami ostrzeżeń
   admin_mailer:
@@ -552,14 +644,27 @@ pl:
       body: Użytkownik %{reporter} zgłosił(a) %{target}
       body_remote: Użytkownik instancji %{domain} zgłosił(a) %{target}
       subject: Nowe zgłoszenie na %{instance} (#%{id})
+    new_trending_tag:
+      body: 'Hashtag #%{name} jest dziś popularny, ale nie został wcześniej zatwierdzony. Nie będzie wyświetlany publicznie zanim na to pozwolisz, możesz też zapisać, że nie chcesz o nim już słyszeć.'
+      subject: Nowy hashtag do zatwierdzenia na %{instance} (#%{name})
   aliases:
     add_new: Utwórz alias
+    created_msg: Pomyślnie utworzono nowy alias. Możesz teraz rozpocząć przenoszenie ze starego konta.
+    deleted_msg: Pomyślnie usunięto alias. Przenoszenie z tamtego konta na to nie będzie dłużej możliwe.
+    hint_html: Jeżeli chcesz przenieść się z innego konta na to, możesz utworzyć alias, który jest wymagany zanim zaczniesz przenoszenie obserwacji z poprzedniego konta na to. To działanie <strong>nie wyrządzi szkód i jest odwracalne</strong>. <strong>Migracja konta jest inicjowana ze starego konta</strong>.
+    remove: Odłącz alias
   appearance:
     advanced_web_interface: Zaawansowany interfejs użytkownika
     advanced_web_interface_hint: Jeśli chcesz użyć pełną szerokość swojego ekranu, zaawansowany interfejs użytkownika pozwala Ci skonfigurować wiele różnych kolumn, by zobaczyć jak najwięcej informacji kiedy tylko chcesz. Strona główna, Powiadomienia, Globalna oś czasu, dowolna ilość list i hasztagów.
     animations_and_accessibility: Animacje i dostępność
     confirmation_dialogs: Dialogi potwierdzenia
+    discovery: Odkrywanie
+    localization:
+      body: Mastodon jest tłumaczony przez wolontariuszy.
+      guide_link: https://pl.crowdin.com/project/mastodon
+      guide_link_text: Każdy może wnieść swój wkład.
     sensitive_content: Wrażliwa zawartość
+    toot_layout: Wygląd wpisów
   application_mailer:
     notification_preferences: Zmień ustawienia e-maili
     salutation: "%{name},"
@@ -579,8 +684,13 @@ pl:
     apply_for_account: Poproś o zaproszenie
     change_password: Hasło
     checkbox_agreement_html: Zgadzam się z <a href="%{rules_path}" target="_blank">regułami serwera</a> i <a href="%{terms_path}" target="_blank">zasadami korzystania z usługi</a>
+    checkbox_agreement_without_rules_html: Akceptuję <a href="%{terms_path}" target="_blank">warunki korzystania z usługi</a>
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
+    description:
+      prefix_invited_by_user: "@%{name} zaprasza Cię do dołączenia na ten serwer Mastodona!"
+      prefix_sign_up: Zarejestruj się na Mastodon już dziś!
+      suffix: Mając konto, możesz śledzić ludzi, publikować wpisy i wymieniać się wiadomościami z użytkownikami innych serwerów Mastodona i nie tylko!
     didnt_get_confirmation: Nie otrzymałeś(-aś) instrukcji weryfikacji?
     forgot_password: Nie pamiętasz hasła?
     invalid_reset_password_token: Token do resetowania hasła jest nieprawidłowy lub utracił ważność. Spróbuj uzyskać nowy.
@@ -598,9 +708,20 @@ pl:
     reset_password: Zresetuj hasło
     security: Bezpieczeństwo
     set_new_password: Ustaw nowe hasło
+    setup:
+      email_below_hint_html: Jeżeli poniższy adres e-mail jest nieprawidłowy, możesz zmienić go tutaj i otrzymać nowy e-mail potwierdzający.
+      email_settings_hint_html: E-mail potwierdzający został wysłany na %{email}. Jeżeli adres e-mail nie jest prawidłowy, możesz zmienić go w ustawieniach konta.
+      title: Konfiguracja
+    status:
+      account_status: Stan konta
+      confirming: Oczekiwanie na potwierdzenie adresu e-mail.
+      functional: Twoje konto całkowicie funkcjonuje.
+      pending: Twoje zgłoszenie czeka na zatwierdzenie przez nas. Może to trochę potrwać. Jeżeli zgłoszenie zostanie przyjęte, otrzymasz wiadomość e-mail.
+      redirecting_to: Twoje konto jest nieaktywne, ponieważ obecnie przekierowuje je na %{acct}.
     trouble_logging_in: Masz problem z zalogowaniem się?
   authorize_follow:
     already_following: Już śledzisz to konto
+    already_requested: Już wysłałeś(-aś) prośbę o możliwość śledzenia tego konta
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
     follow: Śledź
     follow_request: 'Wysłano prośbę o pozwolenie na śledzenie:'
@@ -612,6 +733,12 @@ pl:
     title: Śledź %{acct}
   challenge:
     confirm: Kontynuuj
+    hint_html: "<strong>Informacja:</strong> Nie będziemy prosić Cię o ponowne podanie hasła przez następną godzinę."
+    invalid_password: Nieprawidłowe hasło
+    prompt: Potwierdź hasło, aby kontynuować
+  date:
+    formats:
+      default: "%d. %b %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}g"
@@ -627,18 +754,33 @@ pl:
       x_months: "%{count} miesięcy"
       x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: Wprowadzone informacje za nieprawidłowe
     confirm_password: Wprowadź aktualne hasło, aby potwierdzić tożsamość
+    confirm_username: Wprowadź swoją nazwę użytkownika aby potwierdzić procedurę
     proceed: Usuń konto
     success_msg: Twoje konto zostało pomyślnie usunięte
+    warning:
+      before: 'Zanim kontynuujesz, przeczytać uważnie te uwagi:'
+      caches: Zawartość obecna w pamięci podręcznej innych serwerów może tam pozostać
+      data_removal: Twoje wpisy i inne dane zostaną bezpowrotnie usunięte
+      email_change_html: Możesz <a href="%{path}">zmienić swój adres e-mail</a> bez usunięcia konta
+      email_contact_html: Jeżeli wciąż nie dotarł, możesz wysłać wiadomość e-mail na <a href="mailto:%{email}">%{email}</a> aby uzyskać pomoc
+      email_reconfirmation_html: Jeżeli nie otrzymujesz potwierdzającego e-maila, możesz <a href="%{path}">poprosić o kolejny</a>
+      irreversible: Nie będziesz móc przywrócić lub reaktywować swojego konta
+      more_details_html: Aby uzyskać więcej szczegółów, przeczytaj naszą <a href="%{terms_path}">politykę prywatności</a>.
+      username_available: Twoja nazwa użytkownika będzie z powrotem dostępna
+      username_unavailable: Twoja nazwa użytkownika pozostanie niedostępna
   directories:
     directory: Katalog profilów
     explanation: Poznaj profile na podstawie zainteresowań
     explore_mastodon: Odkrywaj %{title}
+  domain_validator:
+    invalid_domain: nie jest prawidłową nazwą domeny
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Wysłane zgłoszenie jest nieprawidłowe lub uszkodzone.
     '403': Nie masz uprawnień, aby wyświetlić tę stronę.
     '404': Strona, którą próbujesz odwiedzić, nie istnieje.
-    '406': This page is not available in the requested format.
+    '406': Ta strona nie jest dostępna w zażądanym formacie.
     '410': Strona, którą próbujesz odwiedzić, przestała istnieć.
     '422':
       content: Sprawdzanie bezpieczeństwa nie powiodło się. Czy blokujesz pliki cookie?
@@ -647,7 +789,7 @@ pl:
     '500':
       content: Przepraszamy, coś poszło nie tak, po naszej stronie.
       title: Ta strona jest nieprawidłowa
-    '503': The page could not be served due to a temporary server failure.
+    '503': Strona nie może zostać wyświetlona z powodu tymczasowego niepowodzenia serwera.
     noscript_html: Aby korzystać z aplikacji Mastodon, włącz JavaScript. Możesz też skorzystać z jednej z <a href="%{apps_path}">natywnych aplikacji</a> obsługującej Twoje urządzenie.
   existing_username_validator:
     not_found: nie znaleziono lokalnego użytkownika o tej nazwie
@@ -670,8 +812,10 @@ pl:
     add_new: Dodaj nowy
     errors:
       limit: Już przekroczyłeś(-aś) maksymalną liczbę wyróżnionych hashtagów
+    hint_html: "<strong>Czym są wyróżnione hashtagi?</strong> Są one na stałe wyświetlane na Twoim profilu i pozwalają innym na przeglądanie Twoich wpisów używających tych hashtagów. Są doskonałym narzędziem do śledzenia kreatywnej twórczości czy długoterminowych projektów."
   filters:
     contexts:
+      account: Profile
       home: Strona główna
       notifications: Powiadomienia
       public: Publiczne osie czasu
@@ -683,6 +827,7 @@ pl:
       invalid_irreversible: Nieodwracalne filtrowanie działa tylko na stronie głównej i w powiadomieniach
     index:
       delete: Usuń
+      empty: Nie masz żadnych filtrów.
       title: Filtry
     new:
       title: Dodaj nowy filtr
@@ -690,10 +835,13 @@ pl:
     developers: Dla programistów
     more: Więcej…
     resources: Zasoby
+    trending_now: Obecnie na czasie
   generic:
     all: Wszystkie
     changes_saved_msg: Ustawienia zapisane!
     copy: Kopiuj
+    delete: Usuń
+    no_batch_actions_available: Brak akcji wsadowych dostępnych na tej stronie
     order_by: Uporządkuj według
     save_changes: Zapisz zmiany
     validation_errors:
@@ -766,9 +914,38 @@ pl:
   media_attachments:
     validations:
       images_and_video: Nie możesz załączyć pliku wideo do wpisu, który zawiera już zdjęcia
+      not_ready: Nie można załączyć plików których przetwarzanie nie zostało ukończone. Spróbuj ponownie za chwilę!
       too_many: Nie możesz załączyć więcej niż 4 plików
   migrations:
     acct: nazwa@domena nowego konta
+    cancel: Anuluj przekierowanie
+    cancel_explanation: Anulowanie przekierowania aktywuje Twoje obecne konto ponownie, ale nie przeniesie z powrotem śledzących, których przeniesiono na tamto konto.
+    cancelled_msg: Pomyślnie anulowano przekierowanie.
+    errors:
+      already_moved: jest tym samym kontem, na które już się przeniosłeś(-aś)
+      missing_also_known_as: nie odwołuje się do tego konta
+      move_to_self: nie może być bieżącym kontem
+      not_found: nie mogło zostać odnalezione
+      on_cooldown: Nie możesz teraz przenieść konta
+    followers_count: Śledzący w chwili przenoszenia
+    incoming_migrations: Przenoszenie z innego konta
+    incoming_migrations_html: Aby przenieść się z innego konta na to, musisz najpierw <a href="%{path}">utworzyć alias konta</a>.
+    moved_msg: Twoje konto przekierowuje teraz na %{acct}, a śledzący są przenoszeni.
+    not_redirecting: Twoje konto nie przekierowuje obecnie na żadne inne konto.
+    on_cooldown: Ostatnio przeniosłeś(-aś) swoje konto. Ta funkcja będzie dostępna ponownie za %{count} dni.
+    past_migrations: Poprzednie migracje
+    proceed_with_move: Przenieś obserwujących
+    redirecting_to: Twoje konto przekierowuje na %{acct}.
+    set_redirect: Ustaw przekierowanie
+    warning:
+      backreference_required: Nowe konto musi wcześniej zostać skonfigurowane tak, aby odwoływało się do tego
+      before: 'Zanim kontynuujesz, przeczytaj uważnie te uwagi:'
+      cooldown: Po przeniesieniu się, istnieje okres przez który nie możesz ponownie się przenieść
+      disabled_account: Twoje obecne konto nie będzie później całkowicie użyteczne. Możesz jednak uzyskać dostęp do eksportu danych i ponownie aktywować je.
+      followers: To działanie przeniesie wszystkich Twoich śledzących z obecnego konta na nowe
+      only_redirect_html: Możesz też <a href="%{path}">po prostu skonfigurować przekierowanie na swój profil</a>.
+      other_data: Żadne inne dane nie zostaną automatycznie przeniesione
+      redirect: Twoje obecne konto zostanie uaktualnione o informację o przeniesieniu i wyłączone z wyszukiwania
   moderation:
     title: Moderacja
   notification_mailer:
@@ -809,6 +986,10 @@ pl:
       body: 'Twój wpis został podbity przez %{name}:'
       subject: Twój wpis został podbity przez %{name}
       title: Nowe podbicie
+  notifications:
+    email_events: 'Powiadamiaj e-mailem o:'
+    email_events_hint: 'Wybierz wydarzenia, o których chcesz otrzymywać powiadomienia:'
+    other_settings: Inne ustawienia powiadomień
   number:
     human:
       decimal_units:
@@ -832,6 +1013,7 @@ pl:
       duration_too_long: jest zbyt odległa
       duration_too_short: jest zbyt bliska
       expired: To głosowanie już zakończyło się
+      invalid_choice: Wybrana opcja głosowania nie istnieje
       over_character_limit: nie może zawierać więcej niż %{max} znaków
       too_few_options: musi zawierać przynajmniej dwie opcje
       too_many_options: nie może zawierać więcej niż %{max} opcji
@@ -839,9 +1021,16 @@ pl:
     other: Pozostałe
     posting_defaults: Domyślne ustawienia wpisów
     public_timelines: Publiczne osie czasu
+  reactions:
+    errors:
+      limit_reached: Przekroczono limit różnych reakcji
+      unrecognized_emoji: nie jest znanym emoji
   relationships:
     activity: Aktywność konta
     dormant: Uśpione
+    followers: Śledzący
+    following: Śledzeni
+    invited: Zaproszeni
     last_active: Ostatnia aktywność
     most_recent: Ostatnie
     moved: Przeniesione
@@ -917,6 +1106,7 @@ pl:
   settings:
     account: Konto
     account_settings: Ustawienia konta
+    aliases: Aliasy konta
     appearance: Wygląd
     authorized_apps: Uwierzytelnione aplikacje
     back: Powrót do Mastodona
@@ -934,6 +1124,8 @@ pl:
     profile: Profil
     relationships: Śledzeni i śledzący
     two_factor_authentication: Uwierzytelnianie dwuetapowe
+  spam_check:
+    spam_detected: To zgłoszenie jest automatyczne. Został wykryty spam.
   statuses:
     attached:
       description: 'Załączono: %{attached}'
@@ -954,6 +1146,8 @@ pl:
       many: 'zawiera niedozwolone hashtagi: %{tags}'
       one: 'zawiera niedozwolony hashtag: %{tags}'
       other: 'zawiera niedozwolone hashtagi: %{tags}'
+    errors:
+      in_reply_not_found: Post, na który próbujesz odpowiedzieć, nie istnieje.
     language_detection: Automatycznie wykrywaj język
     open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
@@ -963,6 +1157,11 @@ pl:
       private: Nie możesz przypiąć niepublicznego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
     poll:
+      total_people:
+        few: "%{count} osoby"
+        many: "%{count} osób"
+        one: "%{count} osoba"
+        other: "%{count} osoby"
       total_votes:
         few: "%{count} głosy"
         many: "%{count} głosy"
@@ -970,6 +1169,7 @@ pl:
         other: "%{count} głosy"
       vote: Głosuj
     show_more: Pokaż więcej
+    show_thread: Pokaż wątek
     sign_in_to_participate: Zaloguj się, aby udzielić się w tej konwersacji
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -983,6 +1183,8 @@ pl:
     pinned: Przypięty wpis
     reblogged: podbił
     sensitive_content: Wrażliwa zawartość
+  tags:
+    does_not_match_previous_name: nie pasuje do poprzedniej nazwy
   terms:
     body_html: |
       <h2>Polityka prywatności</h2>
@@ -1100,7 +1302,9 @@ pl:
         disable: Kiedy Twoje konto jest wyłączone, Twoje dane pozostają na serwerze, ale nie możesz wykonywać żadnych działań, zanim zostanie odblokowane.
         silence: Kiedy Twoje konto jest ograniczone, tylko osoby które je śledzą będą widzieć Twoje wpisy. Może ono też przestać być widoczne na publicznych listach. Inni wciąż mogą zacząć Cię śledzić.
         suspend: Twoje konto zostało zawieszone i wszystkie Twoje wpisy wraz z zawartością multimedialną zostały nieodwracalnie usunięte z tego serwera i serwerów, których użytkownicy śledzili Cię.
+      get_in_touch: Możesz odpowiedzieć na ten e-mail aby pozostać w kontakcie z prowadzącymi %{instance}.
       review_server_policies: Przejrzyj zasady serwera
+      statuses: 'Szczególnie dla:'
       subject:
         disable: Twoje konto %{acct} zostało wyłączone
         none: Ostrzeżenie dla %{acct}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index abea40130..45f2b22d1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -92,6 +92,7 @@ pt-BR:
       delete: Excluir
       destroyed_msg: Nota de moderação excluída com sucesso!
     accounts:
+      add_email_domain_block: Adicionar o domínio de email à lista negra
       approve: Aprovar
       approve_all: Aprovar tudo
       are_you_sure: Você tem certeza?
@@ -172,6 +173,7 @@ pt-BR:
         staff: Equipe
         user: Usuário
       search: Pesquisar
+      search_same_email_domain: Outros usuários com o mesmo domínio de e-mail
       search_same_ip: Outros usuários com o mesmo IP
       shared_inbox_url: Link da caixa de entrada compartilhada
       show:
@@ -193,21 +195,57 @@ pt-BR:
       web: Web
       whitelisted: Permitido
     action_logs:
+      action_types:
+        assigned_to_self_report: Adicionar relatório
+        change_email_user: Editar e-mail do usuário
+        confirm_user: Confirmar Usuário
+        create_account_warning: Criar Aviso
+        create_announcement: Criar Anúncio
+        create_custom_emoji: Criar Emoji Personalizado
+        create_domain_allow: Adicionar domínio permitido
+        create_domain_block: Adicionar domínio bloqueado
+        create_email_domain_block: Adicionar domínio de e-mail bloqueado
+        demote_user: Despromover Utilizador
+        destroy_announcement: Excluir anúncio
+        destroy_custom_emoji: Excluir emoji personalizado
+        destroy_domain_allow: Excluir domínio permitido
+        destroy_domain_block: Excluir domínio bloqueado
+        destroy_email_domain_block: Excluir domínio de e-mail bloqueado
+        destroy_status: Excluir Status
+        disable_2fa_user: Desativar autenticação de dois fatores
+        disable_custom_emoji: Desativar Emoji Personalizado
+        disable_user: Desativar usuário
+        enable_custom_emoji: Ativar Emoji Personalizado
+        enable_user: Ativar usuário
+        memorialize_account: Memorizar Conta
+        promote_user: Promover usuário
+        remove_avatar_user: Remover Avatar
+        reopen_report: Reabrir Relatório
+        reset_password_user: Redefinir a senha
+        resolve_report: Resolver Relatório
+        silence_account: Silenciar conta
+        suspend_account: Suspender Conta
+        unassigned_report: Remover relatório
+        unsilence_account: Deixar de Silenciar Conta
+        unsuspend_account: Retirar Suspensão à Conta
+        update_announcement: Editar anúncio
+        update_custom_emoji: Editar Emoji Personalizado
+        update_status: Editar Status
       actions:
         assigned_to_self_report: "%{name} pegou a denúncia %{target}"
         change_email_user: "%{name} alterou o endereço de e-mail do usuário %{target}"
         confirm_user: "%{name} confirmou o endereço de e-mail do usuário %{target}"
         create_account_warning: "%{name} enviou um aviso para %{target}"
-        create_announcement: "%{name} criou um novo anúncio %{target}"
+        create_announcement: "%{name} criou o novo anúncio %{target}"
         create_custom_emoji: "%{name} enviou o novo emoji %{target}"
         create_domain_allow: "%{name} permitiu %{target}"
-        create_domain_block: "%{name} bloqueou o domínio %{target}"
+        create_domain_block: "%{name} bloqueou %{target}"
         create_email_domain_block: "%{name} bloqueou o domínio de e-mail %{target}"
         demote_user: "%{name} rebaixou o usuário %{target}"
         destroy_announcement: "%{name} excluiu o anúncio %{target}"
         destroy_custom_emoji: "%{name} excluiu emoji %{target}"
         destroy_domain_allow: "%{name} bloqueou %{target}"
-        destroy_domain_block: "%{name} desbloqueou o domínio %{target}"
+        destroy_domain_block: "%{name} desbloqueou %{target}"
         destroy_email_domain_block: "%{name} permitiu domínio de e-mail %{target}"
         destroy_status: "%{name} excluiu toot de %{target}"
         disable_2fa_user: "%{name} desativou a exigência de autenticação de dois fatores para o usuário %{target}"
@@ -230,13 +268,16 @@ pt-BR:
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
         update_status: "%{name} atualizou o status de %{target}"
       deleted_status: "(status excluído)"
+      empty: Nenhum registro encontrado.
+      filter_by_action: Filtrar por ação
+      filter_by_user: Filtrar por usuário
       title: Auditar histórico
     announcements:
       destroyed_msg: Anúncio excluído com sucesso!
       edit:
         title: Editar anúncio
-      empty: Nenhum anúncio encontrado.
-      live: Em exibição
+      empty: Sem anúncios.
+      live: Ao vivo
       new:
         create: Criar anúncio
         title: Novo anúncio
@@ -244,7 +285,7 @@ pt-BR:
       scheduled_for: Agendado para %{time}
       scheduled_msg: Anúncio agendado para publicação!
       title: Anúncios
-      unpublished_msg: Anúncio retirado de exibição com sucesso!
+      unpublished_msg: Anúncio despublicado com sucesso!
       updated_msg: Anúncio atualizado com sucesso!
     custom_emojis:
       assign_category: Atribuir categoria
@@ -307,12 +348,12 @@ pt-BR:
       week_users_new: usuários essa semana
       whitelist_mode: Modo lista de permitidos
     domain_allows:
-      add_new: Permitir
+      add_new: Permitir domínio
       created_msg: Domínio foi permitido
       destroyed_msg: Domínio foi bloqueado
       undo: Bloquear
     domain_blocks:
-      add_new: Bloquear outro domínio
+      add_new: Novo bloqueio de domínio
       created_msg: Domínio está sendo bloqueado
       destroyed_msg: Domínio desbloqueado
       domain: Domínio
@@ -358,6 +399,7 @@ pt-BR:
       destroyed_msg: Domínio de e-mail desbloqueado
       domain: Domínio
       empty: Sem domínios de e-mail bloqueados.
+      from_html: de %{domain}
       new:
         create: Adicionar domínio
         title: Novo domínio de e-mail bloqueado
@@ -421,7 +463,7 @@ pt-BR:
           other: "%{count} denúncias"
       action_taken_by: Atitude tomada por
       are_you_sure: Você tem certeza?
-      assign_to_self: Acatado por mim
+      assign_to_self: Pegar
       assigned: Moderador responsável
       by_target_domain: Domínio da conta denunciada
       comment:
@@ -537,6 +579,9 @@ pt-BR:
       trends:
         desc_html: Mostrar publicamente hashtags previamente revisadas que estão em alta
         title: Hashtags em alta
+    site_uploads:
+      delete: Excluir arquivo enviado
+      destroyed_msg: Upload do site excluído com sucesso!
     statuses:
       back_to_account: Voltar para página da conta
       batch:
@@ -573,7 +618,6 @@ pt-BR:
     warning_presets:
       add_new: Adicionar novo
       delete: Excluir
-      edit: Editar
       edit_preset: Editar o aviso pré-definido
       title: Gerenciar os avisos pré-definidos
   admin_mailer:
@@ -585,7 +629,7 @@ pt-BR:
       body_remote: Alguém da instância %{domain} reportou %{target}
       subject: Nova denúncia sobre %{instance} (#%{id})
     new_trending_tag:
-      body: 'A hashtag #%{name} está em alta hoje, mas não foi previamente revisada. Ela não estará visível publicamente a menos que você aprove, ou apenas salve o formulário do jeito que está para nunca mais ouvir falar dela.'
+      body: 'A hashtag #%{name} está em alta hoje, mas não foi previamente revisada. Ela não estará visível publicamente a menos que você aprove, ou salve o formulário do jeito que está para nunca mais ouvir falar dela.'
       subject: Nova hashtag disponível para revisão em %{instance} (#%{name})
   aliases:
     add_new: Criar alias
@@ -661,6 +705,7 @@ pt-BR:
     trouble_logging_in: Problemas para entrar?
   authorize_follow:
     already_following: Você já segue
+    already_requested: Você já enviou uma solicitação para seguir esta conta
     error: Infelizmente, ocorreu um erro ao buscar a conta remota
     follow: Seguir
     follow_request: 'Você mandou uma solicitação para seguir para:'
@@ -677,7 +722,7 @@ pt-BR:
     prompt: Confirme sua senha para continuar
   date:
     formats:
-      default: "%d %b %Y"
+      default: "%d %b, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -774,12 +819,12 @@ pt-BR:
     developers: Desenvolvedores
     more: Mais…
     resources: Recursos
-    trending_now: Em alta agora
+    trending_now: Em alta no momento
   generic:
     all: Tudo
     changes_saved_msg: Alterações foram salvas com sucesso!
     copy: Copiar
-    delete: Eliminar
+    delete: Excluir
     no_batch_actions_available: Nenhuma ação em lote disponível nesta página
     order_by: Ordenar por
     save_changes: Salvar alterações
@@ -849,6 +894,7 @@ pt-BR:
   media_attachments:
     validations:
       images_and_video: Não foi possível anexar um vídeo a um toot que já contém imagens
+      not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não foi possível anexar mais de 4 imagens
   migrations:
     acct: Mudou-se para
@@ -1070,6 +1116,8 @@ pt-BR:
     disallowed_hashtags:
       one: 'continha hashtag não permitida: %{tags}'
       other: 'continha hashtags não permitidas: %{tags}'
+    errors:
+      in_reply_not_found: O toot que você quer responder parece não existir.
     language_detection: Detectar idioma automaticamente
     open_in_web: Abrir no navegador
     over_character_limit: limite de caracteres de %{max} excedido
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 477c9d3a3..7bff3bf5c 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -92,6 +92,7 @@ pt-PT:
       delete: Eliminar
       destroyed_msg: Nota de moderação excluída com sucesso!
     accounts:
+      add_email_domain_block: Adicione o domínio de email à lista negra
       approve: Aprovar
       approve_all: Aprovar todos
       are_you_sure: Tens a certeza?
@@ -132,7 +133,7 @@ pt-PT:
         remote: Remoto
         title: Local
       login_status: Estado de início de sessão
-      media_attachments: Media anexa
+      media_attachments: Anexos de média
       memorialize: Converter em memorial
       moderation:
         active: Activo
@@ -172,6 +173,7 @@ pt-PT:
         staff: Equipa
         user: Utilizador
       search: Pesquisar
+      search_same_email_domain: Outros utilizadores com o mesmo domínio de email
       search_same_ip: Outros utilizadores com o mesmo IP
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
@@ -193,6 +195,42 @@ pt-PT:
       web: Web
       whitelisted: Está na lista branca
     action_logs:
+      action_types:
+        assigned_to_self_report: Atribuir Relatório
+        change_email_user: Alterar E-mail do Utilizador
+        confirm_user: Confirmar Utilizador
+        create_account_warning: Criar Aviso
+        create_announcement: Criar Anúncio
+        create_custom_emoji: Criar Emoji Personalizado
+        create_domain_allow: Criar Permissão de Domínio
+        create_domain_block: Criar Bloqueio de Domínio
+        create_email_domain_block: Criar Bloqueio de Domínio de E-mail
+        demote_user: Despromover Utilizador
+        destroy_announcement: Remover Anúncio
+        destroy_custom_emoji: Remover Emoji Personalizado
+        destroy_domain_allow: Remover Permissão de Domínio
+        destroy_domain_block: Remover Bloqueio de Domínio
+        destroy_email_domain_block: Remover Bloqueio de Domínio de E-mail
+        destroy_status: Remover Estado
+        disable_2fa_user: Desativar 2FA
+        disable_custom_emoji: Desativar Emoji Personalizado
+        disable_user: Desativar Utilizador
+        enable_custom_emoji: Ativar Emoji Personalizado
+        enable_user: Ativar Utilizador
+        memorialize_account: Memorizar Conta
+        promote_user: Promover Utilizador
+        remove_avatar_user: Remover Imagem de Perfil
+        reopen_report: Reabrir Relatório
+        reset_password_user: Repor Password
+        resolve_report: Resolver Relatório
+        silence_account: Silenciar Conta
+        suspend_account: Suspender Conta
+        unassigned_report: Desatribuir Relatório
+        unsilence_account: Deixar de Silenciar Conta
+        unsuspend_account: Retirar Suspensão à Conta
+        update_announcement: Atualizar Anúncio
+        update_custom_emoji: Atualizar Emoji Personalizado
+        update_status: Atualizar Estado
       actions:
         assigned_to_self_report: "%{name} atribuiu o relatório %{target} a si próprios"
         change_email_user: "%{name} alterou o endereço de e-mail do utilizador %{target}"
@@ -230,6 +268,9 @@ pt-PT:
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
         update_status: "%{name} atualizou o estado de %{target}"
       deleted_status: "(apagou a publicação)"
+      empty: Não foram encontrados registos.
+      filter_by_action: Filtrar por ação
+      filter_by_user: Filtrar por utilizador
       title: Registo de auditoria
     announcements:
       destroyed_msg: Anúncio excluído com sucesso!
@@ -322,7 +363,7 @@ pt-PT:
         create: Criar bloqueio
         hint: O bloqueio de dominio não vai previnir a criação de entradas na base de dados, mas irá retroativamente e automaticamente aplicar métodos de moderação específica nessas contas.
         severity:
-          desc_html: "<strong>Silenciar</strong> irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. <strong>Supender</strong> irá eliminar todo o conteúdo guardado dessa conta, media e informação de perfil.Usa <strong>Nenhum</strong> se  apenas desejas rejeitar arquivos de media."
+          desc_html: "<strong>Silenciar</strong> irá fazer com que as publicações dessa conta sejam invisíveis para quem não a segue. <strong>Supender</strong> irá eliminar todo o conteúdo guardado dessa conta, média e informação de perfil. Use <strong>Nenhum</strong> se apenas deseja rejeitar arquivos de média."
           noop: Nenhum
           silence: Silenciar
           suspend: Suspender
@@ -331,11 +372,11 @@ pt-PT:
       private_comment_hint: Comentário sobre essa limitação de domínio para uso interno pelos moderadores.
       public_comment: Comentário público
       public_comment_hint: Comentário sobre essa limitação de domínio para o público geral, se ativada a divulgação da lista de limitações de domínio.
-      reject_media: Rejeitar ficheiros de media
-      reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão
+      reject_media: Rejeitar ficheiros de média
+      reject_media_hint: Remove arquivos de média armazenados localmente e rejeita descarregar novos arquivos no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar relatórios
       reject_reports_hint: Ignorar todos os relatórios vindos deste domínio. Irrelevantes para efectuar suspensões
-      rejecting_media: a rejeitar ficheiros de media
+      rejecting_media: a rejeitar ficheiros de média
       rejecting_reports: a rejeitar relatórios
       severity:
         silence: silenciado
@@ -345,7 +386,7 @@ pt-PT:
           one: Uma conta na base de dados afectada
           other: "%{count} contas na base de dados afectadas"
         retroactive:
-          silence: Não silenciar todas as contas existentes nesse domínio
+          silence: Não silenciar contas afetadas existentes deste domínio
           suspend: Não suspender todas as contas existentes nesse domínio
         title: Remover o bloqueio de domínio de %{domain}
         undo: Anular
@@ -358,6 +399,7 @@ pt-PT:
       destroyed_msg: Bloqueio de domínio de email excluído com sucesso
       domain: Domínio
       empty: Nenhum domínio de e-mail atualmente na lista negra.
+      from_html: de %{domain}
       new:
         create: Adicionar domínio
         title: Novo bloqueio de domínio de email
@@ -379,7 +421,7 @@ pt-PT:
       total_followed_by_them: Seguidas por eles
       total_followed_by_us: Seguidas por nós
       total_reported: Relatórios sobre eles
-      total_storage: Anexos de media
+      total_storage: Anexos de média
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -395,7 +437,7 @@ pt-PT:
     relays:
       add_new: Adicionar novo repetidor
       delete: Apagar
-      description_html: Um <strong>repetidor da federação</strong> é um servidor intermediário que troca grandes volumes de publicações públicas entre servidores que o subscrevem e publicam. <strong>Ele pode ajudar pequenos e médios servidores a descobrir conteúdo do "fediverse"</strong>que, de outro modo, exigiria que os utilizadores locais seguissem manualmente outras pessoas em servidores remotos.
+      description_html: Um <strong>repetidor da federação</strong> é um servidor intermediário que troca grandes volumes de publicações públicas entre servidores que o subscrevem e publicam. <strong>Ele pode ajudar pequenos e médios servidores a descobrir conteúdo do "fediverse"</strong> que, de outro modo, exigiria que os utilizadores locais seguissem manualmente outras pessoas em servidores remotos.
       disable: Desactivar
       disabled: Desactivado
       enable: Activar
@@ -481,8 +523,8 @@ pt-PT:
         desc_html: Nomes de domínio que esta instância encontrou no fediverso
         title: Publicar lista de instâncias descobertas
       preview_sensitive_media:
-        desc_html: Previsualização de links noutros websites irá apresentar uma miniatura, mesmo que a media seja marcada como sensível
-        title: Mostrar media sensível em previsualizações OpenGraph
+        desc_html: A pre-visualização de links noutros sites irá apresentar uma miniatura, mesmo que a média seja marcada como sensível
+        title: Mostrar média sensível em pre-visualizações OpenGraph
       profile_directory:
         desc_html: Permite aos utilizadores serem descobertos
         title: Ativar directório do perfil
@@ -537,6 +579,9 @@ pt-PT:
       trends:
         desc_html: Exibir publicamente hashtags atualmente em destaque que já tenham sido revistas anteriormente
         title: Hashtags em destaque
+    site_uploads:
+      delete: Excluir arquivo carregado
+      destroyed_msg: Upload do site excluído com sucesso!
     statuses:
       back_to_account: Voltar para página da conta
       batch:
@@ -550,7 +595,7 @@ pt-PT:
       no_media: Não há média
       no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado
       title: Estado das contas
-      with_media: Com media
+      with_media: Com média
     tags:
       accounts_today: Usos únicos hoje
       accounts_week: Usos únicos desta semana
@@ -573,7 +618,6 @@ pt-PT:
     warning_presets:
       add_new: Adicionar novo
       delete: Apagar
-      edit: Editar
       edit_preset: Editar o aviso predefinido
       title: Gerir os avisos predefinidos
   admin_mailer:
@@ -661,6 +705,7 @@ pt-PT:
     trouble_logging_in: Problemas em iniciar sessão?
   authorize_follow:
     already_following: Tu já estás a seguir esta conta
+    already_requested: Já enviou anteriormente um pedido para seguir esta conta
     error: Infelizmente, ocorreu um erro ao buscar a conta remota
     follow: Seguir
     follow_request: 'Enviaste uma solicitação de seguidor para:'
@@ -737,7 +782,7 @@ pt-PT:
     archive_takeout:
       date: Data
       download: Descarregar o teu arquivo
-      hint_html: Podes pedir um arquivo das tuas <strong> publicações e ficheiros de media carregados</strong>. Os dados do ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer software compatível. Tu podes pedir um arquivo destes a cada 7 dias.
+      hint_html: Pode pedir um arquivo das suas <strong>publicações e ficheiros de média carregados</strong>. Os dados no ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer software compatível. Pode solicitar um arquivo a cada 7 dias.
       in_progress: A compilar o seu arquivo...
       request: Pede o teu arquivo
       size: Tamanho
@@ -849,6 +894,7 @@ pt-PT:
   media_attachments:
     validations:
       images_and_video: Não é possível anexar um vídeo a uma publicação que já contém imagens
+      not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não é possível anexar mais de 4 arquivos
   migrations:
     acct: username@domain da nova conta
@@ -1070,6 +1116,8 @@ pt-PT:
     disallowed_hashtags:
       one: 'continha uma hashtag proibida: %{tags}'
       other: 'continha as hashtags proibidas: %{tags}'
+    errors:
+      in_reply_not_found: A publicação a que está a tentar responder parece não existir.
     language_detection: Detectar automaticamente a língua
     open_in_web: Abrir no browser
     over_character_limit: limite de caracter excedeu %{max}
@@ -1109,9 +1157,9 @@ pt-PT:
       <h3 id="collect">Que informação nós recolhemos?</h3>
 
       <ul>
-      <li><em>Informação básica da conta</em>: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de e-mail e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.</li>
-      <li><em>Publicações, seguimento e outra informação pública</em>: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos multimédia, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A acção de republicar ou favoritar outra publicação é sempre pública.</li>
-      <li><em>Publicações directas e exclusivas para seguidores</em>: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações directas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objectivo.  Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes activar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. <em>Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-la</em>e que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. <em>Não partilhes qualquer informação perigosa no Mastodon.</em></li>
+      <li><em>Informação básica da conta</em>: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de email e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.</li>
+      <li><em>Publicações, seguimento e outra informação pública</em>: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos média, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A ação de republicar ou favoritar outra publicação é sempre pública.</li>
+      <li><em>Publicações diretas e exclusivas para seguidores</em>: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações diretas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objetivo. Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes ativar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. <em>Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-la</em> e que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. <em>Não partilhes qualquer informação perigosa no Mastodon.</em></li>
       <li><em>IPs e outros metadados</em>: Quando inicias sessão, nós guardamos o endereço de IP a partir do qual iniciaste a sessão, tal como o nome do teu navegador. Todas as sessões estão disponíveis para verificação e revogação nas configurações. O último endereço de IP usado é guardado até 12 meses. Nós também podemos guardar registos de servidor, os quais incluem o endereço de IP de cada pedido dirigido ao nosso servidor.</li>
       </ul>
 
@@ -1140,7 +1188,7 @@ pt-PT:
       <p>Nós envidaremos todos os esforços no sentido de:</p>
 
       <ul>
-      <li>Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este  servidor, considerando que estes registos não serão guardados por mais de 90 dias.</li>
+      <li>Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este servidor, considerando que estes registos não serão guardados por mais de 90 dias.</li>
       <li>Guardar os endereços de IP associados aos utilizadores registados durante um período que não ultrapassará os 12 meses.</li>
       </ul>
 
@@ -1246,7 +1294,7 @@ pt-PT:
       subject: Bem-vindo ao Mastodon
       tip_federated_timeline: A cronologia federativa é uma visão global da rede Mastodon. Mas só inclui pessoas que os teus vizinhos subscrevem, por isso não é uma visão completa.
       tip_following: Tu segues o(s) administrador(es) do teu servidor por defeito. Para encontrares mais pessoas interessantes, procura nas cronologias local e federativa.
-      tip_local_timeline: A cronologia local é uma visão global das pessoas em %{instance}. Estes são os teus vizinhos próximos!
+      tip_local_timeline: A cronologia local é uma visão global das pessoas em %{instance}. Estes são os teus vizinhos mais próximos!
       tip_mobile_webapp: Se o teu navegador móvel te oferecer a possibilidade de adicionar o Mastodon ao teu homescreen, tu podes receber notificações push. Ele age como uma aplicação nativa de vários modos!
       tips: Dicas
       title: Bem-vindo a bordo, %{name}!
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6196ac3eb..30f237780 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -100,6 +100,7 @@ ru:
       delete: Удалить
       destroyed_msg: Заметка модератора успешно удалена!
     accounts:
+      add_email_domain_block: Добавить домен электронной почты в чёрный список
       approve: Подтвердить
       approve_all: Подтвердить все
       are_you_sure: Вы уверены?
@@ -180,6 +181,7 @@ ru:
         staff: Персонал
         user: Пользователь
       search: Поиск
+      search_same_email_domain: Другие пользователи с тем же доменом электронной почты
       search_same_ip: Другие пользователи с таким же IP
       shared_inbox_url: URL общих входящих
       show:
@@ -201,6 +203,39 @@ ru:
       web: Веб
       whitelisted: В белом списке
     action_logs:
+      action_types:
+        assigned_to_self_report: Присвоение жалоб
+        change_email_user: Изменение e-mail пользователей
+        confirm_user: Подтверждение пользователей
+        create_account_warning: Выдача предупреждения
+        create_announcement: Создание объявлений
+        create_custom_emoji: Добавление эмодзи
+        create_domain_block: Блокировка доменов
+        create_email_domain_block: Блокировка e-mail доменов
+        demote_user: Разжалование пользователей
+        destroy_announcement: Удаление объявлений
+        destroy_custom_emoji: Удаление эмодзи
+        destroy_domain_block: Разблокировка доменов
+        destroy_email_domain_block: Разблокировка e-mail доменов
+        destroy_status: Удаление постов
+        disable_2fa_user: Отключение 2FA
+        disable_custom_emoji: Отключение эмодзи
+        disable_user: Заморозка пользователей
+        enable_custom_emoji: Включение эмодзи
+        enable_user: Разморозка пользователей
+        promote_user: Повышение пользователей
+        remove_avatar_user: Удаление аватаров
+        reopen_report: Возобновление жалоб
+        reset_password_user: Сброс пароля пользователей
+        resolve_report: Отметка жалоб «решёнными»
+        silence_account: Скрытие пользователей
+        suspend_account: Блокировка пользователей
+        unassigned_report: Снятие жалоб
+        unsilence_account: Отмена скрытия пользователей
+        unsuspend_account: Разблокировка пользователей
+        update_announcement: Обновление объявлений
+        update_custom_emoji: Обновление эмодзи
+        update_status: Изменение постов
       actions:
         assigned_to_self_report: "%{name} назначил(а) себя для решения жалобы %{target}"
         change_email_user: "%{name} сменил(а) e-mail пользователя %{target}"
@@ -218,7 +253,7 @@ ru:
         destroy_domain_block: "%{name} разблокировал(а) домен %{target}"
         destroy_email_domain_block: "%{name} добавил(а) e-mail домен %{target} в белый список"
         destroy_status: "%{name} удалил(а) пост пользователя %{target}"
-        disable_2fa_user: "%{name} отключил(а) двухэтапную авторизацию у пользователя %{target}"
+        disable_2fa_user: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
         disable_custom_emoji: "%{name} отключил(а) эмодзи %{target}"
         disable_user: "%{name} заморозил(а) пользователя %{target}"
         enable_custom_emoji: "%{name} включил(а) эмодзи %{target}"
@@ -238,6 +273,9 @@ ru:
         update_custom_emoji: "%{name} обновил(а) эмодзи %{target}"
         update_status: "%{name} изменил(а) пост пользователя %{target}"
       deleted_status: "(удалённый пост)"
+      empty: Журнал пуст.
+      filter_by_action: Фильтр по действию
+      filter_by_user: Фильтр по пользователю
       title: Журнал событий
     announcements:
       destroyed_msg: Объявление удалено.
@@ -373,6 +411,7 @@ ru:
       destroyed_msg: Домен убран из списка e-mail блокировки
       domain: Домен
       empty: Никакие e-mail домены не блокируются.
+      from_html: с %{domain}
       new:
         create: Создать блокировку
         title: Новая блокировка по домену
@@ -381,9 +420,9 @@ ru:
       by_domain: Домен
       delivery_available: Доставка возможна
       known_accounts:
-        few: "%{count} известных учётных записей"
+        few: "%{count} известные учётные записи"
         many: "%{count} известных учётных записей"
-        one: "%{count} известных учётных записей"
+        one: "%{count} известная учётная запись"
         other: "%{count} известных учётных записей"
       moderation:
         all: Все
@@ -434,12 +473,12 @@ ru:
           few: "%{count} заметки"
           many: "%{count} заметок"
           one: "%{count} заметка"
-          other: "%{count} заметки"
+          other: "%{count} заметок"
         reports:
           few: "%{count} жалобы"
           many: "%{count} жалоб"
           one: "%{count} жалоба"
-          other: "%{count} жалобы"
+          other: "%{count} жалоб"
       action_taken_by: 'Действие предпринято:'
       are_you_sure: Вы уверены?
       assign_to_self: Назначить себе
@@ -558,6 +597,9 @@ ru:
       trends:
         desc_html: Публично отобразить проверенные хэштеги, актуальные на данный момент
         title: Популярные хэштеги
+    site_uploads:
+      delete: Удалить загруженный файл
+      destroyed_msg: Файл успешно удалён.
     statuses:
       back_to_account: Назад к учётной записи
       batch:
@@ -594,7 +636,6 @@ ru:
     warning_presets:
       add_new: Добавить
       delete: Удалить
-      edit: Изменить
       edit_preset: Удалить шаблон предупреждения
       title: Управление шаблонами предупреждений
   admin_mailer:
@@ -678,16 +719,17 @@ ru:
       confirming: Ожидание подтверждения e-mail.
       functional: Ваша учётная запись в полном порядке.
       pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
-      redirecting_to: Ваша учётная запись признана неактивным, потому что она перенаправляется на %{acct}.
+      redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
     trouble_logging_in: Не удаётся войти?
   authorize_follow:
     already_following: Вы уже подписаны на эту учётную запись
+    already_requested: Вы уже отправили запрос на подписку на эту учётную запись
     error: К сожалению, при поиске удалённой учётной записи возникла ошибка
     follow: Подписаться
     follow_request: 'Вы отправили запрос на подписку:'
-    following: 'Ура! Теперь Вы подписаны на:'
+    following: 'Готово! Вы подписались на:'
     post_follow:
-      close: Или просто закрыть это окно.
+      close: Или просто закройте это окно.
       return: Вернуться к профилю пользователя
       web: Открыть в веб-версии
     title: Подписаться на %{acct}
@@ -723,7 +765,7 @@ ru:
       before: 'Внимательно прочитайте следующую информацию перед началом:'
       caches: Некоторые данные, обработанные другими узлами, однако, могут храниться ещё какое-то время
       data_removal: Все ваши золотые посты, шикарный профиль и прочие данные будут безвозвратно уничтожены
-      email_change_html: <a href="%{path}">Поменять свой e-mail</a> можно не удаляя учётной записи
+      email_change_html: <a href="%{path}">Поменять свой e-mail</a> можно не удаляя учётную запись
       email_contact_html: Если письмо не приходит, обратитесь за помощю на <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Если вы не получили письмо с подтверждением, его можно <a href="%{path}">запросить ещё раз</a>
       irreversible: После удаления восстановить или повторно активировать учётную запись не получится
@@ -874,6 +916,7 @@ ru:
   media_attachments:
     validations:
       images_and_video: Нельзя добавить видео к посту с изображениями
+      not_ready: Не удаётся прикрепить файлы, обработка которых не завершена. Повторите попытку чуть позже!
       too_many: Нельзя добавить более 4 файлов
   migrations:
     acct: имя@домен новой учётной записи
@@ -924,8 +967,8 @@ ru:
         other: "%{count} новых уведомлений с вашего последнего захода \U0001F418"
       title: В ваше отсутствие…
     favourite:
-      body: "%{name} добавил ваш пост в избранное:"
-      subject: "%{name} добавил ваш пост в избранное"
+      body: "%{name} добавил(а) ваш пост в избранное:"
+      subject: "%{name} добавил(а) ваш пост в избранное"
       title: Понравившийся статус
     follow:
       body: "%{name} теперь подписан(а) на вас!"
@@ -939,7 +982,7 @@ ru:
     mention:
       action: Ответить
       body: 'Вас упомянул(а) %{name} в:'
-      subject: Вы были упомянуты %{name}
+      subject: "%{name} упомянул(а) вас"
       title: Новое упоминание
     reblog:
       body: 'Ваш пост был продвинут %{name}:'
@@ -1010,7 +1053,7 @@ ru:
   remote_interaction:
     favourite:
       proceed: Добавить в избранное
-      prompt: 'Вы собираетесь поставить отметку "нравится" этому посту:'
+      prompt: 'Вы собираетесь добавить в избранное следующий пост:'
     reblog:
       proceed: Продвинуть пост
       prompt: 'Вы хотите продвинуть этот пост:'
@@ -1105,6 +1148,8 @@ ru:
       many: 'содержались запрещённые хэштеги: %{tags}'
       one: 'содержался запрещённый хэштег: %{tags}'
       other: 'содержались запрещённые хэштеги: %{tags}'
+    errors:
+      in_reply_not_found: Пост, на который вы пытаетесь ответить, не существует или удалён.
     language_detection: Определять язык автоматически
     open_in_web: Открыть в веб-версии
     over_character_limit: превышен лимит символов (%{max})
@@ -1115,7 +1160,7 @@ ru:
       reblog: Нельзя закрепить продвинутый пост
     poll:
       total_people:
-        few: "%{count} человек"
+        few: "%{count} человека"
         many: "%{count} человек"
         one: "%{count} человек"
         other: "%{count} человек"
@@ -1239,7 +1284,7 @@ ru:
     generate_recovery_codes: Сгенерировать коды восстановления
     instructions_html: "<strong>Отсканируйте этот QR-код с помощью Google Authenticator, Яндекс.Ключа или любого другого подобного приложения</strong>. После сканирования и добавления, приложение начнёт генерировать коды, которые потребуется вводить для завершения входа в учётную запись."
     lost_recovery_codes: Коды восстановления позволяются войти в учётную запись в случае утери смартфона. Если вы потеряли свои коды восстановления, вы можете создать новые здесь. Прошлые коды работать перестанут.
-    manual_instructions: 'Если Вы не можете отсканировать QR-код и хотите ввести его вручную, секрет представлен здесь открытым текстом:'
+    manual_instructions: 'Если отсканировать QR-код не получается или не представляется возможным, вы можете ввести его вручную:'
     recovery_codes: Коды восстановления
     recovery_codes_regenerated: Коды восстановления успешно сгенерированы
     recovery_instructions_html: 'Пожалуйста, сохраните коды ниже в надёжном месте: они понадобятся, чтобы войти в учётную запись, если вы потеряете доступ к своему смартфону. Вы можете вручную переписать их, распечатать и спрятать среди важных документов или, например, в любимой книжке. <strong>Каждый код действителен один раз</strong>.'
@@ -1260,8 +1305,8 @@ ru:
       statuses: 'В частности, для:'
       subject:
         disable: Ваша учётная запись %{acct} заморожена
-        none: "%{acct}, вам вынесено предупреждение"
-        silence: На вашу учётную запись, %{acct}, были наложены ограничения
+        none: "%{acct} вынесено предупреждение"
+        silence: На учётную запись %{acct} наложены ограничения
         suspend: Ваша учётная запись %{acct} была заблокирована
       title:
         disable: Учётная запись заморожена
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 52933da12..a4a77e20f 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -8,6 +8,7 @@ ar:
         acct: ادخِل عنون الحساب username@domain الذي تودّ الإنتقال إليه
       account_warning_preset:
         text: بإمكانك استخدام نفس القواعد التي نجدها في التبويقات كعناوين الروابط والوسوم والإشارات
+        title: اختياري. غير مرئي للمُستَلِم
       admin_account_action:
         send_email_notification: سوف يتلقى المستخدم رسالة تُفسِّر ما حدث على حسابه
         type_html: اختر ما تود إجراؤه على <strong>%{acct}</strong>
@@ -70,6 +71,7 @@ ar:
         acct: مُعرّف الحساب الجديد
       account_warning_preset:
         text: نموذج نصي
+        title: العنوان
       admin_account_action:
         include_statuses: أدرج التبويقات التي تم الإبلاغ عنها ضمن الرسالة الإلكترونية
         send_email_notification: إشعار المستخدِم عبر البريد الإلكتروني
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 39cfa32c4..1a62eb76b 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -28,6 +28,8 @@ ast:
         fields:
           name: Etiqueta
           value: Conteníu
+      account_warning_preset:
+        title: Títulu
       admin_account_action:
         type: Aición
         types:
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index c7677c850..b67db471f 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -1 +1,23 @@
+---
 br:
+  simple_form:
+    labels:
+      account_warning_preset:
+        title: Titl
+      announcement:
+        text: Kemenn
+      defaults:
+        display_name: Anv diskouezet
+        header: Talbenn
+        locale: Yezh ar c'hetal
+        new_password: Ger-tremen nevez
+        password: Ger-tremen
+        setting_display_media_default: Dre ziouer
+        setting_display_media_hide_all: Kuzhat pep tra
+        setting_display_media_show_all: Diskouez pep tra
+      tag:
+        name: Ger-klik
+    'no': Ket
+    required:
+      mark: "*"
+    'yes': Ya
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index e91b74f85..f912e2e9e 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -8,6 +8,7 @@ ca:
         acct: Especifica l'usuari@domini del compte al que et vols moure
       account_warning_preset:
         text: Pots utilitzar totes les sintaxi com ara URL, etiquetes i mencions
+        title: Opcional. No és visible per al destinatari
       admin_account_action:
         include_statuses: L'usuari veurà quins tuts han causat l'acció de moderació o avís
         send_email_notification: L'usuari rebrà una explicació del que ha passat amb el seu compte
@@ -53,6 +54,9 @@ ca:
         whole_word: Quan la paraula clau o la frase sigui només alfanumèrica, s'aplicarà si coincideix amb la paraula sencera
       domain_allow:
         domain: Aquest domini podrà obtenir dades d’aquest servidor i les dades entrants d’aquests seran processades i emmagatzemades
+      email_domain_block:
+        domain: Això pot ser el nom del domini que es veu en l’adreça de correu electrònic, el registre MX al que resol el domini o l’IP del servidor al que resol el registre MX. Es comprovaran amb el registre d’usuari i es rebutjarà la inscripció.
+        with_dns_records: Es procurarà resoldre els registres DNS del domini determinat i els resultats també es llistaran a la llista negra
       featured_tag:
         name: 'És possible que vulguis utilitzar un d''aquests:'
       form_challenge:
@@ -78,6 +82,7 @@ ca:
         acct: Nom del nou compte
       account_warning_preset:
         text: Text predefinit
+        title: Títol
       admin_account_action:
         include_statuses: Inclou tuts reportats en el correu electrònic
         send_email_notification: Notifica l'usuari per correu electrònic
@@ -150,6 +155,8 @@ ca:
         username: Nom d'usuari
         username_or_email: Nom d'usuari o adreça electrònica
         whole_word: Paraula sencera
+      email_domain_block:
+        with_dns_records: Incloure registres MX i IP del domini
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index f4737069b..9ea83a6e7 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -8,6 +8,7 @@ co:
         acct: Entrate u cugnome@duminiu di u contu induve vulete traslucà
       account_warning_preset:
         text: Pudete utilizà a sintassa di i statuti, per esempiu l'URL, hashtag, minzione
+        title: In uzzione. Micca visibile per u distinatariu
       admin_account_action:
         include_statuses: L'utilizatore viderà i statuti rispunsevuli di l'azzione o l'avertimentu di muderazione
         send_email_notification: L'utilizatore hà da riceve una spiegazione di cio chì hè accadutu à u so contu
@@ -53,6 +54,9 @@ co:
         whole_word: Quandu a parolla o a frasa sana hè alfanumerica, sarà applicata solu s'ella currisponde à a parolla sana
       domain_allow:
         domain: Stu duminiu puderà ricuperà i dati di stu servore è i dati ch'affaccanu da quallà saranu trattati è cunservati
+      email_domain_block:
+        domain: Pò esse u duminiu affissatu nant'à l'indirizzu e-mail, l'intrata MX assuciata à u duminiu, o l'IP di u servore assuciatu à l'intrata MX. Quessi anu da esse verificati durante l'arregistramente di l'utilizatore, chì sarà righjittatu.
+        with_dns_records: Un tintativu di cunsultà i dati DNS di u duminiu sarà fattu, è i risultati saranu ancu messi nant'à a lista nera
       featured_tag:
         name: 'Pudete vulè utilizà unu di quelli:'
       form_challenge:
@@ -78,6 +82,7 @@ co:
         acct: Cugnome di u novu contu
       account_warning_preset:
         text: Testu preselezziunatu
+        title: Titulu
       admin_account_action:
         include_statuses: Inchjude i statuti palisati indè l'e-mail
         send_email_notification: Nutificà l'utilizatore cù un'e-mail
@@ -150,6 +155,8 @@ co:
         username: Cugnome
         username_or_email: Cugnome o Email
         whole_word: Parolla sana
+      email_domain_block:
+        with_dns_records: Inchjude intrate MX è indirizze IP di u duminiu
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 19aca7334..d8e272c8b 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -8,6 +8,7 @@ cy:
         acct: Rhowch enwdefnyddiwr@parth y cyfrif rydych chi am symud iddo
       account_warning_preset:
         text: Gallwch defnyddio cystrawen tŵt, fel URLs, hashnodau a sôniadau
+        title: Yn ddewisiol. Ddim yn weladwy i'r derbynydd
       admin_account_action:
         include_statuses: Bydd y defnyddiwr yn gweld pa tŵtiau sydd wedi achosi'r weithred gymedroli neu'r rhybudd
         send_email_notification: Bydd y defnyddiwr yn derbyn esboniad o beth digwyddodd gyda'i cyfrif
@@ -78,6 +79,7 @@ cy:
         acct: Enw'r cyfrif newydd
       account_warning_preset:
         text: Testun rhagosodedig
+        title: Teitl
       admin_account_action:
         include_statuses: Cynhwyswch tŵtiau yr adroddwyd amdanynt yn yr e-bost
         send_email_notification: Hysbysu'r defnyddiwr trwy e-bost
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 0863cc4a8..02d8ffbaa 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -8,6 +8,7 @@ de:
         acct: Gib den benutzernamen@domain des Kontos an, zu dem du umziehen möchtest
       account_warning_preset:
         text: Du kannst Beitragssyntax benutzen, wie z.B. URLs, Hashtags und Erwähnungen
+        title: Optional. Für den Empfänger nicht sichtbar
       admin_account_action:
         include_statuses: Der Benutzer wird sehen, welche Beiträge diese Maßnahme verursacht haben
         send_email_notification: Benutzer_in wird Bescheid gegeben, was mit dem Konto geschehen ist
@@ -43,7 +44,7 @@ de:
         setting_default_sensitive: Heikle Medien werden erst nach einem Klick sichtbar
         setting_display_media_default: Verstecke Medien, die als sensibel markiert sind
         setting_display_media_hide_all: Alle Medien immer verstecken
-        setting_display_media_show_all: Medien, die als sensibel markiert sind, immer anzeigen
+        setting_display_media_show_all: Alle Medien immer anzeigen
         setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
         setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
         setting_show_application: Die Anwendung die du nutzst wird in der detaillierten Ansicht deiner Beiträge angezeigt
@@ -53,6 +54,9 @@ de:
         whole_word: Wenn das Schlagwort nur aus Buchstaben und Zahlen besteht, wird es nur angewendet, wenn es dem ganzen Wort entspricht
       domain_allow:
         domain: Diese Domain kann Daten von diesem Server abrufen und eingehende Daten werden verarbeitet und gespeichert
+      email_domain_block:
+        domain: Dies kann der Domainname sein, der in der E-Mail-Adresse angezeigt wird, den MX-Datensatz, der aufgelöst wird oder die IP des Servers, auf dem der MX-Eintrag aufgelöst wird. Diese werden bei der Registrierung überprüft und die Registrierung wird abgelehnt.
+        with_dns_records: Ein Versuch die DNS-Einträge der Domain aufzulösen wurde unternommen und diese Ergebnisse werden unter anderem auch geblacklistet
       featured_tag:
         name: 'Du möchtest vielleicht einen von diesen benutzen:'
       form_challenge:
@@ -78,6 +82,7 @@ de:
         acct: Adresse des neuen Kontos
       account_warning_preset:
         text: Vorlagentext
+        title: Titel
       admin_account_action:
         include_statuses: Meldungen der E-Mail beifügen
         send_email_notification: Benachrichtige den Nutzer per E-Mail
@@ -150,6 +155,8 @@ de:
         username: Profilname
         username_or_email: Profilname oder E-Mail
         whole_word: Ganzes Wort
+      email_domain_block:
+        with_dns_records: MX-Einträge und IPs der Domain einbeziehen
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 231c32959..bb9033085 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -7,7 +7,8 @@ el:
       account_migration:
         acct: Όρισε το username@domain του λογαριασμού στον οποίο θέλεις να μετακινηθείς
       account_warning_preset:
-        text: Μπορείς να χρησιμοποιήσεις το ίδιο συντακτικό των τουτ όπως URL, ταμπέλες και αναφορές
+        text: Μπορείς να χρησιμοποιήσεις το ίδιο συντακτικό των τουτ όπως URL, ετικέτες και αναφορές
+        title: Προαιρετικό. Δεν εμφανίζεται στον παραλήπτη
       admin_account_action:
         include_statuses: Ο χρήστης θα δει ποια τουτ προκάλεσαν την προειδοποίηση ή την ενέργεια των διαχειριστών
         send_email_notification: Ο χρήστης θα λάβει μια εξήγηση του τι συνέβη με τον λογαριασμό του
@@ -70,7 +71,7 @@ el:
     labels:
       account:
         fields:
-          name: Ταμπέλα
+          name: Περιγραφή
           value: Περιεχόμενο
       account_alias:
         acct: Διακριτικό του παλιού λογαριασμού
@@ -78,6 +79,7 @@ el:
         acct: Διακριτικό του νέου λογαριασμού
       account_warning_preset:
         text: Προκαθορισμένο κείμενο
+        title: Τίτλος
       admin_account_action:
         include_statuses: Συμπερίληψη των καταγγελλομένων τουτ στο email
         send_email_notification: Ενημέρωση χρήστη μέσω email
@@ -150,8 +152,10 @@ el:
         username: Όνομα χρηστη
         username_or_email: Όνομα ή διεύθυνση email χρήστη
         whole_word: Ολόκληρη λέξη
+      email_domain_block:
+        with_dns_records: Συμπερίληψη εγγραφών MX και διευθύνσεων IP του τομέα
       featured_tag:
-        name: Ταμπέλα
+        name: Ετικέτα
       interactions:
         must_be_follower: Μπλόκαρε τις ειδοποιήσεις από όσους δεν σε ακολουθούν
         must_be_following: Μπλόκαρε τις ειδοποιήσεις από όσους δεν ακολουθείς
@@ -169,12 +173,12 @@ el:
         pending_account: Αποστολή email όταν υπάρχει νέος λογαριασμός για επιθεώρηση
         reblog: Αποστολή email όταν κάποιος προωθεί τη δημοσίευση σου
         report: Αποστολή email όταν υποβάλλεται νέα καταγγελία
-        trending_tag: Αποστολή email όταν μια μη-εγκεκριμένη ταμπέλα γίνεται δημοφιλής
+        trending_tag: Αποστολή email όταν μια μη-εγκεκριμένη ετικέτα γίνεται δημοφιλής
       tag:
-        listable: Εμφάνιση αυτής της ταμπέλας στο δημόσιο κατάλογο
-        name: Ταμπέλα
-        trendable: Εμφάνιση της ταμπέλας στις τάσεις
-        usable: Χρήση της ταμπέλας σε τουτ
+        listable: Εμφάνιση αυτής της ετικέτας στο δημόσιο κατάλογο
+        name: Ετικέτα
+        trendable: Εμφάνιση της ετικέτας στις τάσεις
+        usable: Χρήση της ετικέτας σε τουτ
     'no': Όχι
     recommended: Προτείνεται
     required:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 37d5a82f5..fd56a35bf 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -8,6 +8,7 @@ en:
         acct: Specify the username@domain of the account you want to move to
       account_warning_preset:
         text: You can use toot syntax, such as URLs, hashtags and mentions
+        title: Optional. Not visible to the recipient
       admin_account_action:
         include_statuses: The user will see which toots have caused the moderation action or warning
         send_email_notification: The user will receive an explanation of what happened with their account
@@ -42,8 +43,8 @@ en:
         setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
-        setting_display_media_hide_all: Always hide all media
-        setting_display_media_show_all: Always show media marked as sensitive
+        setting_display_media_hide_all: Always hide media
+        setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will not be shown on your profile
         setting_noindex: Affects your public profile and status pages
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
@@ -53,6 +54,9 @@ en:
         whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       domain_allow:
         domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
+      email_domain_block:
+        domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
+        with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted
       featured_tag:
         name: 'You might want to use one of these:'
       form_challenge:
@@ -78,6 +82,7 @@ en:
         acct: Handle of the new account
       account_warning_preset:
         text: Preset text
+        title: Title
       admin_account_action:
         include_statuses: Include reported toots in the e-mail
         send_email_notification: Notify the user per e-mail
@@ -150,6 +155,8 @@ en:
         username: Username
         username_or_email: Username or Email
         whole_word: Whole word
+      email_domain_block:
+        with_dns_records: Include MX records and IPs of the domain
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index ee7ec769a..3bd77a8e8 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -35,6 +35,7 @@ eo:
         setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo
         setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn
         setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj mesaĝoj
+        setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
         username: Via uzantnomo estos unika ĉe %{domain}
         whole_word: Kiam la vorto aŭ frazo estas nur litera aŭ cifera, ĝi estos uzata nur se ĝi kongruas kun la tuta vorto
       featured_tag:
@@ -105,7 +106,8 @@ eo:
         setting_advanced_layout: Ebligi altnivelan retpaĝan interfacon
         setting_aggregate_reblogs: Grupigi diskonigojn en tempolinioj
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
-        setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi
+        setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi mesaĝon
+        setting_crop_images: Stuci bildojn en negrandigitaj mesaĝoj al 16x9
         setting_default_language: Publikada lingvo
         setting_default_privacy: Mesaĝa videbleco
         setting_default_sensitive: Ĉiam marki aŭdovidaĵojn tiklaj
@@ -114,7 +116,7 @@ eo:
         setting_display_media_default: Dekomenca
         setting_display_media_hide_all: Kaŝi ĉiujn
         setting_display_media_show_all: Montri ĉiujn
-        setting_expand_spoilers: Ĉiam grandigi mesaĝojn markitajn per avertoj pri enhavo
+        setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
         setting_noindex: Ellistiĝi de retserĉila indeksado
         setting_reduce_motion: Malrapidigi animaciojn
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 78bb3e275..ad35135e4 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -8,6 +8,7 @@ es-AR:
         acct: Especificá el nombredeusuario@dominio de la cuenta a la que querés mudarte
       account_warning_preset:
         text: Podés usar sintaxis de toots, como direcciones web, etiquetas y menciones
+        title: Opcional. No visible para el destinatario
       admin_account_action:
         include_statuses: El usuario verá qué toots causaron la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que sucedió con su cuenta
@@ -53,6 +54,9 @@ es-AR:
         whole_word: Cuando la palabra clave o frase es sólo alfanumérica, sólo será aplicado si coincide con toda la palabra
       domain_allow:
         domain: Este dominio podrá recolectar datos de este servidor, y los datos entrantes serán procesados y archivados
+      email_domain_block:
+        domain: Puede ser el nombre de dominio que aparece en la dirección de correo electrónico, el registro MX hacia el cual resuelve el dominio, o la dirección IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del registro del usuario, y el registro será rechazado.
+        with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en la lista de desaprobados
       featured_tag:
         name: 'Puede que quieras usar una de estas:'
       form_challenge:
@@ -78,6 +82,7 @@ es-AR:
         acct: Alias de la cuenta nueva
       account_warning_preset:
         text: Texto predefinido
+        title: Título
       admin_account_action:
         include_statuses: Incluir en el correo electrónico a los toots denunciados
         send_email_notification: Notificar al usuario por correo electrónico
@@ -150,6 +155,8 @@ es-AR:
         username: Nombre de usuario
         username_or_email: Nombre de usuario o correo electrónico
         whole_word: Palabra entera
+      email_domain_block:
+        with_dns_records: Incluir los registros MX y las direcciones IP del dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 745de3332..b114b1424 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -8,6 +8,7 @@ es:
         acct: Especifique el nombre de usuario@dominio de la cuenta a la cual se desea migrar
       account_warning_preset:
         text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
+        title: Opcional. No visible para el destinatario
       admin_account_action:
         include_statuses: El usuario verá qué toots han causado la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
@@ -53,6 +54,9 @@ es:
         whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra
       domain_allow:
         domain: Este dominio podrá obtener datos de este servidor y los datos entrantes serán procesados y archivados
+      email_domain_block:
+        domain: Puede ser el nombre de dominio que aparece en la dirección de correo, el registro MX hacia el cual resuelve el dominio, o la IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del alta del usuario y el alta se rechazará.
+        with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en lista negra
       featured_tag:
         name: 'Puede que quieras usar uno de estos:'
       form_challenge:
@@ -78,6 +82,7 @@ es:
         acct: Maneja la cuenta nueva
       account_warning_preset:
         text: Texto predefinido
+        title: Título
       admin_account_action:
         include_statuses: Incluir en el correo electrónico a los toots denunciados
         send_email_notification: Notificar al usuario por correo electrónico
@@ -150,6 +155,8 @@ es:
         username: Nombre de usuario
         username_or_email: Usuario o Email
         whole_word: Toda la palabra
+      email_domain_block:
+        with_dns_records: Incluye los registros MX y las IP del dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 9e45fb032..c0f36df77 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -8,8 +8,9 @@ eu:
         acct: Zehaztu migrazioaren xede den kontuaren erabiltzaile@domeinua
       account_warning_preset:
         text: Toot sintaxia erabili dezakezu, URLak, traolak eta aipamenak
+        title: Aukerakoa. Hartzaileak ez du ikusiko
       admin_account_action:
-        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten toot-ak ikusi ahal izango ditu
+        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten tootak ikusi ahal izango ditu
         send_email_notification: Erabiltzaileak bere kontuarekin gertatutakoaren azalpen bat jasoko du
         text_html: Aukerakoa. Toot sintaxia erabili dezakezu. <a href="%{path}">Abisu aurre-ezarpenak</a> gehitu ditzakezu denbora aurrezteko
         type_html: Erabaki zer egin <strong>%{acct}</strong> kontuarekin
@@ -19,7 +20,7 @@ eu:
         ends_at: Aukerakoa. Iragapena une honetan automatikoki desargitaratuko da
         scheduled_at: Laga hutsik iragarpena berehala argitaratzeko
         starts_at: Aukerakoa. Zure iragarpena denbora-tarte batera lotuta dagoenerako
-        text: Toot-etako sintaxia erabili dezakezu. Kontuan izan iragarpenak erabiltzailearen pantailan hartuko duen neurria
+        text: Tootetako sintaxia erabili dezakezu. Kontuan izan iragarpenak erabiltzailearen pantailan hartuko duen neurria
       defaults:
         autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
         avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
@@ -33,19 +34,19 @@ eu:
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
-        irreversible: Iragazitako Toot-ak betirako galduko dira, geroago iragazkia kentzen baduzu ere
+        irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
         locked: Jarraitzaileak eskuz onartu behar dituzu
         password: Erabili 8 karaktere gutxienez
         phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe
         scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar.
-        setting_aggregate_reblogs: Ez erakutsi bultzada berriak berriki bultzada jaso duten toot-entzat (berriki jasotako bultzadei eragiten die bakarrik)
+        setting_aggregate_reblogs: Ez erakutsi bultzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die bakarrik)
         setting_default_sensitive: Multimedia hunkigarria lehenetsita ezkutatzen da, eta sakatuz ikusi daiteke
         setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
         setting_display_media_hide_all: Ezkutatu multimedia guztia beti
         setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
         setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
-        setting_noindex: Zure profil publiko eta Toot-en orrietan eragina du
+        setting_noindex: Zure profil publiko eta tooten orrietan eragina du
         setting_show_application: Tootak bidaltzeko erabiltzen duzun aplikazioa zure tooten ikuspegi xehetsuan bistaratuko da
         setting_use_blurhash: Gradienteak ezkutatutakoaren koloreetan oinarritzen dira, baina xehetasunak ezkutatzen dituzte
         setting_use_pending_items: Ezkutatu denbora-lerroko eguneraketak klik baten atzean jarioa automatikoki korritu ordez
@@ -53,6 +54,9 @@ eu:
         whole_word: Hitz eta esaldi gakoa alfanumerikoa denean, hitz osoarekin bat datorrenean besterik ez da aplikatuko
       domain_allow:
         domain: Domeinu honek zerbitzari honetatik datuak hartu ahal izango ditu eta bertatik jasotako informazioa prozesatu eta gordeko da
+      email_domain_block:
+        domain: Hau e-mail helbidean agertzen den domeinua izan daiteke, honen MX erregistroa, edo MX erregistroaren IP helbidea. Hauek erabiltzaileak izena ematean egiaztatuko dira eta atzera botako da.
+        with_dns_records: Emandako domeinuaren DNS erregistroak ebazteko saiakera bat egingo da eta emaitzak ere zerrenda beltzean sartuko dira
       featured_tag:
         name: 'Hauetakoren bat erabili zenezake:'
       form_challenge:
@@ -66,7 +70,7 @@ eu:
       tag:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
-        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden toot-ak besterik ez dira erakutsiko
+        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden tootak besterik ez dira erakutsiko
     labels:
       account:
         fields:
@@ -78,8 +82,9 @@ eu:
         acct: Kontu berriaren helbidea
       account_warning_preset:
         text: Aurrez ezarritako testua
+        title: Izenburua
       admin_account_action:
-        include_statuses: Txertatu salatutako toot-ak e-mailean
+        include_statuses: Txertatu salatutako tootak e-mailean
         send_email_notification: Jakinarazi erabiltzaileari e-mail bidez
         text: Abisu pertsonalizatua
         type: Ekintza
@@ -125,7 +130,7 @@ eu:
         setting_aggregate_reblogs: Taldekatu bultzadak denbora-lerroetan
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
-        setting_crop_images: Moztu irudiak hedatu gabeko toot-etan 16x9 proportzioan
+        setting_crop_images: Moztu irudiak hedatu gabeko tootetan 16x9 proportzioan
         setting_default_language: Argitalpenen hizkuntza
         setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
@@ -150,6 +155,8 @@ eu:
         username: Erabiltzaile-izena
         username_or_email: Erabiltzaile-izena edo e-mail helbidea
         whole_word: Hitz osoa
+      email_domain_block:
+        with_dns_records: Sartu ere domeinuaren MX erregistroak eta IPak
       featured_tag:
         name: Traola
       interactions:
@@ -174,7 +181,7 @@ eu:
         listable: Baimendu traola hau bilaketetan agertzea eta profilen direktorioan
         name: Traola
         trendable: Baimendu traola hau joeretan agertzea
-        usable: Baimendu toot-ek traola hau erabiltzea
+        usable: Baimendu tootek traola hau erabiltzea
     'no': Ez
     recommended: Aholkatua
     required:
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 0001efaf5..dea53ddbb 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -8,6 +8,7 @@ fa:
         acct: نشانی username@domain را برای حسابی که می‌خواهید به آن منتقل شوید بنویسید
       account_warning_preset:
         text: می‌توانید مانند بوق‌های معمولی کاربران دیگر را نام ببرید یا پیوند و برچسب بگذارید
+        title: اختیاری. برای گیرنده قابل مشاهده نیست
       admin_account_action:
         include_statuses: این کاربر خواهد دید که کدام بوق او موجب اقدام مدیریتی یا هشدار شده است
         send_email_notification: توضیحی که کاربر می‌بینید که برای حسابش چه رخ داده است
@@ -24,7 +25,7 @@ fa:
         autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد
         avatar: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         bot: این حساب بیشتر به طور خودکار فعالیت می‌کند و نظارت پیوسته‌ای روی آن وجود ندارد
-        context: یک یا چند زمینه که فیلتر باید در آن‌ها اعمال شود
+        context: یک یا چند زمینه که پالایه باید در آن‌ها اعمال شود
         current_password: به دلایل امنیتی لطفاً رمز این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
@@ -33,7 +34,7 @@ fa:
         fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
-        irreversible: بوق‌های فیلترشده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتی اگر فیلتر را بعداً بردارید
+        irreversible: بوق‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
         locale: زبان محیط کاربری، ایمیل‌ها، و اعلان‌ها
         locked: باید پیگیران تازه را خودتان تأیید کنید
         password: دست‌کم باید ۸ نویسه داشته باشد
@@ -53,6 +54,9 @@ fa:
         whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا می‌شود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه
       domain_allow:
         domain: این دامین خواهد توانست داده‌ها از این سرور را دریافت کند و داده‌های از این دامین در این‌جا پردازش و ذخیره خواهند شد
+      email_domain_block:
+        domain: می‌تواند نام دامنه که در نشانی رایانامه ظاهر می‌شود، رکورد MX که دامنه به آن resolve می‌شود یا IP کارسازی که رکورد MX به آن resolve می‌شود باشد. این موارد هنگام ثبت‌نام کاربر بررسی شده و ثبت‌نام رد می‌شود.
+        with_dns_records: تلاشی برای resolve کردن رکوردهای ساناد دامنهٔ داده‌شده انجام شده و نتیجه نیز مسدود خواهد شد
       featured_tag:
         name: 'شاید بخواهید چنین چیزهایی را به کار ببرید:'
       form_challenge:
@@ -78,6 +82,7 @@ fa:
         acct: نشانی حساب تازه
       account_warning_preset:
         text: متن از پیش آماده‌شده
+        title: عنوان
       admin_account_action:
         include_statuses: بوق‌های گزارش‌شده را در ایمیل بگنجان
         send_email_notification: اطلاع‌رسانی به کاربر از راه ایمیل
@@ -102,7 +107,7 @@ fa:
         chosen_languages: جدا کردن زبان‌ها
         confirm_new_password: تأیید رمز تازه
         confirm_password: تأیید رمز
-        context: زمینه‌های فیلترکردن
+        context: زمینه‌های پالایش
         current_password: رمز فعلی
         data: داده‌ها
         discoverable: این حساب را در فهرست گزیدهٔ کاربران نشان بده
@@ -150,6 +155,8 @@ fa:
         username: نام کاربری (لاتین)
         username_or_email: نام کاربری یا ایمیل
         whole_word: تطابق واژهٔ کامل
+      email_domain_block:
+        with_dns_records: شامل رکوردهای MX و‌IPهای دامنه
       featured_tag:
         name: برچسب
       interactions:
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 0e5332f1e..77e91329a 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -8,6 +8,7 @@ fr:
         acct: Spécifiez le nom d’utilisateur@domaine du compte vers lequel vous souhaitez déménager
       account_warning_preset:
         text: Vous pouvez utiliser la syntaxe des pouets, comme les URLs, les hashtags et les mentions
+        title: Facultatif. Invisible pour le destinataire
       admin_account_action:
         include_statuses: L’utilisateur·rice verra quels sont les pouets qui ont provoqué l’action de modération ou l’avertissement
         send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
@@ -35,24 +36,27 @@ fr:
         inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
         irreversible: Les pouets filtrés disparaîtront irrémédiablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
-        locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es
+        locked: Vous devrez approuver chaque abonné·e et vos statuts ne s’afficheront qu’à vos abonné·e·s
         password: Utilisez au moins 8 caractères
-        phrase: Sera trouvé sans que la case ou l’avertissement de contenu du pouet soit pris en compte
+        phrase: Sera filtré sans que la casse ou l’avertissement sur le contenu du pouet soit pris en compte
         scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
         setting_aggregate_reblogs: Ne pas afficher de nouveaux partages pour les pouets qui ont été récemment partagés (n’affecte que les partages nouvellement reçus)
         setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic
         setting_display_media_default: Masquer les médias marqués comme sensibles
-        setting_display_media_hide_all: Toujours masquer tous les médias
+        setting_display_media_hide_all: Toujours cacher les médias
         setting_display_media_show_all: Toujours afficher les médias marqués comme sensibles
         setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
         setting_noindex: Affecte votre profil public ainsi que vos statuts
         setting_show_application: Le nom de l’application que vous utilisez afin d’envoyer des pouets sera affiché dans la vue détaillée de ceux-ci
-        setting_use_blurhash: Les dégradés sont basés sur les couleurs des visuels cachés mais ne divulgent pas les détails
-        setting_use_pending_items: Masquer les mises à jour chronologiques derrière un clic au lieu de les montrer automatiquement en faisant défiler le flux d'actualités
+        setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
+        setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
         username: Votre nom d’utilisateur sera unique sur %{domain}
-        whole_word: Lorsque le mot-clef ou la phrase-clef est uniquement alphanumérique, ça sera uniquement appliqué s’il correspond au mot entier
+        whole_word: Si le mot-clé ou la phrase est alphanumérique, alors le filtre ne sera appliqué que s’il correspond au mot entier
       domain_allow:
         domain: Ce domaine pourra récupérer des données de ce serveur et les données entrantes seront traitées et stockées
+      email_domain_block:
+        domain: Ceci peut être le nom de domaine qui apparaît dans le courriel, l’enregistrement MX que le domaine résout, ou l’IP du serveur auquel l’enregistrement MX résout. Celles-ci seront vérifiées lors de l’inscription de l’utilisateur et l’inscription sera rejetée.
+        with_dns_records: Une tentative de résolution des enregistrements DNS du domaine donné sera effectuée et les résultats seront également mis sur liste noire
       featured_tag:
         name: 'Vous pourriez vouloir utiliser l’un d’entre eux :'
       form_challenge:
@@ -78,6 +82,7 @@ fr:
         acct: L’identifiant du nouveau compte
       account_warning_preset:
         text: Texte de présélection
+        title: Titre
       admin_account_action:
         include_statuses: Inclure les pouets signalés dans le courriel
         send_email_notification: Notifier l’utilisateur par courriel
@@ -87,7 +92,7 @@ fr:
           disable: Désactiver
           none: Ne rien faire
           silence: Masquer
-          suspend: Suspendre et effacer les données du compte de manière irréversible
+          suspend: Suspendre et supprimer les données du compte de manière irréversible
         warning_preset_id: Utiliser un modèle d’avertissement
       announcement:
         all_day: Événement de toute la journée
@@ -112,7 +117,7 @@ fr:
         fields: Métadonnées du profil
         header: Image d’en-tête
         inbox_url: URL de la boîte de relais
-        irreversible: Supprimer plutôt que de cacher
+        irreversible: Supprimer plutôt que masquer
         locale: Langue de l’interface
         locked: Verrouiller le compte
         max_uses: Nombre maximum d’utilisations
@@ -122,10 +127,10 @@ fr:
         password: Mot de passe
         phrase: Mot-clé ou phrase
         setting_advanced_layout: Activer l’interface Web avancée
-        setting_aggregate_reblogs: Partages groupés dans les fils d’actualités
+        setting_aggregate_reblogs: Grouper les partages dans les fils d’actualités
         setting_auto_play_gif: Lire automatiquement les GIFs animés
-        setting_boost_modal: Afficher une fenêtre de confirmation avant de partager
-        setting_crop_images: Recadrer les images dans les pouets non-expansés à 16x9
+        setting_boost_modal: Afficher une fenêtre de confirmation avant de partager un pouet
+        setting_crop_images: Recadrer les images des pouets non-dépliés en 16x9
         setting_default_language: Langue de publication
         setting_default_privacy: Confidentialité des statuts
         setting_default_sensitive: Toujours marquer les médias comme sensibles
@@ -134,7 +139,7 @@ fr:
         setting_display_media_default: Défaut
         setting_display_media_hide_all: Masquer tout
         setting_display_media_show_all: Montrer tout
-        setting_expand_spoilers: Toujours développer les pouets marqués d’un avertissement de contenu
+        setting_expand_spoilers: Toujours déplier les pouets marqués d’un avertissement sur le contenu
         setting_hide_network: Cacher votre réseau
         setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
         setting_reduce_motion: Réduire la vitesse des animations
@@ -143,13 +148,15 @@ fr:
         setting_theme: Thème du site
         setting_trends: Afficher les tendances du jour
         setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte
-        setting_use_blurhash: Afficher les dégradés colorés pour les médias cachés
+        setting_use_blurhash: Afficher des dégradés colorés pour les médias cachés
         setting_use_pending_items: Mode lent
         severity: Sévérité
         type: Type d’import
         username: Identifiant
-        username_or_email: Nom d’utilisateur·ice ou courriel
+        username_or_email: Nom d’utilisateur·rice ou courriel
         whole_word: Mot entier
+      email_domain_block:
+        with_dns_records: Inclure les enregistrements MX et IP du domaine
       featured_tag:
         name: Hashtag
       interactions:
@@ -166,14 +173,14 @@ fr:
         follow: Envoyer un courriel lorsque quelqu’un me suit
         follow_request: Envoyer un courriel lorsque quelqu’un demande à me suivre
         mention: Envoyer un courriel lorsque quelqu’un me mentionne
-        pending_account: Envoyer un courriel lorsqu’un nouveau compte est en attente d’approbation
-        reblog: Quelqu’un a partagé votre statut
+        pending_account: Nouveau compte en attente d’approbation
+        reblog: Quelqu’un a partagé votre pouet
         report: Envoyer un courriel lorsqu’un nouveau rapport est soumis
-        trending_tag: Envoyer un e-mail quand un hashtag non contrôlé est en tendance actuelle
+        trending_tag: Un hashtag non approuvé est dans les tendances
       tag:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Hashtag
-        trendable: Autoriser ce hashtag à apparaître sous les tendances du jour
+        trendable: Autoriser ce hashtag à apparaitre dans les tendances
         usable: Autoriser les pouets à utiliser ce hashtag
     'no': Non
     recommended: Recommandé
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index d6768a17d..86d4bea5f 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -8,6 +8,7 @@ gl:
         acct: Indica o usuaria@servidor da conta a cal queres migrar
       account_warning_preset:
         text: Pódeslle dar formato ao toot, como URLs, etiquetas e mencións
+        title: Optativo. Non visible para a correspondente
       admin_account_action:
         include_statuses: A usuaria verá que toots causaron a acción da moderación ou aviso
         send_email_notification: A usuaria recibirá unha explicación sobre o que lle aconteceu a súa conta
@@ -53,6 +54,9 @@ gl:
         whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa
       domain_allow:
         domain: Este dominio estará en disposición de obter datos desde este servidor e datos de entrada a el poderán ser procesados e gardados
+      email_domain_block:
+        domain: Esto pode ser o nome de dominio que aparece no enderezo do correo, o rexistro MX que resolve o dominio, ou o IP do servidor que resolve o rexistro MX. Estos confrontaranse contra o rexistro da usuaria e o rexistro será rexeitado.
+        with_dns_records: Vaise facer un intento de resolver os rexistros DNS propocionados e os resultados tamén irán a lista negra
       featured_tag:
         name: 'Podería utilizar algunha de estas:'
       form_challenge:
@@ -78,6 +82,7 @@ gl:
         acct: Xestiona a nova conta
       account_warning_preset:
         text: Texto preestablecido
+        title: Título
       admin_account_action:
         include_statuses: Incluír toots reportados no correo
         send_email_notification: Notificar a usuaria por correo-e
@@ -150,6 +155,8 @@ gl:
         username: Nome de usuaria
         username_or_email: Nome de usuaria ou Correo-e
         whole_word: Palabra completa
+      email_domain_block:
+        with_dns_records: Incluír rexistros MX e IPs do dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index cee6bdb45..2063446f1 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -8,6 +8,7 @@ hu:
         acct: Add meg a fióknév@domain fiókot, melybe költözni szeretnél
       account_warning_preset:
         text: Használhatod a tülkökben szokásos szintaxist, URL-eket, hashtageket, megemlítéseket
+        title: Opcionális. Címzett számára nem látható
       admin_account_action:
         include_statuses: A felhasználó látni fogja, melyik tülk okozta a moderációt vagy figyelmeztetést
         send_email_notification: A felhasználó magyarázatot kap arra, mi történt a fiókjával
@@ -53,6 +54,9 @@ hu:
         whole_word: Ha a kulcsszó alfanumerikus, csak akkor minősül majd találatnak, ha teljes szóra illeszkedik
       domain_allow:
         domain: Ez a domain adatot kérhet le a szerverünkről és az ettől érkező adatokat feldolgozzuk és mentjük
+      email_domain_block:
+        domain: Lehet domain név, mely az email címben szerepel, MX rekord, amire a domain hivatkozik vagy a szerver IP címe, amire az MX rekord hivatkozik. Ezeket regisztrációkor ellenőrizzük és visszautasítjuk a regisztrációt, ha szükséges.
+        with_dns_records: Megpróbáljuk a megadott domain DNS rekordjait lekérni, és az eredményeket hozzáadjuk a tiltólistához
       featured_tag:
         name: 'Ezeket esetleg használhatod:'
       form_challenge:
@@ -78,6 +82,7 @@ hu:
         acct: Új fiók kezelése
       account_warning_preset:
         text: Figyelmeztető szöveg
+        title: Cím
       admin_account_action:
         include_statuses: Helyezd az e-mailbe a jelentett tülköket
         send_email_notification: Figyelmeztessük a felhasználót e-mailben
@@ -150,6 +155,8 @@ hu:
         username: Felhasználónév
         username_or_email: Felhasználónév vagy E-mail
         whole_word: Teljes szó
+      email_domain_block:
+        with_dns_records: Domain MX rekordjainak és IP címeinek hozzávétele
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index ada83fc86..1717d0722 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -8,6 +8,7 @@ id:
         acct: Tentukan namapengguna@domain akun yang ingin Anda pindah
       account_warning_preset:
         text: Anda dapat memakai sintaks toot, seperti URL, tagar, dan sebutan
+        title: Opsional. Tidak terlihat penerima
       admin_account_action:
         include_statuses: Pengguna dapat melihat toot mana yang menyebabkan aksi atau peringatan moderasi
         send_email_notification: Pengguna akan menerima penjelasan tentang apa yang terjadi pada akun mereka
@@ -53,6 +54,9 @@ id:
         whole_word: Ketika kata kunci/frasa hanya alfanumerik, maka itu hanya akan diterapkan jika cocok dengan semua kata
       domain_allow:
         domain: Domain ini dapat mengambil data dari server ini dan data yang diterima akan diproses dan disimpan
+      email_domain_block:
+        domain: Ini bisa nama domain yang muncul di alamat surel, data MX yang sedang diselesaikan oleh domain, atau IP server yang dipecahkan oleh data MX. Mereka akan dicek saat pendaftaran pengguna dan pendaftaran akan ditolak.
+        with_dns_records: Usaha untuk menyelesaikan data DNS domain yang diberikan akan dilakukan dan hasilnya akan masuk daftar hitam
       featured_tag:
         name: 'Anda mungkin ingin pakai salah satu dari ini:'
       form_challenge:
@@ -78,6 +82,7 @@ id:
         acct: Menangani akun baru
       account_warning_preset:
         text: Teks preset
+        title: Judul
       admin_account_action:
         include_statuses: Sertakan toot terlapor pada surel
         send_email_notification: Beritahu pengguna per surel
@@ -150,6 +155,8 @@ id:
         username: Nama pengguna
         username_or_email: Nama pengguna atau Surel
         whole_word: Seluruh kata
+      email_domain_block:
+        with_dns_records: Termasuk data MX dan IP domain
       featured_tag:
         name: Tagar
       interactions:
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 65041f19c..3275b15f7 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -8,6 +8,7 @@ is:
         acct: Tilgreindu notandanafn@lén á notandaaðgangnum sem þú vilt flytjast til
       account_warning_preset:
         text: Þú getur notað sömu skilgreiningar og fyrir tíst, svo sem URL-slóðir, myllumerki og tilvísanir
+        title: Valkvætt. Ekki sýnilegt viðtakandanum
       admin_account_action:
         include_statuses: Notandinn mun sjá hvaða tíst hafa valdið viðbrögðum umsjónarmanns eða aðvörun kerfisins
         send_email_notification: Notandinn mun fá útskýringar á því hvað gerðist með notandaaðganginn hans
@@ -53,6 +54,9 @@ is:
         whole_word: Þegar stikkorð eða frasi er einungis tölur og bókstafir, verður það aðeins notað ef það samsvarar heilu orði
       domain_allow:
         domain: Þetta lén mun geta sótt gögn af þessum vefþjóni og tekið verður á móti innsendum gögnum frá léninu til vinnslu og geymslu
+      email_domain_block:
+        domain: Þetta getur verið heiti lénsins sem birtist í tölvupóstfanginu, MX-færslan sem það lén beinist að, eða IP-vistfang netþjónsins sem sú MX-færsla beinist að. Þetta verður athugað um leið og notandi skráir sig, og verður þá skráningunni hafnað.
+        with_dns_records: Tilraun verður gerð til að leysa DNS-færslur uppgefins léns og munu niðurstöðurnar einnig verða útilokaðar
       featured_tag:
         name: 'Þú gætir viljað nota eitt af þessum:'
       form_challenge:
@@ -78,6 +82,7 @@ is:
         acct: Auðkenni nýja aðgangsins
       account_warning_preset:
         text: Forstilltur texti
+        title: Titill
       admin_account_action:
         include_statuses: Innifela kærð tíst í tölvupóstinum
         send_email_notification: Láta notanda vita með tölvupósti
@@ -150,6 +155,8 @@ is:
         username: Notandanafn
         username_or_email: Notandanafn eða tölvupóstfang
         whole_word: Heil orð
+      email_domain_block:
+        with_dns_records: Hafa með MX-færslur og IP-vistföng lénsins
       featured_tag:
         name: Myllumerki
       interactions:
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 35c4f80cf..61128bb38 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -8,6 +8,7 @@ it:
         acct: Indica il nomeutente@dominio dell'account al quale vuoi trasferirti
       account_warning_preset:
         text: Puoi usare la sintassi dei toot, come URL, hashtag e menzioni
+        title: Opzionale. Non visibile al destinatario
       admin_account_action:
         include_statuses: L'utente vedrà quali toot hanno causato l'azione di moderazione o l'avviso
         send_email_notification: L'utente riceverà una spiegazione di ciò che è successo con suo account
@@ -53,6 +54,9 @@ it:
         whole_word: Quando la parola chiave o la frase è solo alfanumerica, si applica solo se corrisponde alla parola intera
       domain_allow:
         domain: Questo dominio potrà recuperare i dati da questo server e i dati in arrivo da esso verranno elaborati e memorizzati
+      email_domain_block:
+        domain: Questo può essere il nome del dominio che fa parte dell'indirizzo email, il record MX a cui il dominio si risolve o l'indirizzo IP del server a cui il record MX si risolve. Saranno verificati alla registrazione da parte dell'utente e la sua iscrizione sarà respinta.
+        with_dns_records: Sarà effettuato un tentativo di risolvere i record DNS del dominio in questione e i risultati saranno inseriti anche nella blacklist
       featured_tag:
         name: 'Eccone alcuni che potresti usare:'
       form_challenge:
@@ -78,6 +82,7 @@ it:
         acct: Handle del nuovo account
       account_warning_preset:
         text: Testo preimpostato
+        title: Titolo
       admin_account_action:
         include_statuses: Includi i toots segnalati nell'email
         send_email_notification: Informa l'utente via email
@@ -150,12 +155,16 @@ it:
         username: Nome utente
         username_or_email: Nome utente o email
         whole_word: Parola intera
+      email_domain_block:
+        with_dns_records: Includi record MX e indirizzi IP del dominio
       featured_tag:
         name: Etichetta
       interactions:
         must_be_follower: Blocca notifiche da chi non ti segue
         must_be_following: Blocca notifiche dalle persone che non segui
         must_be_following_dm: Blocca i messaggi diretti dalle persone che non segui
+      invite:
+        comment: Commento
       invite_request:
         text: Perché vuoi iscriverti?
       notification_emails:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a56990d3b..1e25419cf 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -8,6 +8,7 @@ ja:
         acct: 引っ越し先のユーザー名@ドメインを指定してください
       account_warning_preset:
         text: URL、ハッシュタグ、メンションなど、投稿に用いる構文が使用できます
+        title: オプションです。受信者には表示されません。
       admin_account_action:
         include_statuses: ユーザーは取られた制限や警告の原因となったトゥートを確認できるようになります
         send_email_notification: ユーザーは自分のアカウントに何が起こったのか説明を受け取ります
@@ -42,8 +43,8 @@ ja:
         setting_aggregate_reblogs: 最近ブーストされたトゥートが新たにブーストされても表示しません (設定後受信したものにのみ影響)
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
-        setting_display_media_hide_all: 全てのメディアを常に隠す
-        setting_display_media_show_all: 閲覧注意としてマークされたメディアも常に表示する
+        setting_display_media_hide_all: メディアを常に隠す
+        setting_display_media_show_all: メディアを常に表示する
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります
@@ -53,6 +54,9 @@ ja:
         whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります
       domain_allow:
         domain: 登録するとこのサーバーからデータを受信したり、このドメインから受信するデータを処理して保存できるようになります
+      email_domain_block:
+        domain: メールアドレスのドメイン名および、名前解決したMXレコード、IPアドレスを指定できます。ユーザー登録時にこれらをチェックし、該当する場合はユーザー登録を拒否します。
+        with_dns_records: 指定したドメインの名前解決ができない場合、ブラックリストに登録されます
       featured_tag:
         name: 'これらを使うといいかもしれません:'
       form_challenge:
@@ -78,13 +82,14 @@ ja:
         acct: 引っ越し先のユーザー ID
       account_warning_preset:
         text: プリセット警告文
+        title: タイトル
       admin_account_action:
         include_statuses: 通報されたトゥートをメールに含める
         send_email_notification: メールでユーザーに通知
         text: カスタム警告文
         type: アクション
         types:
-          disable: 無効化
+          disable: ログインを無効化
           none: 何もしない
           silence: サイレンス
           suspend: 停止しアカウントのデータを恒久的に削除する
@@ -150,6 +155,8 @@ ja:
         username: ユーザー名
         username_or_email: ユーザー名またはメールアドレス
         whole_word: 単語全体にマッチ
+      email_domain_block:
+        with_dns_records: ドメインのMXレコードとIPアドレスを含む
       featured_tag:
         name: ハッシュタグ
       interactions:
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index db4369e92..c9936c49a 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -3,7 +3,7 @@ kab:
   simple_form:
     hints:
       account_alias:
-        acct: Specify the username@domain of the account you want to move from
+        acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
       account_migration:
         acct: Sekcem isem n umseqdac@taγult n umiḍan anida itebγiḍ ad gujjeḍ
       admin_account_action:
@@ -15,7 +15,11 @@ kab:
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
+        locked: Isra asentem s wufus n ineḍfaren
         password: Seqdec ma drus 8 n yisekkilen
+        setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
+        setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
+        setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
         setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaγnu-inek
         username: Isem-ik n umseqdac ad yili d ayiwen, ulac am netta deg %{domain}
       featured_tag:
@@ -25,12 +29,19 @@ kab:
     labels:
       account:
         fields:
+          name: Tabzimt
           value: Agbur
       account_migration:
         acct: Tansa n umiḍan amaynut
       admin_account_action:
+        send_email_notification: Sileɣ aseqdac s imaylen
+        type: Tigawt
         types:
+          disable: Sens anekcum
+          none: Ur teg kra
           silence: Sgugem
+      announcement:
+        ends_at: Tagara n tedyant
       defaults:
         bot: Wagi d amiḍan aṛubut
         chosen_languages: Sizdeg tutlayin
@@ -43,7 +54,10 @@ kab:
         email: Tansa imayl
         header: Ixef
         locale: Tutlayt n ugrudem
+        locked: Rgel amiḍan
+        max_uses: Amḍan afellay n iseqdacen
         new_password: Awal uffir amaynut
+        otp_attempt: Tangalt n snat n tarayin
         password: Awal uffir
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
@@ -52,6 +66,7 @@ kab:
         setting_display_media_show_all: Sken kullec
         setting_hide_network: Ffer azetta-k·m
         setting_theme: Asental n wesmel
+        setting_use_pending_items: Askar aleγwayan
         username: Isem n useqdac
         username_or_email: Isem n useqdac neγ imal
         whole_word: Awal akk
@@ -61,7 +76,10 @@ kab:
         comment: Awennit
       invite_request:
         text: Acimi tebγiḍ ad ternuḍ iman-ik?
+      tag:
+        name: Ahacṭag
     'no': Ala
+    recommended: Yettuwelleh
     required:
       mark: "*"
       text: ilaq
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 028aa59d9..0bf46b0ff 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -8,6 +8,7 @@ ko:
         acct: 이동하고자 하는 목적지 계정의 사용자이름@도메인을 설정하세요
       account_warning_preset:
         text: URL, 해시태그, 멘션과 같은 툿 문법을 사용할 수 있습니다
+        title: 선택사항. 수신자에게는 보이지 않습니다
       admin_account_action:
         include_statuses: 사용자는 어떤 툿에 대해 경고나 조치가 취해졌는지 볼 수 있게 됩니다
         send_email_notification: 유저는 어떤 일이 일어났는 지에 대한 설명을 받게 됩니다
@@ -53,6 +54,9 @@ ko:
         whole_word: 키워드가 영문과 숫자로만 이루어 진 경우, 단어 전체에 매칭 되었을 때에만 작동하게 합니다
       domain_allow:
         domain: 이 도메인은 이 서버에서 데이터를 가져갈 수 있고 이 도메인에서 보내진 데이터는 처리되고 저장 됩니다
+      email_domain_block:
+        domain: 이것은 이메일 주소에 보이는 도메인 네임이거나, 도메인이 향하는 MX 레코드이거나, 또는 MX 레코드가 향하는 IP 주소일 수 있습니다. 이것들은 사용자가 가입 할 때 확인 되며 가입은 반려될 것입니다.
+        with_dns_records: 입력한 도메인의 DNS를 조회를 시도하여 나온 값도 차단됩니다
       featured_tag:
         name: '이것들을 사용하면 좋을 것 같습니다:'
       form_challenge:
@@ -78,6 +82,7 @@ ko:
         acct: 새 계정의 핸들
       account_warning_preset:
         text: 프리셋 텍스트
+        title: 제목
       admin_account_action:
         include_statuses: 신고된 툿을 이메일에 포함
         send_email_notification: 이메일로 유저에게 알리기
@@ -150,6 +155,8 @@ ko:
         username: 유저 이름
         username_or_email: 유저네임 또는 이메일
         whole_word: 단어 전체에 매칭
+      email_domain_block:
+        with_dns_records: 도메인의 IP와 MX 레코드 값을 포함
       featured_tag:
         name: 해시태그
       interactions:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index ec6ba52eb..c65608d95 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -43,7 +43,7 @@ nl:
         setting_default_sensitive: Gevoelige media wordt standaard verborgen en kan met één klik worden getoond
         setting_display_media_default: Als gevoelig gemarkeerde media verbergen
         setting_display_media_hide_all: Media altijd verbergen
-        setting_display_media_show_all: Als gevoelig gemarkeerde media altijd verbergen
+        setting_display_media_show_all: Media altijd tonen
         setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
         setting_noindex: Heeft invloed op jouw openbare profiel en toots
         setting_show_application: De toepassing de je gebruikt om te tooten wordt in de gedetailleerde weergave van de toot getoond
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index b7495c56d..f1daa0e6e 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -8,6 +8,7 @@ oc:
         acct: Donatz l’utilizaire@domeni del compte ont volètz anar
       account_warning_preset:
         text: Podètz utilizar la sintaxi dels tuts, coma las URL, las etiquetas e las mencions
+        title: Opcional. Pas visible pel destinari
       admin_account_action:
         include_statuses: L’utilizaire veiràs quals tuts a provocat l’accion de moderacion o avertiment
         send_email_notification: L’utilizaire recebrà una explicacion de çò qu’arribèt a son compte
@@ -78,6 +79,7 @@ oc:
         acct: Identificant del nòu compte
       account_warning_preset:
         text: Tèxt predefinit
+        title: Títol
       admin_account_action:
         include_statuses: Inclure los tuts senhalats dins lo corrièl
         send_email_notification: Avisar l’utilizaire per corrièl
@@ -150,6 +152,8 @@ oc:
         username: Nom d’utilizaire
         username_or_email: Nom d’utilizaire o corrièl
         whole_word: Mot complèt
+      email_domain_block:
+        with_dns_records: Inclure los enregistraments MX e las IP del domeni
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index e8e2251b0..77d02cf17 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -2,19 +2,34 @@
 pl:
   simple_form:
     hints:
+      account_alias:
+        acct: Określ nazwę@domenę konta z którego chcesz się przenieść
+      account_migration:
+        acct: Określ nazwę@domenę konta na które chcesz się przenieść
       account_warning_preset:
         text: Możesz korzystać ze składni której używasz we wpisach, takiej jak adresy URL, hashtagi i wspomnienia
+        title: Nieobowiązkowe. Niewidoczne dla odbiorcy
       admin_account_action:
+        include_statuses: Użytkownik zobaczy, których wpisów dotyczyło działanie moderacji lub ostrzeżenie
         send_email_notification: Użytkownik otrzyma informację, co stało się z jego kontem
         text_html: Możesz używać składni której używasz we wpisach. Możesz <a href="%{path}">dodać szablon ostrzeżenia</a> aby zaoszczędzić czas
         type_html: Wybierz co chcesz zrobić z <strong>%{acct}</strong>
         warning_preset_id: Nieobowiązkowe. Możesz dodać niestandardowy tekst do końcowki szablonu
+      announcement:
+        all_day: Jeżeli zaznaczone, tylko daty z przedziału czasu będą wyświetlane
+        ends_at: Nieobowiązkowe. Ogłoszenie zostanie automatycznie wycofane w tym czasie
+        scheduled_at: Pozostaw puste, aby opublikować ogłoszenie natychmiastowo
+        starts_at: Nieobowiązkowe. Jeżeli ogłoszenie jest związane z danym przedziałem czasu
+        text: Możesz używać składni wpisu. Pamiętaj o tym, ile miejsca zajmie ogłoszenie na ekranie użytkownika
       defaults:
         autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić
         avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany
+        current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
+        current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
+        discoverable: Katalog profilu jest jednym ze sposobów, dzięki którym Twoje konto dotrze do szerszego grona
         email: Otrzymasz e-mail potwierdzający
         fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
         header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
@@ -34,8 +49,14 @@ pl:
         setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
         setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany
         setting_use_blurhash: Gradienty są oparte na kolorach ukrywanej zawartości, ale uniewidaczniają wszystkie szczegóły
+        setting_use_pending_items: Ukryj aktualizacje osi czasu za kliknięciem, zamiast automatycznego przewijania strumienia
         username: Twoja nazwa użytkownika będzie niepowtarzalna na %{domain}
         whole_word: Jeśli słowo lub fraza składa się jedynie z liter lub cyfr, filtr będzie zastosowany tylko do pełnych wystąpień
+      domain_allow:
+        domain: Ta domena będzie mogła pobierać dane z serwera, a dane przychodzące z niej będą przetwarzane i przechowywane
+      email_domain_block:
+        domain: Może to być nazwa domeny pojawiająca się w adresu e-mail, rekord MX na który rozwiązuje domena lub IP serwera na który rozwiązuje rekord MX. Będą one wykrywane i odrzucane przy rejestracji.
+        with_dns_records: Zostanie wykonana próba rozwiązania rekordów DNS podanej domeny, a wyniki również zostaną dodane na czarną listę
       featured_tag:
         name: 'Sugerujemy użycie jednego z następujących:'
       form_challenge:
@@ -61,6 +82,7 @@ pl:
         acct: Nazwa nowego konta
       account_warning_preset:
         text: Tekst szablonu
+        title: Tytuł
       admin_account_action:
         include_statuses: Uwzględniaj zgłoszone wpisy w wiadomości e-mail
         send_email_notification: Powiadom użytkownika mailem
@@ -133,6 +155,8 @@ pl:
         username: Nazwa użytkownika
         username_or_email: Nazwa użytkownika lub adres e-mail
         whole_word: Całe słowo
+      email_domain_block:
+        with_dns_records: Uwzględnij rekordy MX i adresy IP domeny
       featured_tag:
         name: Hasztag
       interactions:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 503b48d83..1f72f278d 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -8,6 +8,7 @@ pt-BR:
         acct: Especifique o usuário@domínio da conta para a qual você deseja se mudar
       account_warning_preset:
         text: Você pode usar a sintaxe do toot, como links, hashtags e menções
+        title: Opcional. Não visível para o destinatário
       admin_account_action:
         include_statuses: O usuário verá quais toots causaram o aviso ou ação da moderação
         send_email_notification: O usuário receberá uma explicação do que aconteceu com a própria conta
@@ -15,7 +16,7 @@ pt-BR:
         type_html: Decida o que fazer com <strong>%{acct}</strong>
         warning_preset_id: Opcional. Você ainda pode adicionar texto personalizado no final do aviso pré-definido
       announcement:
-        all_day: Quando marcado, apenas as datas do período serão exibidas
+        all_day: Quando marcada, apenas as datas do período serão mostradas
         ends_at: Opcional. O anúncio será automaticamente não publicado no momento
         scheduled_at: Deixe em branco para publicar o anúncio imediatamente
         starts_at: Opcional. Caso seu anúncio esteja vinculado a um período específico
@@ -53,6 +54,9 @@ pt-BR:
         whole_word: Quando a palavra-chave ou frase é inteiramente alfanumérica, ela será aplicada somente se corresponder a palavra inteira
       domain_allow:
         domain: Este domínio poderá obter dados deste servidor e os dados recebidos dele serão processados e armazenados
+      email_domain_block:
+        domain: Este pode ser o nome de domínio que aparece no endereço de email, o registro MX para o qual o domínio resolve, ou o IP do servidor para o qual o registro MX resolve. Estes serão verificados no momento da inscrição do usuário e a inscrição será rejeitada.
+        with_dns_records: Será feita uma tentativa de resolver os registros DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
         name: 'Você pode querer usar um destes:'
       form_challenge:
@@ -78,6 +82,7 @@ pt-BR:
         acct: Nome de usuário da nova conta
       account_warning_preset:
         text: Aviso pré-definido
+        title: Título
       admin_account_action:
         include_statuses: Incluir toots denunciados no e-mail
         send_email_notification: Notificar o usuário por e-mail
@@ -150,6 +155,8 @@ pt-BR:
         username: Nome de usuário
         username_or_email: Nome de usuário ou e-mail
         whole_word: Palavra inteira
+      email_domain_block:
+        with_dns_records: Incluir registros MX e IPs do domínio
       featured_tag:
         name: Hashtag
       interactions:
@@ -169,11 +176,11 @@ pt-BR:
         pending_account: Enviar e-mail quando uma nova conta precisar ser revisada
         reblog: Enviar e-mail quando alguém der boost nos seus toots
         report: Enviar e-mail quando uma nova denúncia for enviada
-        trending_tag: Enviar e-mail quando uma hashtag não revisada estiver em alta
+        trending_tag: Uma hashtag não-revisada está em alta
       tag:
         listable: Permitir que esta hashtag apareça em pesquisas e no diretório de perfis
         name: Hashtag
-        trendable: Permitir que esta hashtag apareça em alta
+        trendable: Permitir que esta hashtag fique em alta
         usable: Permitir que toots usem esta hashtag
     'no': Não
     recommended: Recomendado
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index f346005f7..3bec60f38 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -8,6 +8,7 @@ pt-PT:
         acct: Especifique o nome de usuário@domínio da conta para onde você deseja mover
       account_warning_preset:
         text: Tu podes usar sintaxe de escrita, como URLs, hashtags e referências
+        title: Opcional. Não visível para o destinatário
       admin_account_action:
         include_statuses: O usuário verá quais ferramentas causaram a ação de moderação ou aviso
         send_email_notification: O utilizador receberá uma explicação sobre o que aconteceu com a sua conta
@@ -41,9 +42,9 @@ pt-PT:
         scopes: Quais as APIs a que será concedido acesso. Se escolheres uma abrangência de nível superior, não precisarás de as seleccionar individualmente.
         setting_aggregate_reblogs: Não mostrar novas partilhas que foram partilhadas recentemente (só afecta as novas partilhas)
         setting_default_sensitive: Média sensível está oculta por padrão e pode ser revelada com um clique
-        setting_display_media_default: Esconder media marcada como sensível
-        setting_display_media_hide_all: Esconder sempre toda a media
-        setting_display_media_show_all: Mostrar sempre a media marcada como sensível
+        setting_display_media_default: Esconder média marcada como sensível
+        setting_display_media_hide_all: Esconder sempre toda a média
+        setting_display_media_show_all: Mostrar sempre a média marcada como sensível
         setting_hide_network: Quem tu segues e quem te segue não será mostrado no teu perfil
         setting_noindex: Afecta o teu perfil público e as páginas das tuas publicações
         setting_show_application: A aplicação que tu usas para publicar será mostrada na vista detalhada das tuas publicações
@@ -53,6 +54,9 @@ pt-PT:
         whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
       domain_allow:
         domain: Este domínio será capaz de obter dados deste servidor e os dados dele recebidos serão processados e armazenados
+      email_domain_block:
+        domain: Este pode ser o nome de domínio que aparece no endereço de email, o registro MX para o qual o domínio resolve, ou o IP do servidor para o qual o registro MX resolve. Estes serão verificados no momento da inscrição do utilizador e a inscrição será rejeitada.
+        with_dns_records: Será feita uma tentativa de resolver os registros DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
         name: 'Poderás querer usar um destes:'
       form_challenge:
@@ -78,6 +82,7 @@ pt-PT:
         acct: Nome de utilizador da nova conta
       account_warning_preset:
         text: Texto pré-definido
+        title: Título
       admin_account_action:
         include_statuses: Incluir no e-mail os toots reportados
         send_email_notification: Notificar o utilizador por e-mail
@@ -128,9 +133,9 @@ pt-PT:
         setting_crop_images: Cortar imagens em toots não expandidos para o formato 16x9
         setting_default_language: Língua de publicação
         setting_default_privacy: Privacidade da publicação
-        setting_default_sensitive: Sempre marcar media como sensível
+        setting_default_sensitive: Sempre marcar média como sensível
         setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
-        setting_display_media: Exposição de media
+        setting_display_media: Exposição de média
         setting_display_media_default: Pré-definição
         setting_display_media_hide_all: Esconder todos
         setting_display_media_show_all: Mostrar todos
@@ -150,6 +155,8 @@ pt-PT:
         username: Nome de utilizador
         username_or_email: Nome de utilizador ou e-mail
         whole_word: Palavra completa
+      email_domain_block:
+        with_dns_records: Incluir registros MX e IPs do domínio
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 0ec9d0d6b..7bc585c64 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -8,6 +8,7 @@ ru:
         acct: Укажите имя_пользователя@домен учётной записи, на которую вы собираетесь мигрировать
       account_warning_preset:
         text: Вы можете использовать всё, что в обычных постах — ссылки, хэштеги, упоминания и т.д.
+        title: Необязательно. Не видно получателю
       admin_account_action:
         include_statuses: Пользователь будет видеть к каким постами применялись модераторские действия и выносились предупреждения
         send_email_notification: Пользователь получит сообщение о том, что случилось с его/её учётной записью
@@ -53,6 +54,9 @@ ru:
         whole_word: Если слово или фраза состоит только из букв и цифр, сопоставление произойдёт только по полному совпадению
       domain_allow:
         domain: Этот домен сможет получать данные с этого сервера и его входящие данные будут обрабатываться и сохранены
+      email_domain_block:
+        domain: Это может быть домен, отображаемый в адресе электронной почты, MX-запись, на которую разрешается домен или IP сервера, на который разрешается MX-запись. Они будут проверены при регистрации пользователя, и регистрация будет отклонена.
+        with_dns_records: Будет сделана попытка разрешить DNS-записи данного домена и результаты также будут внесены в чёрный список
       featured_tag:
         name: 'Возможно, вы захотите добавить что-то из этого:'
       form_challenge:
@@ -78,6 +82,7 @@ ru:
         acct: Имя новой учётной записи
       account_warning_preset:
         text: Текст шаблона
+        title: Заголовок
       admin_account_action:
         include_statuses: Включать в письмо жалобы на посты
         send_email_notification: Уведомить пользователя по e-mail
@@ -118,7 +123,7 @@ ru:
         max_uses: Максимальное число использований
         new_password: Новый пароль
         note: О себе
-        otp_attempt: Двухфакторный код
+        otp_attempt: Код из приложения-аутентификатора
         password: Пароль
         phrase: Слово или фраза
         setting_advanced_layout: Включить многоколоночный интерфейс
@@ -150,6 +155,8 @@ ru:
         username: Имя пользователя
         username_or_email: Имя пользователя или e-mail
         whole_word: Слово целиком
+      email_domain_block:
+        with_dns_records: Включить MX-записи и IP-адреса домена
       featured_tag:
         name: Хэштег
       interactions:
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index c10df08d0..9e03d7254 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -72,6 +72,7 @@ sk:
         acct: Adresa nového účtu
       account_warning_preset:
         text: Text predlohy
+        title: Názov
       admin_account_action:
         include_statuses: Zahrnúť nahlásené príspevky v emaile
         send_email_notification: Oznam užívateľovi cez email
@@ -83,6 +84,11 @@ sk:
           silence: Utíš
           suspend: Vylúč a nenávratne vymaž dáta na účte
         warning_preset_id: Použi varovnú predlohu
+      announcement:
+        all_day: Celodenná udalosť
+        ends_at: Koniec udalosti
+        starts_at: Začiatok udalosti
+        text: Oboznámenie
       defaults:
         autofollow: Pozvi k následovaniu tvojho profilu
         avatar: Maskot
@@ -141,7 +147,7 @@ sk:
       featured_tag:
         name: Haštag
       interactions:
-        must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenásledujú
+        must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenasledujú
         must_be_following: Blokuj oboznámenia od ľudí, ktorých nesledujem
         must_be_following_dm: Blokuj priame správy od ľudí, ktorých nesleduješ
       invite:
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index de0a14bd7..80b699c28 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -8,6 +8,7 @@ sv:
         acct: Ange användarnamn@domän för kontot du flyttar till
       account_warning_preset:
         text: Du kan använda inläggssyntax som webbadresser, hashtaggar och omnämnanden
+        title: Valfri. Inte synlig för mottagaren
       admin_account_action:
         include_statuses: Användaren ser de toots som orsakat moderering eller varning
         send_email_notification: Användaren kommer att få en förklaring av vad som hände med sitt konto
@@ -45,6 +46,8 @@ sv:
         fields:
           name: Etikett
           value: Innehåll
+      account_warning_preset:
+        title: Rubrik
       admin_account_action:
         types:
           none: Gör ingenting
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index bac29f158..74c641901 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -6,6 +6,8 @@ ta:
         acct: நீங்கள் இங்கே நகர்த்த விரும்பும் கணக்கின் பயனர் பெயர்
       account_migration:
         acct: நீங்கள் இங்கே நகர்த்த விரும்பும் கணக்கின் பயனர் பெயர் username@domain
+      account_warning_preset:
+        title: விருப்பத் தேர்வு. பெறுநரால் பார்க்கமுடியாது
       admin_account_action:
         send_email_notification: தங்கள் கணக்கிற்கு என்ன நேர்ந்தது என்ற விவரம் பயனரால் பெறப்படும்
       announcement:
@@ -23,10 +25,15 @@ ta:
         password: குறைந்தது 8 எழுத்துக்களைப் பயன்படுத்தவும்
         setting_display_media_hide_all: எப்போதும் எல்லா ஊடகங்களையும் மறைக்கவும்
         setting_display_media_show_all: உணர்ச்சி வயப்படு (Sensitive) குறிக்கப்பட்ட மீடியாவை எப்போதும் காட்டுங்கள்
+      email_domain_block:
+        domain: இது மின்னஞ்சலில் காணப்படும் களத்தின் பெயராக இருக்கலாம், அல்லது அக்களம் சார்ந்திருக்கும் MX record-ஆக இருக்கலாம், அல்லது அந்த MX record சார்ந்திருக்கும் சர்வரின் IP முகவரியாக இருக்கலாம். பயனர் கணக்கைத் துவங்கும்போது அவை கண்காணிக்கப்பட்டு, கணக்குத் துவக்கம் நிராகரிக்கப்படும்.
+        with_dns_records: இக்களத்தின் DNS record-களை சரிசெய்யும் முயற்சி மேற்கொள்ளப்படும், மற்றும் அதன் முடிவுகள் தடுப்புப்பட்டியலில் சேர்க்கப்படும்
     labels:
       account:
         fields:
           name: லேபிள்
+      account_warning_preset:
+        title: தலைப்பு
       admin_account_action:
         types:
           disable: உள்நுழைவை முடக்கு
@@ -59,6 +66,8 @@ ta:
         setting_use_pending_items: மெதுவான பயன்முறை
         username: பயனர்பெயர்
         username_or_email: பயனர் பெயர் அல்லது மின்னஞ்சல்
+      email_domain_block:
+        with_dns_records: களத்தின் IP மற்றும் MX records-ஐ உள்ளடக்கு
     required:
       text: தேவை
     'yes': ஆம்
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 33a255e8d..22a2647a3 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -8,6 +8,7 @@ th:
         acct: ระบุ username@domain ของบัญชีที่คุณต้องการย้ายไป
       account_warning_preset:
         text: คุณสามารถใช้ไวยากรณ์โพสต์ เช่น URL, แฮชแท็ก และการกล่าวถึง
+        title: ตัวเลือกเพิ่มเติม ไม่ปรากฏแก่ผู้รับ
       admin_account_action:
         include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการควบคุมหรือคำเตือน
         send_email_notification: ผู้ใช้จะได้รับคำอธิบายว่าเกิดอะไรขึ้นกับบัญชีของเขา
@@ -42,8 +43,8 @@ th:
         setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น)
         setting_default_sensitive: ซ่อนสื่อที่ละเอียดอ่อนโดยค่าเริ่มต้นและสามารถเปิดเผยได้ด้วยการคลิก
         setting_display_media_default: ซ่อนสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อน
-        setting_display_media_hide_all: ซ่อนสื่อทั้งหมดเสมอ
-        setting_display_media_show_all: แสดงสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อนเสมอ
+        setting_display_media_hide_all: ซ่อนสื่อเสมอ
+        setting_display_media_show_all: แสดงสื่อเสมอ
         setting_hide_network: จะไม่แสดงผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ
         setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าสถานะของคุณ
         setting_show_application: จะแสดงแอปพลิเคชันที่คุณใช้เพื่อโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ
@@ -78,6 +79,7 @@ th:
         acct: การจัดการบัญชีใหม่
       account_warning_preset:
         text: ข้อความที่ตั้งไว้ล่วงหน้า
+        title: ชื่อเรื่อง
       admin_account_action:
         include_statuses: รวมโพสต์ที่รายงานไว้ในอีเมล
         send_email_notification: แจ้งเตือนผู้ใช้ทางอีเมล
@@ -86,7 +88,7 @@ th:
         types:
           disable: ปิดใช้งานการเข้าสู่ระบบ
           none: ไม่ทำสิ่งใด
-          silence: เงียบ
+          silence: ทำให้เงียบ
           suspend: ระงับและลบข้อมูลบัญชีอย่างถาวร
         warning_preset_id: ใช้คำเตือนที่ตั้งไว้ล่วงหน้า
       announcement:
@@ -126,8 +128,8 @@ th:
         setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
         setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
         setting_crop_images: ครอบตัดภาพในโพสต์ที่ไม่ได้ขยายเป็น 16x9
-        setting_default_language: ภาษาที่โพสต์
-        setting_default_privacy: ความเป็นส่วนตัวของโพสต์
+        setting_default_language: ภาษาของการโพสต์
+        setting_default_privacy: ความเป็นส่วนตัวของการโพสต์
         setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
         setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
         setting_display_media: การแสดงสื่อ
@@ -150,6 +152,8 @@ th:
         username: ชื่อผู้ใช้
         username_or_email: ชื่อผู้ใช้หรืออีเมล
         whole_word: ทั้งคำ
+      email_domain_block:
+        with_dns_records: รวมระเบียน MX และ IP ของโดเมน
       featured_tag:
         name: แฮชแท็ก
       interactions:
@@ -166,10 +170,10 @@ th:
         follow: ใครสักคนได้ติดตามคุณ
         follow_request: ใครสักคนได้ขอติดตามคุณ
         mention: ใครสักคนได้กล่าวถึงคุณ
-        pending_account: ส่งอีเมลเมื่อบัญชีใหม่ต้องการการตรวจทาน
+        pending_account: บัญชีใหม่ต้องมีการตรวจทาน
         reblog: ใครสักคนได้ดันสถานะของคุณ
-        report: ส่งอีเมลเมื่อมีการส่งรายงานใหม่
-        trending_tag: ส่งอีเมลเมื่อแฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม
+        report: มีการส่งรายงานใหม่
+        trending_tag: แฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม
       tag:
         listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและในไดเรกทอรีโปรไฟล์
         name: แฮชแท็ก
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 1a7b7de99..a617df62e 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -8,6 +8,7 @@ zh-CN:
         acct: 指定你想迁移过去的帐号的 用户名@站点域名
       account_warning_preset:
         text: 你可以使用嘟文格式，在嘟文中加入 URL、话题标签和提及“@”
+        title: 可选。对接收者不可见
       admin_account_action:
         include_statuses: 用户将会看到哪些嘟文导致了审核行为或警告
         send_email_notification: 用户将收到对其账号上发生的事的解释
@@ -53,6 +54,9 @@ zh-CN:
         whole_word: 如果关键词只包含字母和数字，就只会在整个词被匹配时才会套用
       domain_allow:
         domain: 该站点将能够从该服务器上拉取数据，并且从那里发过来的数据也会被处理和存储。
+      email_domain_block:
+        domain: 这里可以是邮箱地址中的域名部分、域名解析到的 MX 记录，或者 MX 记录解析到的域名。这些检查会在用户注册时进行，如果在黑名单中，那么注册会被拒绝。
+        with_dns_records: Mastodon 会尝试解析所给域名的 DNS 记录，然后把解析结果一并加入黑名单
       featured_tag:
         name: 你可能想要使用以下之一：
       form_challenge:
@@ -78,6 +82,7 @@ zh-CN:
         acct: 处理新账号
       account_warning_preset:
         text: 预置文本
+        title: 标题
       admin_account_action:
         include_statuses: 在电子邮件中包括已举报的嘟文
         send_email_notification: 通过邮件提醒此用户
@@ -150,6 +155,8 @@ zh-CN:
         username: 用户名
         username_or_email: 用户名或电子邮件地址
         whole_word: 整个词条
+      email_domain_block:
+        with_dns_records: 包括改域名的 MX 记录和 IP 地址
       featured_tag:
         name: 话题标签
       interactions:
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 235d9c764..57befb139 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -13,11 +13,16 @@ zh-HK:
         text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
+      announcement:
+        all_day: 核取後，只會顯示出時間範圍中的日期部分
+        scheduled_at: 空白則立即發布公告
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
         bot: 提醒用戶本帳號是機械人
         context: 應該套用過濾器的一項或多項內容
+        current_password: 因安全因素，請輸入目前帳戶的密碼
+        current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
         email: 您將收到一封確認電子郵件
         fields: 個人資料頁可顯示多至 4 個項目
@@ -30,6 +35,7 @@ zh-HK:
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
+        setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
@@ -40,10 +46,16 @@ zh-HK:
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
       featured_tag:
         name: 您可能想使用其中一個：
+      form_challenge:
+        current_password: 您正要進入安全區域
       imports:
         data: 自其他服務站匯出的 CSV 檔案
+      invite_request:
+        text: 這會協助我們審核您的應用程式
       sessions:
         otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼：
+      tag:
+        name: 您只能變更大小寫，例如，以使其更易讀。
       user:
         chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
     labels:
@@ -54,6 +66,7 @@ zh-HK:
       account_warning_preset:
         text: 預設文字
       admin_account_action:
+        include_statuses: 在電子郵件中加入檢舉的嘟文
         send_email_notification: 透過電子信件通知使用者
         text: 自訂警告
         type: 動作
@@ -63,6 +76,12 @@ zh-HK:
           silence: 安靜
           suspend: 停權並不可逆的刪除帳戶資料
         warning_preset_id: 使用警告預設
+      announcement:
+        all_day: 全天活動
+        ends_at: 活動結束時間
+        scheduled_at: 排程發佈
+        starts_at: 活動開始時間
+        text: 公告
       defaults:
         autofollow: 邀請別人關注你的賬號
         avatar: 個人頭像
@@ -89,6 +108,7 @@ zh-HK:
         otp_attempt: 雙重認證碼
         password: 密碼
         phrase: 關鍵字或片語
+        setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉嘟
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
@@ -107,7 +127,9 @@ zh-HK:
         setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 網站主題
+        setting_trends: 顯示本日趨勢
         setting_unfollow_modal: 取消關注前跳出詢問我
+        setting_use_pending_items: 限速模式
         severity: 等級
         type: 匯入資料類型
         username: 用戶名稱
@@ -119,15 +141,26 @@ zh-HK:
         must_be_follower: 隱藏沒有關注你的用戶的通知
         must_be_following: 隱藏你不關注的用戶的通知
         must_be_following_dm: 隱藏你不關注的用戶的私信
+      invite:
+        comment: 備註
+      invite_request:
+        text: 加入的原因
       notification_emails:
         digest: 定期電郵摘要
         favourite: 當有用戶喜歡你的文章時，發電郵通知
         follow: 當有用戶關注你時，發電郵通知
         follow_request: 當有用戶要求關注你時，發電郵通知
         mention: 當有用戶在文章提及你時，發電郵通知
+        pending_account: 需要審核的新帳戶
         reblog: 當有用戶轉推你的文章時，發電郵通知
         report: 當提交新檢舉時傳送電子郵件
+      tag:
+        listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
+        name: 主題標籤
+        trendable: 允許此主題標籤在趨勢下顯示
+        usable: 允許嘟文使用此主題標籤
     'no': 否
+    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 7de349ee3..6efebbe6d 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -13,11 +13,16 @@ zh-TW:
         text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
+      announcement:
+        all_day: 核取後，只會顯示出時間範圍中的日期部分
+        scheduled_at: 空白則立即發布公告
       defaults:
         autofollow: 通過邀請網址註冊的使用者將自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會等比例縮減成 %{dimensions} 像素
         bot: 此帳戶主要執行自動操作且可能未被監控
         context: 應該套用過濾器的一項或多項內容
+        current_password: 因安全因素，請輸入目前帳戶的密碼
+        current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登入且在未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
         fields: 您可在個人資料上有至多 4 個以表格形式顯示的項目
@@ -30,6 +35,7 @@ zh-TW:
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
+        setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
@@ -40,10 +46,16 @@ zh-TW:
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
       featured_tag:
         name: 您可能想使用其中一個：
+      form_challenge:
+        current_password: 您正要進入安全區域
       imports:
         data: 從其他 Mastodon 伺服器匯出的 CSV 檔案
+      invite_request:
+        text: 這會協助我們審核您的應用程式
       sessions:
         otp: 請輸入產生自您手機 App 的兩步驟驗證碼，或輸入其中一個復原代碼：
+      tag:
+        name: 您只能變更大小寫，例如，以使其更易讀。
       user:
         chosen_languages: 當核取時，只有選取語言的嘟文會在公開時間軸中顯示
     labels:
@@ -54,6 +66,7 @@ zh-TW:
       account_warning_preset:
         text: 預設文字
       admin_account_action:
+        include_statuses: 在電子郵件中加入檢舉的嘟文
         send_email_notification: 透過電子信件通知使用者
         text: 自訂警告
         type: 動作
@@ -63,6 +76,12 @@ zh-TW:
           silence: 安靜
           suspend: 停權並不可逆的刪除帳戶資料
         warning_preset_id: 使用警告預設
+      announcement:
+        all_day: 全天活動
+        ends_at: 活動結束時間
+        scheduled_at: 排程發佈
+        starts_at: 活動開始時間
+        text: 公告
       defaults:
         autofollow: 邀請別人關注你的帳戶
         avatar: 大頭貼
@@ -89,6 +108,7 @@ zh-TW:
         otp_attempt: 兩步驟驗證碼
         password: 密碼
         phrase: 關鍵字或片語
+        setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉嘟
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 在轉嘟前先詢問我
@@ -107,7 +127,9 @@ zh-TW:
         setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 站點主題
+        setting_trends: 顯示本日趨勢
         setting_unfollow_modal: 取消關注某人前先詢問我
+        setting_use_pending_items: 限速模式
         severity: 優先級
         type: 匯入類型
         username: 使用者名稱
@@ -119,15 +141,26 @@ zh-TW:
         must_be_follower: 封鎖非關注者的通知
         must_be_following: 封鎖您未關注之使用者的通知
         must_be_following_dm: 封鎖您未關注之使用者的私訊
+      invite:
+        comment: 備註
+      invite_request:
+        text: 加入的原因
       notification_emails:
         digest: 傳送摘要信件
         favourite: 當有使用者喜歡你的嘟文時，傳送電子信件通知
         follow: 當有使用者關注你時，傳送電子信件通知
         follow_request: 當有使用者請求關注你時，傳送電子信件通知
         mention: 當有使用者在嘟文提及你時，傳送電子信件通知
+        pending_account: 需要審核的新帳戶
         reblog: 當有使用者轉嘟你的嘟文時，傳送電子信件通知
         report: 當提交新檢舉時傳送電子郵件
+      tag:
+        listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
+        name: 主題標籤
+        trendable: 允許此主題標籤在趨勢下顯示
+        usable: 允許嘟文使用此主題標籤
     'no': 否
+    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index dbee6bb12..3a327c1d0 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -35,7 +35,7 @@ sk:
       one: príspevok
       other: príspevky
     status_count_before: Ktorí napísali
-    tagline: Následuj kamarátov, a objavuj nových
+    tagline: Nasleduj kamarátov, a objavuj nových
     terms: Podmienky užitia
     unavailable_content: Nedostupný obsah
     unavailable_content_description:
@@ -43,6 +43,7 @@ sk:
       reason: 'Dôvod:'
       rejecting_media: 'Mediálne súbory z týchto serverov nebudú spracované, alebo ukladané, a nebudú z nich zobrazované žiadne náhľady, vyžadujúc ručné prekliknutie priamo až k pôvodnému súboru:'
       silenced: 'Príspevky z týchto serverov budú skryté z verejných osí a z konverzácií, a nebudú vytvorené žiadné oboznámena ohľadom aktivity ich užívateľov, pokiaľ ich nenásleduješ:'
+    unavailable_content_html: Vo všeobecnosti, Mastodon ti dovoľuje vidieť obsah, a komunikovať s užívateľmi akéhokoľvek iného serveru v rámci fediversa. Toto sú výnimky, ktoré boli vytvorené na tomto konkrétnom serveri.
     user_count_after:
       few: užívateľov
       many: užívatelia
@@ -98,6 +99,7 @@ sk:
       delete: Vymaž
       destroyed_msg: Moderátorska poznámka bola úspešne zmazaná!
     accounts:
+      add_email_domain_block: Pridaj e-mailovú doménu na zoznam zakázaných
       approve: Schváľ
       approve_all: Schváľ všetky
       are_you_sure: Si si istý/á?
@@ -178,6 +180,7 @@ sk:
         staff: Člen
         user: Užívateľ
       search: Hľadaj
+      search_same_email_domain: Iní užívatelia s tou istou emailovou doménou
       search_same_ip: Ostatní užívatelia s rovnakou IP adresou
       shared_inbox_url: URL zdieľanej schránky
       show:
@@ -244,6 +247,8 @@ sk:
         create: Vytvor oznam
         title: Nové oznámenie
       published_msg: Oboznámenie úspešne zverejnené!
+      scheduled_for: Načasované na %{time}
+      scheduled_msg: Oboznámenie bolo naplánované na zverejnenie!
       title: Oboznámenia
     custom_emojis:
       assign_category: Priraď kategóriu
@@ -358,6 +363,7 @@ sk:
       destroyed_msg: Emailová doména bola úspešne vymazaná zo zoznamu zakázaných
       domain: Doména
       empty: Žiadné emailové domény niesú v súčasnosti na čiernej listine.
+      from_html: z %{domain}
       new:
         create: Pridaj doménu
         title: Nový email na zablokovanie
@@ -538,6 +544,9 @@ sk:
       trends:
         desc_html: Verejne zobraz už schválené haštagy, ktoré práve trendujú
         title: Populárne haštagy
+    site_uploads:
+      delete: Vymaž nahratý súbor
+      destroyed_msg: Nahratie bolo zo stránky úspešne vymazané!
     statuses:
       back_to_account: Späť na účet
       batch:
@@ -574,7 +583,6 @@ sk:
     warning_presets:
       add_new: Pridaj nové
       delete: Vymaž
-      edit: Uprav
       edit_preset: Uprav varovnú predlohu
       title: Spravuj varovné predlohy
   admin_mailer:
@@ -657,9 +665,9 @@ sk:
   authorize_follow:
     already_following: Tento účet už následuješ
     error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu
-    follow: Následuj
+    follow: Nasleduj
     follow_request: 'Poslal/a si žiadosť následovať užívateľa:'
-    following: 'Podarilo sa! Teraz už následuješ užívateľa:'
+    following: 'Podarilo sa! Teraz nasleduješ užívateľa:'
     post_follow:
       close: Alebo môžeš iba zatvoriť toto okno.
       return: Ukáž užívateľov profil
@@ -686,7 +694,7 @@ sk:
       x_seconds: "%{count}sek"
   deletes:
     challenge_not_passed: Údaje, ktoré si zadal/a, sú nesprávne
-    confirm_password: Napíšte svoje terajšie heslo pre overenie vašej identity
+    confirm_password: Napíš svoje terajšie heslo pre overenie tvojej identity
     confirm_username: Zadaj svoju prezývku, na potvrdenie úkonu
     proceed: Vymaž účet
     success_msg: Tvoj účet bol úspešne vymazaný
@@ -745,6 +753,7 @@ sk:
       limit: Už si si predvolil/a najvyšší možný počet obľúbených haštagov
   filters:
     contexts:
+      account: Profily
       home: Domáca os
       notifications: Oznámenia
       public: Verejné osi
@@ -769,6 +778,7 @@ sk:
     all: Všetko
     changes_saved_msg: Zmeny boli úspešne uložené!
     copy: Kopíruj
+    delete: Vymaž
     no_batch_actions_available: Na tejto stránke niesú k dispozícii žiadne hromadné akcie
     order_by: Zoraď podľa
     save_changes: Ulož zmeny
@@ -899,7 +909,7 @@ sk:
       title: Nové obľúbené
     follow:
       body: "%{name} ťa teraz následuje!"
-      subject: "%{name} ťa teraz následuje"
+      subject: "%{name} ťa teraz nasleduje"
       title: Nový sledovateľ
     follow_request:
       action: Spravuj žiadosti o sledovanie
@@ -939,6 +949,10 @@ sk:
     other: Ostatné
     posting_defaults: Východiskové nastavenia príspevkov
     public_timelines: Verejné časové osi
+  reactions:
+    errors:
+      limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
+      unrecognized_emoji: je neznámy smajlík
   relationships:
     activity: Aktivita účtu
     dormant: Spiace
@@ -1046,6 +1060,8 @@ sk:
       many: 'obsah nepovolených haštagov: %{tags}'
       one: 'obsahoval nepovolený haštag: %{tags}'
       other: 'obsahoval nepovolené haštagy: %{tags}'
+    errors:
+      in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, už pravdepodobne neexistuje.
     language_detection: Zisti automaticky
     open_in_web: Otvor v okne na webe
     over_character_limit: limit %{max} znakov bol presiahnutý
@@ -1067,6 +1083,7 @@ sk:
         other: "%{count} hlasy"
       vote: Hlasuj
     show_more: Ukáž viac
+    show_thread: Ukáž diskusné vlákno
     sign_in_to_participate: Prihlás sa pre zapojenie do diskusie
     title: '%{name}: „%{quote}"'
     visibilities:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index afb928f11..91720c602 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -485,7 +485,6 @@ sl:
     warning_presets:
       add_new: Dodaj novo
       delete: Izbriši
-      edit: Uredi
       edit_preset: Uredi prednastavitev opozoril
       title: Upravljaj prednastavitev opozoril
   admin_mailer:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 6a7a945c4..0e20902ff 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -415,7 +415,6 @@ sq:
     warning_presets:
       add_new: Shtoni të ri
       delete: Fshije
-      edit: Përpunoni
       edit_preset: Përpunoni sinjalizim të paracaktuar
       title: Administroni sinjalizime të paracaktuara
   admin_mailer:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c68681215..d7fb6f74d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -431,7 +431,6 @@ sr:
     warning_presets:
       add_new: Додај нови
       delete: Избриши
-      edit: Уреди
       edit_preset: Уреди пресет упозорења
       title: Управљај пресетима упозорења
   admin_mailer:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0094ff06b..3f06878f8 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -219,6 +219,8 @@ sv:
         update_status: "%{name} uppdaterade status för %{target}"
       deleted_status: "(raderad status)"
       title: Revisionslogg
+    announcements:
+      scheduled_for: Schemalagd för %{time}
     custom_emojis:
       assign_category: Ange kategori
       by_domain: Domän
@@ -430,6 +432,8 @@ sv:
         desc_html: Visa offentlig tidslinje på landingsidan
         title: Förhandsgranska tidslinje
       title: Sidans inställningar
+    site_uploads:
+      delete: Radera uppladdad fil
     statuses:
       back_to_account: Tillbaka till kontosidan
       batch:
@@ -448,7 +452,6 @@ sv:
     warning_presets:
       add_new: Lägg till ny
       delete: Radera
-      edit: Redigera
   admin_mailer:
     new_report:
       body: "%{reporter} har rapporterat %{target}"
@@ -505,6 +508,7 @@ sv:
       account_status: Kontostatus
   authorize_follow:
     already_following: Du följer redan detta konto
+    already_requested: Du har redan skickat en vänförfrågan till det kontot
     error: Tyvärr inträffade ett fel när vi kontrollerade fjärrkontot
     follow: Följ
     follow_request: 'Du har skickat en följaförfrågan till:'
@@ -751,6 +755,8 @@ sv:
     disallowed_hashtags:
       one: 'innehöll en otillåten hashtag: %{tags}'
       other: 'innehöll de otillåtna hashtagarna: %{tags}'
+    errors:
+      in_reply_not_found: Statusen du försöker svara på existerar inte.
     language_detection: Lista ut språk automatiskt
     open_in_web: Öppna på webben
     over_character_limit: teckengräns på %{max} har överskridits
@@ -760,6 +766,7 @@ sv:
       private: Icke-offentliga toot kan inte fästas
       reblog: Knuffar kan inte fästas
     show_more: Visa mer
+    show_thread: Visa tråd
     visibilities:
       private: Endast följare
       private_long: Visa endast till följare
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c3da99c48..b4fc2ffac 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -78,6 +78,7 @@ ta:
       delete: அகற்று
       destroyed_msg: நடுநிலை குறிப்பு வெற்றிகரமாக அகற்றப்பட்டது!
     accounts:
+      add_email_domain_block: இம்மின்னஞ்சல் களத்தைத் தடுப்புப்பட்டியலில் சேர்
       approve: அங்கீகரி
       approve_all: அனைத்தும் அங்கீகரி
       are_you_sure: நிச்சயமா?
@@ -149,6 +150,7 @@ ta:
         staff: பணியாளர்
         user: பயனர்
       search: தேடு
+      search_same_email_domain: இம்மின்னஞ்சல் களத்தில் உள்ள மற்ற பயனர்கள்
       shared_inbox_url: குழு மின்னஞ்சல் முகவரி
       show:
         created_reports: உறுவாக்கிய அறிக்கைகள்
@@ -200,6 +202,7 @@ ta:
           suspend: தற்காலீகமாக நீக்குக
     email_domain_blocks:
       empty: மின்னஞ்சற் களங்கள் எதுவும் தடுக்கப்படவில்லை.
+      from_html: "%{domain} -இலிருந்து"
     invites:
       filter:
         all: அனைத்தும்
@@ -221,10 +224,15 @@ ta:
           other: "%{count} புகார்கள்"
       comment:
         none: எதுவுமில்லை
+    site_uploads:
+      delete: பதிவேற்றப்பட்டப் படம் அழிக்கப்பட்டது
+      destroyed_msg: பதிவேற்றப்பட்ட வலைதளம் வெற்றிக்கரமாக அழிக்கப்பட்டது!
   appearance:
     localization:
       body: மாஸ்டோடான் தன்னார்வலர்களால் மொழிபெயர்க்கப்படுகிறது.
       guide_link_text: அனைவரும் பங்களிக்கலாம்.
+  authorize_follow:
+    already_requested: இக்கணக்கைப் பின்தொடரும் கோரிக்கையை நீங்கள் ஏற்கனவே அனுப்பிவிட்டீர்கள்
   date:
     formats:
       default: "%b %d, %Y"
@@ -235,7 +243,7 @@ ta:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   filters:
@@ -251,6 +259,9 @@ ta:
       '43200': 12 hours
       '604800': 1 week
       '86400': 1 day
+  media_attachments:
+    validations:
+      not_ready: பதிவேற்றம் முடிவடையாத கோப்புகளை இணைக்க முடியாது. சிறிது நேரம் கழித்து மீண்டும் முயற்சி செய்யவும்!
   notifications:
     email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
@@ -263,4 +274,6 @@ ta:
       limit_reached: எதிர்வினைகளுக்கான உச்சவரம்பு எட்டப்பட்டது
       unrecognized_emoji: அங்கீகரிக்கப்பட்ட ஈமோஜி அல்ல
   statuses:
+    errors:
+      in_reply_not_found: நீங்கள் மறுமொழி அளிக்க முயலும் பதிவு இருப்பதுபோல் தெரியவில்லை.
     show_thread: தொடரைக் காட்டு
diff --git a/config/locales/te.yml b/config/locales/te.yml
index dd6c878e7..79415b1d1 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -113,7 +113,7 @@ te:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7d6ec0b13..10f25549b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -34,7 +34,7 @@ th:
     unavailable_content: เนื้อหาไม่พร้อมใช้งาน
     unavailable_content_description:
       domain: เซิร์ฟเวอร์
-      reason: 'เหตุผล:'
+      reason: เหตุผล
       rejecting_media: 'ไฟล์สื่อจากเซิร์ฟเวอร์เหล่านี้จะไม่ได้รับการประมวลผลหรือจัดเก็บ และจะไม่แสดงภาพขนาดย่อ ต้องมีการคลิกไปยังไฟล์ต้นฉบับด้วยตนเอง:'
     user_count_after:
       other: ผู้ใช้
@@ -113,12 +113,12 @@ th:
       joined: เข้าร่วมเมื่อ
       location:
         all: ทั้งหมด
-        local: ในเว็บ
+        local: ในเซิร์ฟเวอร์
         remote: ระยะไกล
         title: ตำแหน่งที่ตั้ง
       login_status: สถานะการเข้าสู่ระบบ
       media_attachments: ไฟล์แนบสื่อ
-      memorialize: เปลี่ยนเป็นระลึกถึง
+      memorialize: เปลี่ยนเป็นอนุสรณ์
       moderation:
         active: ใช้งานอยู่
         all: ทั้งหมด
@@ -159,7 +159,7 @@ th:
       show:
         created_reports: รายงานที่สร้าง
         targeted_reports: รายงานโดยผู้อื่น
-      silence: เงียบ
+      silence: ทำให้เงียบ
       silenced: เงียบอยู่
       statuses: สถานะ
       subscribe: บอกรับ
@@ -167,7 +167,7 @@ th:
       time_in_queue: กำลังรออยู่ในคิว %{time}
       title: บัญชี
       unconfirmed_email: อีเมลที่ยังไม่ได้ยืนยัน
-      undo_silenced: เลิกทำการเงียบ
+      undo_silenced: เลิกทำการทำให้เงียบ
       undo_suspension: เลิกทำการระงับ
       unsubscribe: เลิกบอกรับ
       username: ชื่อผู้ใช้
@@ -175,6 +175,42 @@ th:
       web: เว็บ
       whitelisted: ขึ้นบัญชีขาวแล้ว
     action_logs:
+      action_types:
+        assigned_to_self_report: มอบหมายรายงาน
+        change_email_user: เปลี่ยนอีเมลสำหรับผู้ใช้
+        confirm_user: ยืนยันผู้ใช้
+        create_account_warning: สร้างคำเตือน
+        create_announcement: สร้างประกาศ
+        create_custom_emoji: สร้างอีโมจิที่กำหนดเอง
+        create_domain_allow: สร้างการอนุญาตโดเมน
+        create_domain_block: สร้างการปิดกั้นโดเมน
+        create_email_domain_block: สร้างการปิดกั้นโดเมนอีเมล
+        demote_user: ลดขั้นผู้ใช้
+        destroy_announcement: ลบประกาศ
+        destroy_custom_emoji: ลบอีโมจิที่กำหนดเอง
+        destroy_domain_allow: ลบการอนุญาตโดเมน
+        destroy_domain_block: ลบการปิดกั้นโดเมน
+        destroy_email_domain_block: ลบการปิดกั้นโดเมนอีเมล
+        destroy_status: ลบสถานะ
+        disable_2fa_user: ปิดใช้งาน 2FA
+        disable_custom_emoji: ปิดใช้งานอีโมจิที่กำหนดเอง
+        disable_user: ปิดใช้งานผู้ใช้
+        enable_custom_emoji: เปิดใช้งานอีโมจิที่กำหนดเอง
+        enable_user: เปิดใช้งานผู้ใช้
+        memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
+        promote_user: เลื่อนขั้นผู้ใช้
+        remove_avatar_user: เอาภาพประจำตัวออก
+        reopen_report: เปิดรายงานใหม่
+        reset_password_user: ตั้งรหัสผ่านใหม่
+        resolve_report: แก้ปัญหารายงาน
+        silence_account: ทำให้บัญชีเงียบ
+        suspend_account: ระงับบัญชี
+        unassigned_report: เลิกมอบหมายรายงาน
+        unsilence_account: เลิกทำให้บัญชีเงียบ
+        unsuspend_account: เลิกระงับบัญชี
+        update_announcement: อัปเดตประกาศ
+        update_custom_emoji: อัปเดตอีโมจิที่กำหนดเอง
+        update_status: อัปเดตสถานะ
       actions:
         change_email_user: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
         confirm_user: "%{name} ได้ยืนยันที่อยู่อีเมลของผู้ใช้ %{target}"
@@ -196,17 +232,23 @@ th:
         disable_user: "%{name} ได้ปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         enable_custom_emoji: "%{name} ได้เปิดใช้งานอีโมจิ %{target}"
         enable_user: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
+        memorialize_account: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
         remove_avatar_user: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report: "%{name} ได้เปิดรายงาน %{target} ใหม่"
         resolve_report: "%{name} ได้แก้ปัญหารายงาน %{target}"
+        silence_account: "%{name} ได้ทำให้บัญชีของ %{target} เงียบ"
         suspend_account: "%{name} ได้ระงับบัญชีของ %{target}"
         unassigned_report: "%{name} ได้เลิกมอบหมายรายงาน %{target}"
+        unsilence_account: "%{name} ได้เลิกทำให้บัญชีของ %{target} เงียบ"
         unsuspend_account: "%{name} ได้เลิกระงับบัญชีของ %{target}"
         update_announcement: "%{name} ได้อัปเดตประกาศ %{target}"
         update_custom_emoji: "%{name} ได้อัปเดตอีโมจิ %{target}"
         update_status: "%{name} ได้อัปเดตสถานะโดย %{target}"
       deleted_status: "(สถานะที่ลบแล้ว)"
+      empty: ไม่พบรายการบันทึก
+      filter_by_action: กรองตามการกระทำ
+      filter_by_user: กรองตามผู้ใช้
       title: รายการบันทึกการตรวจสอบ
     announcements:
       destroyed_msg: ลบประกาศสำเร็จ!
@@ -259,6 +301,7 @@ th:
       feature_invites: ลิงก์เชิญ
       feature_profile_directory: ไดเรกทอรีโปรไฟล์
       feature_registrations: การลงทะเบียน
+      feature_relay: รีเลย์การติดต่อกับภายนอก
       feature_spam_check: การป้องกันสแปม
       feature_timeline_preview: ตัวอย่างเส้นเวลา
       features: คุณลักษณะ
@@ -292,15 +335,15 @@ th:
         create: สร้างการปิดกั้น
         hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะใช้วิธีการควบคุมเฉพาะกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
         severity:
-          desc_html: "<strong>เงียบ</strong> จะทำให้โพสต์ของบัญชีมองไม่เห็นกับใครก็ตามที่ไม่ได้กำลังติดตามบัญชี <strong>ระงับ</strong> จะเอาเนื้อหา, สื่อ และข้อมูลโปรไฟล์ทั้งหมดของบัญชีออก ใช้ <strong>ไม่มี</strong> หากคุณเพียงแค่ต้องการปฏิเสธไฟล์สื่อ"
+          desc_html: "<strong>ทำให้เงียบ</strong> จะทำให้โพสต์ของบัญชีไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามบัญชี <strong>ระงับ</strong> จะเอาเนื้อหา, สื่อ และข้อมูลโปรไฟล์ทั้งหมดของบัญชีออก ใช้ <strong>ไม่มี</strong> หากคุณเพียงแค่ต้องการปฏิเสธไฟล์สื่อ"
           noop: ไม่มี
-          silence: เงียบ
+          silence: ทำให้เงียบ
           suspend: ระงับ
         title: การปิดกั้นโดเมนใหม่
       private_comment: ความคิดเห็นส่วนตัว
       public_comment: ความคิดเห็นสาธารณะ
       reject_media: ปฏิเสธไฟล์สื่อ
-      reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเว็บออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
+      reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเซิร์ฟเวอร์ออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
       reject_reports: ปฏิเสธรายงาน
       severity:
         silence: เงียบอยู่
@@ -309,7 +352,7 @@ th:
         affected_accounts:
           other: มีผลต่อ %{count} บัญชีในฐานข้อมูล
         retroactive:
-          silence: เลิกเงียบบัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้
+          silence: เลิกทำให้บัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้เงียบ
           suspend: เลิกระงับบัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้
         title: เลิกทำการปิดกั้นโดเมนสำหรับ %{domain}
         undo: เลิกทำ
@@ -322,6 +365,7 @@ th:
       destroyed_msg: ลบโดเมนอีเมลออกจากบัญชีดำสำเร็จ
       domain: โดเมน
       empty: ไม่มีโดเมนอีเมลที่ขึ้นบัญชีดำอยู่
+      from_html: จาก %{domain}
       new:
         create: เพิ่มโดเมน
         title: รายการบัญชีดำอีเมลใหม่
@@ -408,7 +452,7 @@ th:
         all: ให้กับทุกคน
         disabled: ให้กับไม่มีใคร
         title: แสดงการปิดกั้นโดเมน
-        users: ให้กับผู้ใช้ในเว็บที่เข้าสู่ระบบ
+        users: ให้กับผู้ใช้ในเซิร์ฟเวอร์ที่เข้าสู่ระบบ
       domain_blocks_rationale:
         title: แสดงคำชี้แจงเหตุผล
       enable_bootstrap_timeline_accounts:
@@ -488,7 +532,6 @@ th:
     warning_presets:
       add_new: เพิ่มใหม่
       delete: ลบ
-      edit: แก้ไข
       edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
       title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
   admin_mailer:
@@ -603,7 +646,7 @@ th:
     '422':
       content: การตรวจสอบความปลอดภัยล้มเหลว คุณกำลังปิดกั้นคุกกี้หรือไม่?
       title: การตรวจสอบความปลอดภัยล้มเหลว
-    '429': Throttled
+    '429': Too many requests
     '500':
       title: หน้านี้ไม่ถูกต้อง
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index cde7f1c83..1dcf9ccea 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -573,7 +573,6 @@ tr:
     warning_presets:
       add_new: Yeni ekle
       delete: Sil
-      edit: Düzenle
       edit_preset: Uyarı ön-ayarını düzenle
       title: Uyarı ön-ayarlarını yönet
   admin_mailer:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 967a02717..3df83e756 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -591,7 +591,6 @@ uk:
     warning_presets:
       add_new: Додати новий
       delete: Видалити
-      edit: Редагувати
       edit_preset: Редагувати шаблон попередження
       title: Управління шаблонами попереджень
   admin_mailer:
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 114261859..2aa72a8f8 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -7,7 +7,7 @@ ur:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index ec8e853fe..cba773417 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -534,7 +534,6 @@ vi:
     warning_presets:
       add_new: Thêm mới
       delete: Xóa bỏ
-      edit: Biên tập
       edit_preset: Chỉnh sửa cảnh báo đặt trước
       title: Quản lý cài đặt trước cảnh báo
   admin_mailer:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d6618dbbe..33f25eaa6 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -41,7 +41,7 @@ zh-CN:
       rejecting_media: 来自这些服务器的媒体文件将不会被处理或存储，缩略图也不会显示，需要手动点击打开原始文件。
       silenced: 来自这些服务器上的帖子将不会出现在公共时间线和会话中；此外，除非你关注了这些服务器上的用户，否则他们的互动不会产生通知。
       suspended: 这些服务器的数据将不会被处理、存储或者交换，本站也将无法和来自这些服务器的用户互动或者交流。
-    unavailable_content_html: 通常来说，在Mastodon上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但是这台服务器上会有一些挟制。
+    unavailable_content_html: 通常来说，在Mastodon上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但是某些站点上不排除会有例外。
     user_count_after:
       other: 位用户
     user_count_before: 这里共注册有
@@ -88,6 +88,7 @@ zh-CN:
       delete: 删除
       destroyed_msg: 管理备忘删除成功！
     accounts:
+      add_email_domain_block: 把电子邮箱域名加入黑名单
       approve: 批准
       approve_all: 批准全部
       are_you_sure: 你确定吗？
@@ -168,6 +169,7 @@ zh-CN:
         staff: 管理人员
         user: 普通用户
       search: 搜索
+      search_same_email_domain: 其他具有相同电子邮箱域名的用户
       search_same_ip: 具有相同IP的其他用户
       shared_inbox_url: 公用收件箱（Shared Inbox）URL
       show:
@@ -353,6 +355,7 @@ zh-CN:
       destroyed_msg: 电子邮件域名屏蔽删除成功
       domain: 域名
       empty: 当前没有邮件域名黑名单。
+      from_html: 来自 %{domain}
       new:
         create: 添加域名
         title: 添加电子邮件域名屏蔽
@@ -495,8 +498,8 @@ zh-CN:
           open: 开放注册
         title: 注册模式
       show_known_fediverse_at_about_page:
-        desc_html: 启用此选项将会在预览中显示来自已知实例的嘟文，否则只会显示本站时间轴的内容.
-        title: 在时间轴预览中显示已知实例
+        desc_html: 如果开启，就会在时间轴预览显示其他站点嘟文，否则就只会只显示本站嘟文。
+        title: 在时间轴预览中显示其他站点嘟文
       show_staff_badge:
         desc_html: 在个人资料页上显示管理人员标志
         title: 显示管理人员标志
@@ -529,6 +532,9 @@ zh-CN:
       trends:
         desc_html: 公开显示先前已通过审核的当前热门话题
         title: 热门标签
+    site_uploads:
+      delete: 删除已上传的文件
+      destroyed_msg: 站点上传的文件已经成功删除！
     statuses:
       back_to_account: 返回帐户信息页
       batch:
@@ -565,7 +571,6 @@ zh-CN:
     warning_presets:
       add_new: 添加新条目
       delete: 删除
-      edit: 编辑
       edit_preset: 编辑预置警告
       title: 管理预设警告
   admin_mailer:
@@ -653,6 +658,7 @@ zh-CN:
     trouble_logging_in: 登录有问题？
   authorize_follow:
     already_following: 你已经在关注此用户了
+    already_requested: 你已经向那个账户发送过关注请求了
     error: 对不起，寻找这个跨站用户时出错
     follow: 关注
     follow_request: 关注请求已发送给：
@@ -839,6 +845,7 @@ zh-CN:
   media_attachments:
     validations:
       images_and_video: 无法在嘟文中同时插入视频和图片
+      not_ready: 不能附加还在处理中的文件。请稍后再试！
       too_many: 最多只能添加 4 张图片
   migrations:
     acct: 新帐户的 用户名@域名
@@ -1055,6 +1062,8 @@ zh-CN:
     content_warning: 内容警告：%{warning}
     disallowed_hashtags:
       other: 包含了这些禁止的话题标签：%{tags}
+    errors:
+      in_reply_not_found: 你回复的嘟文似乎不存在
     language_detection: 自动检测语言
     open_in_web: 在站内打开
     over_character_limit: 超过了 %{max} 字的限制
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ffd5ba5e9..92233dcc6 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -11,12 +11,14 @@ zh-HK:
     apps: 行動應用程式
     apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
     browse_directory: 依興趣瀏覽個人資料目錄和過濾器
+    browse_local_posts: 瀏覽這台伺服器中公開嘟文的直播串流
     browse_public_posts: 在 Mastodon 瀏覽公開嘟文的即時串流
     contact: 聯絡
     contact_missing: 未設定
     contact_unavailable: 未公開
     discover_users: 探索使用者
     documentation: 文件
+    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
     get_apps: 嘗試行動應用程式
     hosted_on: 在 %{domain} 運作的 Mastodon 服務站
     learn_more: 了解更多
@@ -29,6 +31,7 @@ zh-HK:
     status_count_before: 他們共發佈了
     tagline: 關注朋友並探索新朋友
     terms: 使用條款
+    unavailable_content: 無法取得的內容
     unavailable_content_description:
       domain: 伺服器
       reason: 原因
@@ -60,7 +63,9 @@ zh-HK:
     roles:
       admin: 管理員
       bot: 機械人
+      group: 群組
       moderator: 監察員
+    unavailable: 無法取得個人檔案
     unfollow: 取消關注
   admin:
     account_actions:
@@ -72,6 +77,7 @@ zh-HK:
       delete: 刪除
       destroyed_msg: 管理記錄已被刪除
     accounts:
+      add_email_domain_block: 將電子郵件網域加入黑名單
       approve: 核准
       approve_all: 全部批准
       are_you_sure: 你確定嗎？
@@ -151,6 +157,8 @@ zh-HK:
         staff: 管理人員
         user: 普通用戶
       search: 搜索
+      search_same_email_domain: 其他有同個電子郵件網域的使用者
+      search_same_ip: 其他有同個 IP 的使用者
       shared_inbox_url: 公共收件箱（Shared Inbox）URL
       show:
         created_reports: 此用戶所提舉報的紀錄
@@ -160,6 +168,7 @@ zh-HK:
       statuses: 文章
       subscribe: 訂閱
       suspended: 已停權
+      time_in_queue: 正在佇列等待 %{time}
       title: 用戶
       unconfirmed_email: 未確認的電郵
       undo_silenced: 解除靜音
@@ -168,17 +177,22 @@ zh-HK:
       username: 用戶名稱
       warn: 警告
       web: 用戶頁面
+      whitelisted: 已加入白名單
     action_logs:
       actions:
         assigned_to_self_report: "%{name} 指派了 %{target} 的舉報給自己"
         change_email_user: "%{name} 改變了用戶 %{target} 的電郵地址"
         confirm_user: "%{name} 確認了用戶 %{target} 的電郵地址"
         create_account_warning: "%{name} 已對 %{target} 送出警告"
+        create_announcement: "%{name} 建立了新公告 %{target}"
         create_custom_emoji: "%{name} 加入自訂表情符號 %{target}"
+        create_domain_allow: "%{name} 將 %{target} 網域加入黑名單了"
         create_domain_block: "%{name} 阻隔了網域 %{target}"
         create_email_domain_block: "%{name} 阻隔了電郵網域 %{target}"
         demote_user: "%{name} 把用戶 %{target} 降任"
+        destroy_announcement: "%{name} 刪除了公告 %{target}"
         destroy_custom_emoji: "%{name} 破壞了 %{target} 表情符號"
+        destroy_domain_allow: "%{name} 從白名單中移除了 %{target} 網域"
         destroy_domain_block: "%{name} 取消了對網域 %{target} 的阻隔"
         destroy_email_domain_block: "%{name} 取消了對電郵網域 %{target} 的阻隔"
         destroy_status: "%{name} 刪除了 %{target} 的文章"
@@ -198,15 +212,33 @@ zh-HK:
         unassigned_report: "%{name} 取消指派 %{target} 的舉報"
         unsilence_account: "%{name} 取消了用戶 %{target} 的靜音狀態"
         unsuspend_account: "%{name} 取消了用戶 %{target} 的停權狀態"
+        update_announcement: "%{name} 更新了公告 %{target}"
         update_custom_emoji: "%{name} 更新了自訂表情符號 %{target}"
         update_status: "%{name} 刷新了 %{target} 的文章"
       deleted_status: "（已刪除嘟文）"
       title: 營運日誌
+    announcements:
+      destroyed_msg: 成功刪除公告！
+      edit:
+        title: 編輯公告
+      empty: 找不到公告。
+      live: 直播
+      new:
+        create: 建立公告
+        title: 新增公告
+      published_msg: 成功發布公告！
+      scheduled_for: 排定 %{time}
+      scheduled_msg: 公告已排定公開！
+      title: 公告
+      unpublished_msg: 成功取消發布公告！
+      updated_msg: 成功更新公告！
     custom_emojis:
+      assign_category: 指定分類
       by_domain: 網域
       copied_msg: 成功將表情複製到本地
       copy: 複製
       copy_failed_msg: 無法將表情複製到本地
+      create_new_category: 建立新分類
       created_msg: 已新增表情符號
       delete: 刪除
       destroyed_msg: 已刪除表情符號
@@ -226,11 +258,13 @@ zh-HK:
       shortcode: 短代碼
       shortcode_hint: 至少 2 個字元，只能使用字母、數字和下劃線
       title: 自訂 emoji
+      uncategorized: 未分類
       unlisted: 已隱藏
       update_failed_msg: 無法更新表情符號
       updated_msg: 已更新表情符號
       upload: 上傳新的表情符號
     dashboard:
+      authorized_fetch_mode: 安全模式
       backlog: 未處理工作數
       config: 設定
       feature_deletions: 帳戶刪除
@@ -238,9 +272,13 @@ zh-HK:
       feature_profile_directory: 個人資料目錄
       feature_registrations: 註冊
       feature_relay: 聯邦中繼站
+      feature_spam_check: 防垃圾訊息
+      feature_timeline_preview: 時間軸預覽
       features: 功能
       hidden_service: 與隱密服務互連
       open_reports: 待處理檢舉數
+      pending_tags: 等待審核的主題標籤
+      pending_users: 等待審核的使用者
       recent_users: 最近加入的使用者
       search: 全文搜尋
       single_user_mode: 單一使用者模式
@@ -252,6 +290,12 @@ zh-HK:
       week_interactions: 本週互動次數
       week_users_active: 本週活躍使用者數
       week_users_new: 本週新使用者數
+      whitelist_mode: 白名單模式
+    domain_allows:
+      add_new: 將網域加入白名單
+      created_msg: 網域已成功加入白名單
+      destroyed_msg: 網域已成功從白名單移除
+      undo: 從白名單移除
     domain_blocks:
       add_new: 新增
       created_msg: 正處理域名阻隔
@@ -352,12 +396,23 @@ zh-HK:
       contact_information:
         email: 輸入一個公開的電郵地址
         username: 輸入用戶名稱
+      domain_blocks:
+        all: 給任何人
+        disabled: 給沒有人
+        title: 顯示封鎖的網域
+      enable_bootstrap_timeline_accounts:
+        title: 啟用新使用者的預設追蹤
       hero:
         desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會默認為服務站縮圖
         title: 主題圖片
       peers_api_enabled:
         desc_html: 現時本服務站在網絡中已發現的域名
         title: 公開已知服務站的列表
+      preview_sensitive_media:
+        title: 在 OpenGraph 預覽中顯示敏感媒體
+      profile_directory:
+        desc_html: 允許能探索使用者
+        title: 啟用個人資料目錄
       registrations:
         closed_message:
           desc_html: 當本站暫停接受註冊時，會顯示這個訊息。<br/> 可使用 HTML
@@ -368,6 +423,12 @@ zh-HK:
         min_invite_role:
           disabled: 沒有人
           title: 允許發送邀請的身份
+      registrations_mode:
+        modes:
+          approved: 註冊需要核准
+          none: 沒有人可註冊
+          open: 任何人皆能註冊
+        title: 註冊模式
       show_known_fediverse_at_about_page:
         desc_html: 如果開啟，就會在時間軸預覽顯示跨站文章，否則就只會顯示本站文章。
         title: 在時間軸預覽顯示跨站文章
@@ -380,10 +441,14 @@ zh-HK:
       site_description_extended:
         desc_html: 本站詳細資訊頁的內文<br/>你可以在此使用 HTML
         title: 本站詳細資訊
+      site_short_description:
+        title: 伺服器短描述
       site_terms:
         desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
         title: 自訂使用條款
       site_title: 本站名稱
+      spam_check_enabled:
+        title: 自動防廣告訊息
       thumbnail:
         desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
         title: 本站縮圖
@@ -391,25 +456,44 @@ zh-HK:
         desc_html: 在主頁顯示本站時間軸
         title: 時間軸預覽
       title: 網站設定
+      trends:
+        title: 趨勢主題標籤
+    site_uploads:
+      delete: 刪除上傳的檔案
+      destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
       back_to_account: 返回帳戶信息頁
       batch:
         delete: 刪除
         nsfw_off: 取消 NSFW 標記
         nsfw_on: 添加 NSFW 標記
+      deleted: 已刪除
       failed_to_execute: 執行失敗
       media:
         title: 媒體檔案
       no_media: 不含媒體檔案
+      no_status_selected: 因未選擇嘟文而未變更。
       title: 帳戶文章
       with_media: 含有媒體檔案
     tags:
+      context: 上下文
+      directory: 在目錄中
+      in_directory: 目錄中有 %{count} 個
+      last_active: 上次活躍
+      most_popular: 最熱門
+      most_recent: 最近
       name: Hashtag
+      review: 審核嘟文
+      reviewed: 已審核
+      title: 主題標籤
+      trending_right_now: 最新趨勢
+      unique_uses_today: 今天嘟了 %{count} 則
+      unreviewed: 未審核
+      updated_msg: 成功更新主題標籤設定
     title: 管理
     warning_presets:
       add_new: 新增
       delete: 刪除
-      edit: 編輯
   admin_mailer:
     new_report:
       body: "%{reporter} 舉報了用戶 %{target}"
@@ -456,6 +540,7 @@ zh-HK:
     set_new_password: 設定新密碼
   authorize_follow:
     already_following: 你已經關注了這個帳號
+    already_requested: 您早已向該帳戶寄送追蹤請求
     error: 對不起，尋找這個跨站用戶的過程發生錯誤
     follow: 關注
     follow_request: 關注請求已發送给：
@@ -673,6 +758,8 @@ zh-HK:
     content_warning: 內容警告： %{warning}
     disallowed_hashtags:
       other: 包含不允許的標籤： %{tags}
+    errors:
+      in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
     language_detection: 自動偵測語言
     open_in_web: 開啟網頁
     over_character_limit: 超過了 %{max} 字的限制
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5b25688ed..3f82428de 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -11,12 +11,14 @@ zh-TW:
     apps: 行動應用程式
     apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
     browse_directory: 依興趣瀏覽個人資料目錄和過濾器
+    browse_local_posts: 瀏覽這台伺服器中公開嘟文的直播串流
     browse_public_posts: 在 Mastodon 瀏覽公開嘟文的即時串流
     contact: 聯絡我們
     contact_missing: 未設定
     contact_unavailable: 未公開
     discover_users: 探索使用者
     documentation: 文件
+    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
     get_apps: 嘗試行動應用程式
     hosted_on: 在 %{domain} 運作的 Mastodon 站點
     learn_more: 了解詳細
@@ -29,6 +31,7 @@ zh-TW:
     status_count_before: 他們共嘟出了
     tagline: 關注朋友並探索新朋友
     terms: 使用條款
+    unavailable_content: 無法取得的內容
     unavailable_content_description:
       domain: 伺服器
       reason: 原因
@@ -60,7 +63,9 @@ zh-TW:
     roles:
       admin: 管理員
       bot: 機器人
+      group: 群組
       moderator: 版主
+    unavailable: 無法取得個人檔案
     unfollow: 取消關注
   admin:
     account_actions:
@@ -72,6 +77,7 @@ zh-TW:
       delete: 刪除
       destroyed_msg: 成功刪除管理備忘!
     accounts:
+      add_email_domain_block: 將電子郵件網域加入黑名單
       approve: 核准
       approve_all: 全部批准
       are_you_sure: 您確定嗎?
@@ -151,6 +157,8 @@ zh-TW:
         staff: 管理人員
         user: 普通使用者
       search: 搜尋
+      search_same_email_domain: 其他有同個電子郵件網域的使用者
+      search_same_ip: 其他有同個 IP 的使用者
       shared_inbox_url: 共享收件箱網址
       show:
         created_reports: 建立檢舉
@@ -160,6 +168,7 @@ zh-TW:
       statuses: 嘟文
       subscribe: 訂閱
       suspended: 已停權
+      time_in_queue: 正在佇列等待 %{time}
       title: 帳戶
       unconfirmed_email: 未確認的電子信箱位址
       undo_silenced: 取消靜音
@@ -168,17 +177,22 @@ zh-TW:
       username: 使用者名稱
       warn: 警告
       web: 頁面
+      whitelisted: 已加入白名單
     action_logs:
       actions:
         assigned_to_self_report: "%{name} 接受了檢舉 %{target}"
         change_email_user: "%{name} 變更了使用者 %{target} 的電子信箱位址"
         confirm_user: "%{name} 確認了使用者 %{target} 的電子信箱位址"
         create_account_warning: "%{name} 已對 %{target} 送出警告"
+        create_announcement: "%{name} 建立了新公告 %{target}"
         create_custom_emoji: "%{name} 加入自訂表情符號 %{target}"
+        create_domain_allow: "%{name} 將 %{target} 網域加入黑名單了"
         create_domain_block: "%{name} 封鎖了站點 %{target}"
         create_email_domain_block: "%{name} 封鎖了電子信箱網域 %{target}"
         demote_user: "%{name} 把使用者 %{target} 降級"
+        destroy_announcement: "%{name} 刪除了公告 %{target}"
         destroy_custom_emoji: "%{name} 破壞了 %{target} 表情符號"
+        destroy_domain_allow: "%{name} 從白名單中移除了 %{target} 網域"
         destroy_domain_block: "%{name} 取消了對站點 %{target} 的封鎖"
         destroy_email_domain_block: "%{name} 取消了對電子信箱網域 %{target} 的封鎖"
         destroy_status: "%{name} 刪除了 %{target} 的嘟文"
@@ -198,15 +212,33 @@ zh-TW:
         unassigned_report: "%{name} 取消指派 %{target} 的檢舉"
         unsilence_account: "%{name} 取消了使用者 %{target} 的靜音狀態"
         unsuspend_account: "%{name} 取消了使用者 %{target} 的停權狀態"
+        update_announcement: "%{name} 更新了公告 %{target}"
         update_custom_emoji: "%{name} 更新了自訂表情符號 %{target}"
         update_status: "%{name} 重整了 %{target} 的嘟文"
       deleted_status: "（已刪除嘟文）"
       title: 營運日誌
+    announcements:
+      destroyed_msg: 成功刪除公告！
+      edit:
+        title: 編輯公告
+      empty: 找不到公告。
+      live: 直播
+      new:
+        create: 建立公告
+        title: 新增公告
+      published_msg: 成功發布公告！
+      scheduled_for: 排定 %{time}
+      scheduled_msg: 公告已排定公開！
+      title: 公告
+      unpublished_msg: 成功取消發布公告！
+      updated_msg: 成功更新公告！
     custom_emojis:
+      assign_category: 指定分類
       by_domain: 站點
       copied_msg: 成功將表情複製到本地
       copy: 複製
       copy_failed_msg: 無法將表情複製到本地
+      create_new_category: 建立新分類
       created_msg: 已新增表情符號!
       delete: 刪除
       destroyed_msg: 已刪除表情符號!
@@ -226,11 +258,13 @@ zh-TW:
       shortcode: 短代碼
       shortcode_hint: 至少 2 個字元，只能使用字母、數字和下劃線
       title: 自訂表情符號
+      uncategorized: 未分類
       unlisted: 已隱藏
       update_failed_msg: 無法更新表情符號
       updated_msg: 已更新表情符號!
       upload: 上傳新的表情符號
     dashboard:
+      authorized_fetch_mode: 安全模式
       backlog: 未處理工作數
       config: 設定
       feature_deletions: 帳戶刪除
@@ -238,9 +272,13 @@ zh-TW:
       feature_profile_directory: 個人資料目錄
       feature_registrations: 註冊
       feature_relay: 聯邦中繼站
+      feature_spam_check: 防垃圾訊息
+      feature_timeline_preview: 時間軸預覽
       features: 功能
       hidden_service: 與隱密服務互連
       open_reports: 待處理檢舉數
+      pending_tags: 等待審核的主題標籤
+      pending_users: 等待審核的使用者
       recent_users: 最近加入的使用者
       search: 全文搜尋
       single_user_mode: 單一使用者模式
@@ -252,6 +290,12 @@ zh-TW:
       week_interactions: 本週互動次數
       week_users_active: 本週活躍使用者數
       week_users_new: 本週新使用者數
+      whitelist_mode: 白名單模式
+    domain_allows:
+      add_new: 將網域加入白名單
+      created_msg: 網域已成功加入白名單
+      destroyed_msg: 網域已成功從白名單移除
+      undo: 從白名單移除
     domain_blocks:
       add_new: 新增欲封鎖域名
       created_msg: 正在進行站點封鎖
@@ -351,12 +395,23 @@ zh-TW:
       contact_information:
         email: 用於聯絡的公開電子信箱位址
         username: 請輸入使用者名稱
+      domain_blocks:
+        all: 給任何人
+        disabled: 給沒有人
+        title: 顯示封鎖的網域
+      enable_bootstrap_timeline_accounts:
+        title: 啟用新使用者的預設追蹤
       hero:
         desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會重設回伺服器預覽圖
         title: 主題圖片
       peers_api_enabled:
         desc_html: 本伺服器在聯邦中發現的站點
         title: 發布已知伺服器的列表
+      preview_sensitive_media:
+        title: 在 OpenGraph 預覽中顯示敏感媒體
+      profile_directory:
+        desc_html: 允許能探索使用者
+        title: 啟用個人資料目錄
       registrations:
         closed_message:
           desc_html: 關閉註冊時顯示在首頁的內容，可使用 HTML 標籤
@@ -367,6 +422,12 @@ zh-TW:
         min_invite_role:
           disabled: 沒有人
           title: 允許發送邀請的身份
+      registrations_mode:
+        modes:
+          approved: 註冊需要核准
+          none: 沒有人可註冊
+          open: 任何人皆能註冊
+        title: 註冊模式
       show_known_fediverse_at_about_page:
         desc_html: 如果開啟，就會在時間軸預覽顯示其他站點嘟文，否則就只會顯示本站點嘟文。
         title: 在時間軸預覽顯示其他站點嘟文
@@ -379,10 +440,14 @@ zh-TW:
       site_description_extended:
         desc_html: 可放置行為準則、規定以及其他此伺服器特有的內容。可使用 HTML 標籤
         title: 本站詳細資訊
+      site_short_description:
+        title: 伺服器短描述
       site_terms:
         desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
         title: 自訂使用條款
       site_title: 伺服器名稱
+      spam_check_enabled:
+        title: 自動防廣告訊息
       thumbnail:
         desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
         title: 伺服器縮圖
@@ -390,25 +455,44 @@ zh-TW:
         desc_html: 在主頁顯示本站時間軸
         title: 時間軸預覽
       title: 網站設定
+      trends:
+        title: 趨勢主題標籤
+    site_uploads:
+      delete: 刪除上傳的檔案
+      destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
       back_to_account: 返回帳戶訊息頁
       batch:
         delete: 刪除
         nsfw_off: 標記為非敏感內容
         nsfw_on: 標記為敏感內容
+      deleted: 已刪除
       failed_to_execute: 執行失敗
       media:
         title: 媒體檔案
       no_media: 不含媒體檔案
+      no_status_selected: 因未選擇嘟文而未變更。
       title: 帳戶嘟文
       with_media: 含有媒體檔案
     tags:
+      context: 上下文
+      directory: 在目錄中
+      in_directory: 目錄中有 %{count} 個
+      last_active: 上次活躍
+      most_popular: 最熱門
+      most_recent: 最近
       name: Hashtag
+      review: 審核嘟文
+      reviewed: 已審核
+      title: 主題標籤
+      trending_right_now: 最新趨勢
+      unique_uses_today: 今天嘟了 %{count} 則
+      unreviewed: 未審核
+      updated_msg: 成功更新主題標籤設定
     title: 管理介面
     warning_presets:
       add_new: 新增
       delete: 刪除
-      edit: 編輯
   admin_mailer:
     new_report:
       body: "%{reporter} 檢舉了使用者 %{target}"
@@ -455,6 +539,7 @@ zh-TW:
     set_new_password: 設定新密碼
   authorize_follow:
     already_following: 你已經關注了這個使用者
+    already_requested: 您早已向該帳戶寄送追蹤請求
     error: 對不起，搜尋其他站點使用者出現錯誤
     follow: 關注
     follow_request: 關注請求已經發送給：
@@ -655,6 +740,8 @@ zh-TW:
       description: 附件： %{attached}
     boosted_from_html: 轉嘟自 %{acct_link}
     content_warning: 內容警告： %{warning}
+    errors:
+      in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
     language_detection: 自動偵測語言
     open_in_web: 以網頁開啟
     over_character_limit: 超過了 %{max} 字的限制
diff --git a/config/routes.rb b/config/routes.rb
index c22efc1e1..49ab851e2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq/web'
+require 'sidekiq_unique_jobs/web'
 require 'sidekiq-scheduler/web'
 
 Sidekiq::Web.set :session_secret, Rails.application.secrets[:secret_key_base]
@@ -186,6 +186,7 @@ Rails.application.routes.draw do
     end
 
     resource :settings, only: [:edit, :update]
+    resources :site_uploads, only: [:destroy]
 
     resources :invites, only: [:index, :create, :destroy] do
       collection do
@@ -342,7 +343,7 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :media,        only: [:create, :update]
+      resources :media,        only: [:create, :update, :show]
       resources :blocks,       only: [:index]
       resources :mutes,        only: [:index]
       resources :favourites,   only: [:index]
@@ -454,6 +455,7 @@ Rails.application.routes.draw do
     end
 
     namespace :v2 do
+      resources :media, only: [:create]
       get '/search', to: 'search#index', as: :search
     end
 
diff --git a/config/webpack/development.js b/config/webpack/development.js
index 56f6e43f0..774ecbc07 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -54,7 +54,7 @@ module.exports = merge(sharedConfig, {
     watchOptions: Object.assign(
       {},
       settings.dev_server.watch_options,
-      watchOptions
+      watchOptions,
     ),
     writeToDisk: filePath => /ocr/.test(filePath),
   },
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index d5e399ced..81c02acd4 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -31,7 +31,7 @@ module.exports = {
     Object.keys(themes).reduce((themePaths, name) => {
       themePaths[name] = resolve(join(settings.source_path, themes[name]));
       return themePaths;
-    }, {})
+    }, {}),
   ),
 
   output: {
@@ -73,7 +73,7 @@ module.exports = {
         // temporary fix for https://github.com/ReactTraining/react-router/issues/5576
         // to reduce bundle size
         resource.request = resource.request.replace(/^history/, 'history/es');
-      }
+      },
     ),
     new MiniCssExtractPlugin({
       filename: 'css/[name]-[contenthash:8].css',
diff --git a/db/migrate/20191212163405_add_hide_collections_to_accounts.rb b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
new file mode 100644
index 000000000..fa99b32e5
--- /dev/null
+++ b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddHideCollectionsToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :hide_collections, :boolean
+  end
+end
diff --git a/db/migrate/20200306035625_add_processing_to_media_attachments.rb b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
new file mode 100644
index 000000000..131ffa52a
--- /dev/null
+++ b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
@@ -0,0 +1,5 @@
+class AddProcessingToMediaAttachments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :media_attachments, :processing, :integer
+  end
+end
diff --git a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
new file mode 100644
index 000000000..46a5350e7
--- /dev/null
+++ b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
@@ -0,0 +1,15 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddTitleToAccountWarningPresets < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :account_warning_presets, :title, :string, default: '', allow_null: false }
+  end
+
+  def down
+    remove_column :account_warning_presets, :title
+  end
+end
diff --git a/db/migrate/20200312162302_add_status_ids_to_announcements.rb b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
new file mode 100644
index 000000000..42aa6513d
--- /dev/null
+++ b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
@@ -0,0 +1,6 @@
+class AddStatusIdsToAnnouncements < ActiveRecord::Migration[5.2]
+  def change
+    add_column :announcements, :status_ids, :bigint, array: true
+  end
+end
+
diff --git a/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
new file mode 100644
index 000000000..03915040c
--- /dev/null
+++ b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
@@ -0,0 +1,5 @@
+class AddParentIdToEmailDomainBlocks < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :email_domain_blocks, :parent, null: true, default: nil, foreign_key: { on_delete: :cascade, to_table: :email_domain_blocks }, index: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b09ee0e76..021ddac89 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_01_26_203551) do
+ActiveRecord::Schema.define(version: 2020_03_12_185443) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -114,6 +114,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.text "text", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "title", default: "", null: false
   end
 
   create_table "account_warnings", force: :cascade do |t|
@@ -170,6 +171,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.datetime "silenced_at"
     t.datetime "suspended_at"
     t.integer "trust_level"
+    t.boolean "hide_collections"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
@@ -229,6 +231,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "published_at"
+    t.bigint "status_ids", array: true
   end
 
   create_table "backups", force: :cascade do |t|
@@ -334,6 +337,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.string "domain", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "parent_id"
     t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true
   end
 
@@ -459,6 +463,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.text "description"
     t.bigint "scheduled_status_id"
     t.string "blurhash"
+    t.integer "processing"
     t.index ["account_id"], name: "index_media_attachments_on_account_id"
     t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id"
     t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true
@@ -866,6 +871,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
   add_foreign_key "custom_filters", "accounts", on_delete: :cascade
+  add_foreign_key "email_domain_blocks", "email_domain_blocks", column: "parent_id", on_delete: :cascade
   add_foreign_key "favourites", "accounts", name: "fk_5eb6c2b873", on_delete: :cascade
   add_foreign_key "favourites", "statuses", name: "fk_b0e856845e", on_delete: :cascade
   add_foreign_key "featured_tags", "accounts", on_delete: :cascade
diff --git a/dist/nginx.conf b/dist/nginx.conf
index b6591e897..2d5f3a389 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -3,6 +3,14 @@ map $http_upgrade $connection_upgrade {
   ''      close;
 }
 
+upstream backend {
+    server 127.0.0.1:3000 fail_timeout=0;
+}
+
+upstream streaming {
+    server 127.0.0.1:4000 fail_timeout=0;
+}
+
 proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
 
 server {
@@ -69,7 +77,7 @@ server {
     proxy_set_header Proxy "";
     proxy_pass_header Server;
 
-    proxy_pass http://127.0.0.1:3000;
+    proxy_pass http://backend;
     proxy_buffering on;
     proxy_redirect off;
     proxy_http_version 1.1;
@@ -93,7 +101,7 @@ server {
     proxy_set_header X-Forwarded-Proto https;
     proxy_set_header Proxy "";
 
-    proxy_pass http://127.0.0.1:4000;
+    proxy_pass http://streaming;
     proxy_buffering off;
     proxy_redirect off;
     proxy_http_version 1.1;
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index d842b986f..08a8f1093 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -45,6 +45,7 @@ module Mastodon
     end
 
     option :start_after
+    option :prefix
     option :dry_run, type: :boolean, default: false
     desc 'remove-orphans', 'Scan storage and check for files that do not belong to existing media attachments'
     long_desc <<~LONG_DESC
@@ -58,6 +59,7 @@ module Mastodon
       reclaimed_bytes = 0
       removed         = 0
       dry_run         = options[:dry_run] ? ' (DRY RUN)' : ''
+      prefix          = options[:prefix]
 
       case Paperclip::Attachment.default_options[:storage]
       when :s3
@@ -69,7 +71,7 @@ module Mastodon
         loop do
           objects = begin
             begin
-              bucket.objects(start_after: last_key, prefix: 'media_attachments/files/').limit(1000).map { |x| x }
+              bucket.objects(start_after: last_key, prefix: prefix).limit(1000).map { |x| x }
             rescue => e
               progress.log(pastel.red("Error fetching list of files: #{e}"))
               progress.log("If you want to continue from this point, add --start-after=#{last_key} to your command") if last_key
@@ -79,16 +81,21 @@ module Mastodon
 
           break if objects.empty?
 
-          last_key        = objects.last.key
-          attachments_map = MediaAttachment.where(id: objects.map { |object| object.key.split('/')[2..-2].join.to_i }).each_with_object({}) { |attachment, map| map[attachment.id] = attachment }
+          last_key   = objects.last.key
+          record_map = preload_records_from_mixed_objects(objects)
 
           objects.each do |object|
-            attachment_id = object.key.split('/')[2..-2].join.to_i
-            filename      = object.key.split('/').last
+            path_segments   = object.key.split('/')
+            model_name      = path_segments.first.classify
+            attachment_name = path_segments[1].singularize
+            record_id       = path_segments[2..-2].join.to_i
+            file_name       = path_segments.last
+            record          = record_map.dig(model_name, record_id)
+            attachment      = record&.public_send(attachment_name)
 
             progress.increment
 
-            next unless attachments_map[attachment_id].nil? || !attachments_map[attachment_id].variant?(filename)
+            next unless attachment.blank? || !attachment.variant?(file_name)
 
             begin
               object.delete unless options[:dry_run]
@@ -108,19 +115,26 @@ module Mastodon
       when :filesystem
         require 'find'
 
-        root_path = ENV.fetch('RAILS_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
+        root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
 
-        Find.find(File.join(root_path, 'media_attachments', 'files')) do |path|
+        Find.find(File.join(*[root_path, prefix].compact)) do |path|
           next if File.directory?(path)
 
-          key           = path.gsub("#{root_path}#{File::SEPARATOR}", '')
-          attachment_id = key.split(File::SEPARATOR)[2..-2].join.to_i
-          filename      = key.split(File::SEPARATOR).last
-          attachment    = MediaAttachment.find_by(id: attachment_id)
+          key             = path.gsub("#{root_path}#{File::SEPARATOR}", '')
+          path_segments   = key.split(File::SEPARATOR)
+          model_name      = path_segments.first.classify
+          record_id       = path_segments[2..-2].join.to_i
+          attachment_name = path_segments[1].singularize
+          file_name       = path_segments.last
+
+          next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+
+          record     = model_name.constantize.find_by(id: record_id)
+          attachment = record&.public_send(attachment_name)
 
           progress.increment
 
-          next unless attachment.nil? || !attachment.variant?(filename)
+          next unless attachment.blank? || !attachment.variant?(file_name)
 
           begin
             size = File.size(path)
@@ -213,25 +227,66 @@ module Mastodon
       say("Settings:\t#{number_to_human_size(SiteUpload.sum(:file_file_size))}")
     end
 
-    desc 'lookup', 'Lookup where media is displayed by passing a media URL'
-    def lookup
-      prompt = TTY::Prompt.new
+    desc 'lookup URL', 'Lookup where media is displayed by passing a media URL'
+    def lookup(url)
+      path          = Addressable::URI.parse(url).path
+      path_segments = path.split('/')[2..-1]
+      model_name    = path_segments.first.classify
+      record_id     = path_segments[2..-2].join.to_i
 
-      url = prompt.ask('Please enter a URL to the media to lookup:', required: true)
+      unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+        say("Cannot find corresponding model: #{model_name}", :red)
+        exit(1)
+      end
 
-      attachment_id = url
-                      .split('/')[0..-2]
-                      .grep(/\A\d+\z/)
-                      .join('')
+      record = model_name.constantize.find_by(id: record_id)
+      record = record.status if record.respond_to?(:status)
 
-      if url.split('/')[0..-2].include? 'media_attachments'
-        model = MediaAttachment.find(attachment_id).status
-        prompt.say(ActivityPub::TagManager.instance.url_for(model))
-      elsif url.split('/')[0..-2].include? 'accounts'
-        model = Account.find(attachment_id)
-        prompt.say(ActivityPub::TagManager.instance.url_for(model))
-      else
-        prompt.say('Not found')
+      unless record
+        say('Cannot find corresponding record', :red)
+        exit(1)
+      end
+
+      display_url = ActivityPub::TagManager.instance.url_for(record)
+
+      if display_url.blank?
+        say('No public URL for this type of record', :red)
+        exit(1)
+      end
+
+      say(display_url, :blue)
+    rescue Addressable::URI::InvalidURIError
+      say('Invalid URL', :red)
+      exit(1)
+    end
+
+    private
+
+    PRELOAD_MODEL_WHITELIST = %w(
+      Account
+      Backup
+      CustomEmoji
+      Import
+      MediaAttachment
+      PreviewCard
+      SiteUpload
+    ).freeze
+
+    def preload_records_from_mixed_objects(objects)
+      preload_map = Hash.new { |hash, key| hash[key] = [] }
+
+      objects.map do |object|
+        segments   = object.key.split('/').first
+        model_name = segments.first.classify
+        record_id  = segments[2..-2].join.to_i
+
+        next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+
+        preload_map[model_name] << record_id
+      end
+
+      preload_map.each_with_object({}) do |(model_name, record_ids), model_map|
+        model_map[model_name] = model_name.constantize.where(id: record_ids).each_with_object({}) { |record, record_map| record_map[record.id] = record }
       end
     end
   end
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index f11d94a45..e9db9122f 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -14,7 +14,9 @@ def setup_redis_env_url(prefix = nil, defaults = true)
   ENV[prefix + 'REDIS_URL'] = if [password, host, port, db].all?(&:nil?)
                                 ENV['REDIS_URL']
                               else
-                                "redis://#{password.blank? ? '' : ":#{password}@"}#{host}:#{port}/#{db}"
+                                Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+                                  uri.password = password if password.present?
+                                end.normalize.to_str
                               end
 end
 
diff --git a/lib/mastodon/statuses_cli.rb b/lib/mastodon/statuses_cli.rb
index ecaac17e3..b9dccdd8a 100644
--- a/lib/mastodon/statuses_cli.rb
+++ b/lib/mastodon/statuses_cli.rb
@@ -14,6 +14,7 @@ module Mastodon
 
     option :days, type: :numeric, default: 90
     option :clean_followed, type: :boolean
+    option :skip_media_remove, type: :boolean
     desc 'remove', 'Remove unreferenced statuses'
     long_desc <<~LONG_DESC
       Remove statuses that are not referenced by local user activity, such as
@@ -58,9 +59,10 @@ module Mastodon
 
       scope.in_batches.delete_all
 
-      say('Beginning removal of now-orphaned media attachments to free up disk space...')
-
-      Scheduler::MediaCleanupScheduler.new.perform
+      unless options[:skip_media_remove]
+        say('Beginning removal of now-orphaned media attachments to free up disk space...')
+        Scheduler::MediaCleanupScheduler.new.perform
+      end
 
       say("Done after #{Time.now.to_f - start_at}s", :green)
     ensure
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index ed8bc96cd..00ac7753f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      2
+      3
     end
 
     def flags
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
new file mode 100644
index 000000000..d9ec0159a
--- /dev/null
+++ b/lib/paperclip/attachment_extensions.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Paperclip
+  module AttachmentExtensions
+    # We overwrite this method to support delayed processing in
+    # Sidekiq. Since we process the original file to reduce disk
+    # usage, and we still want to generate thumbnails straight
+    # away, it's the only style we need to exclude
+    def process_style?(style_name, style_args)
+      if style_name == :original && instance.respond_to?(:delay_processing?) && instance.delay_processing?
+        false
+      else
+        style_args.empty? || style_args.include?(style_name)
+      end
+    end
+
+    def reprocess_original!
+      old_original_path = path(:original)
+      reprocess!(:original)
+      new_original_path = path(:original)
+
+      if new_original_path != old_original_path
+        @queued_for_delete << old_original_path
+        flush_deletes
+      end
+    end
+
+    def variant?(other_filename)
+      return true  if original_filename == other_filename
+      return false if original_filename.nil?
+
+      formats = styles.values.map(&:format).compact
+
+      return false if formats.empty?
+
+      other_extension = File.extname(other_filename)
+
+      formats.include?(other_extension.delete('.')) && File.basename(other_filename, other_extension) == File.basename(original_filename, File.extname(original_filename))
+    end
+  end
+end
+
+Paperclip::Attachment.prepend(Paperclip::AttachmentExtensions)
diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb
new file mode 100644
index 000000000..1079efdbc
--- /dev/null
+++ b/lib/paperclip/url_generator_extensions.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Paperclip
+  module UrlGeneratorExtensions
+    # Monkey-patch Paperclip to use Addressable::URI's normalization instead
+    # of the long-deprecated URI.esacpe
+    def escape_url(url)
+      if url.respond_to?(:escape)
+        url.escape
+      else
+        Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
+      end
+    end
+  end
+end
+
+Paperclip::UrlGenerator.prepend(Paperclip::UrlGeneratorExtensions)
diff --git a/lib/paperclip/video_transcoder.rb b/lib/paperclip/video_transcoder.rb
index 66f7feda5..4d9544231 100644
--- a/lib/paperclip/video_transcoder.rb
+++ b/lib/paperclip/video_transcoder.rb
@@ -5,12 +5,22 @@ module Paperclip
   # to check when uploaded videos are actually gifv's
   class VideoTranscoder < Paperclip::Processor
     def make
-      meta = ::Av.cli.identify(@file.path)
+      movie = FFMPEG::Movie.new(@file.path)
 
-      attachment.instance.type = MediaAttachment.types[:gifv] unless meta[:audio_encode]
-      options[:format] = File.extname(attachment.instance.file_file_name)[1..-1] if options[:keep_same_format]
+      attachment.instance.type = MediaAttachment.types[:gifv] unless movie.audio_codec
 
-      Paperclip::Transcoder.make(file, options, attachment)
+      Paperclip::Transcoder.make(file, actual_options(movie), attachment)
+    end
+
+    private
+
+    def actual_options(movie)
+      opts = options[:passthrough_options]
+      if opts && opts[:video_codecs].include?(movie.video_codec) && opts[:audio_codecs].include?(movie.audio_codec) && opts[:colorspaces].include?(movie.colorspace)
+        opts[:options]
+      else
+        options
+      end
     end
   end
 end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 2e92e8ded..a873335d4 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -336,7 +336,20 @@ namespace :mastodon do
       if prompt.yes?('Save configuration?')
         cmd = TTY::Command.new(printer: :quiet)
 
-        File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env.each_pair.map { |key, value| "#{key}=#{value}" }.join("\n") + "\n")
+        env_contents = env.each_pair.map do |key, value|
+          if value.is_a?(String) && value =~ /[\s\#\\"]/
+            if value =~ /[']/
+              value = value.to_s.gsub(/[\\"\$]/) { |x| "\\#{x}" }
+              "#{key}=\"#{value}\""
+            else
+              "#{key}='#{value}'"
+            end
+          else
+            "#{key}=#{value}"
+          end
+        end.join("\n")
+
+        File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env_contents + "\n")
 
         if using_docker
           prompt.ok 'Below is your configuration, save it to an .env.production file outside Docker:'
diff --git a/package.json b/package.json
index 1a873615d..c9927bb47 100644
--- a/package.json
+++ b/package.json
@@ -59,23 +59,24 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.8.4",
+    "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-transform-react-inline-elements": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "@babel/runtime": "^7.8.3",
+    "@babel/plugin-transform-react-inline-elements": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.9.4",
+    "@babel/runtime": "^7.8.4",
     "@clusterws/cws": "^0.17.3",
     "@gamestdio/websocket": "^0.3.2",
+    "@rails/ujs": "^6.0.2",
     "array-includes": "^3.1.1",
     "arrow-key-navigation": "^1.1.0",
-    "autoprefixer": "^9.7.4",
+    "autoprefixer": "^9.7.5",
     "axios": "^0.19.2",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.1.0",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^4.0.0",
+    "babel-plugin-preval": "^5.0.0",
     "babel-plugin-react-intl": "^3.4.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
@@ -83,7 +84,7 @@
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^3.1.0",
     "copy-webpack-plugin": "^5.1.1",
-    "cross-env": "^6.0.3",
+    "cross-env": "^7.0.2",
     "css-loader": "^3.4.2",
     "cssnano": "^4.1.10",
     "detect-passive-events": "^1.0.2",
@@ -93,7 +94,7 @@
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
     "express": "^4.17.1",
-    "file-loader": "^5.0.2",
+    "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.6",
     "history": "^4.10.1",
@@ -110,7 +111,7 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.1",
     "mini-css-extract-plugin": "^0.9.0",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.3",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
@@ -123,11 +124,10 @@
     "promise.prototype.finally": "^3.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "rails-ujs": "^5.2.4",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.0",
     "react-hotkeys": "^1.1.4",
-    "react-immutable-proptypes": "^2.1.0",
+    "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.9.0",
     "react-masonry-infinite": "^1.2.2",
@@ -138,12 +138,12 @@
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^3.0.8",
+    "react-select": "^3.1.0",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.9",
     "react-textarea-autosize": "^7.1.2",
     "react-toggle": "^4.1.1",
-    "redis": "^2.7.1",
+    "redis": "^3.0.2",
     "redux": "^4.0.5",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
@@ -151,40 +151,43 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.25.0",
+    "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "stacktrace-js": "^2.0.2",
-    "stringz": "^2.0.0",
+    "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
     "terser-webpack-plugin": "^2.3.5",
     "tesseract.js": "^2.0.0-alpha.16",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^3.4.0",
+    "uuid": "^7.0.2",
     "wavesurfer.js": "^3.3.1",
-    "webpack": "^4.41.5",
+    "webpack": "^4.42.1",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.6.0",
+    "webpack-bundle-analyzer": "^3.6.1",
     "webpack-cli": "^3.3.11",
     "webpack-merge": "^4.2.1",
-    "wicg-inert": "^3.0.0"
+    "wicg-inert": "^3.0.2"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^25.2.4",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
     "eslint-plugin-import": "~2.20.1",
     "eslint-plugin-jsx-a11y": "~6.2.3",
     "eslint-plugin-promise": "~4.2.1",
-    "eslint-plugin-react": "~7.17.0",
+    "eslint-plugin-react": "~7.19.0",
     "jest": "^24.9.0",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.13.0",
     "sass-lint": "^1.13.1",
-    "webpack-dev-server": "^3.10.1",
-    "yargs": "^15.1.0"
+    "webpack-dev-server": "^3.10.3",
+    "yargs": "^15.3.1"
+  },
+  "resolutions": {
+    "kind-of": "^6.0.3"
   }
 }
diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb
index ac15499be..9a93e1ebe 100644
--- a/spec/controllers/account_follow_controller_spec.rb
+++ b/spec/controllers/account_follow_controller_spec.rb
@@ -25,7 +25,7 @@ describe AccountFollowController do
       sign_in(user)
       subject
 
-      expect(service).to have_received(:call).with(user.account, 'alice')
+      expect(service).to have_received(:call).with(user.account, alice, with_rate_limit: true)
       expect(response).to redirect_to(account_path(alice))
     end
   end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index b428299ee..49d3e9707 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -46,6 +46,26 @@ describe Admin::ReportsController do
     end
   end
 
+  describe 'POST #resolve' do
+    it 'resolves the report' do
+      report = Fabricate(:report)
+
+      put :resolve, params: { id: report }
+      expect(response).to redirect_to(admin_reports_path)
+      report.reload
+      expect(report.action_taken_by_account).to eq user.account
+      expect(report.action_taken).to eq true
+    end
+
+    it 'sets trust level when the report is an antispam one' do
+      report = Fabricate(:report, account: Account.representative)
+
+      put :resolve, params: { id: report }
+      report.reload
+      expect(report.target_account.trust_level).to eq Account::TRUST_LEVELS[:trusted]
+    end
+  end
+
   describe 'POST #reopen' do
     it 'reopens the report' do
       report = Fabricate(:report)
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index 9ff5fcd3b..df8037038 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -39,12 +39,50 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
     describe 'POST #create' do
       let(:scopes) { 'write:statuses' }
 
-      before do
-        post :create, params: { status: 'Hello world' }
+      context do
+        before do
+          post :create, params: { status: 'Hello world' }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
       end
 
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
+      context 'with missing parameters' do
+        before do
+          post :create, params: {}
+        end
+
+        it 'returns http unprocessable entity' do
+          expect(response).to have_http_status(422)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+        end
+      end
+
+      context 'when exceeding rate limit' do
+        before do
+          rate_limiter = RateLimiter.new(user.account, family: :statuses)
+          300.times { rate_limiter.record! }
+          post :create, params: { status: 'Hello world' }
+        end
+
+        it 'returns http too many requests' do
+          expect(response).to have_http_status(429)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq '0'
+        end
       end
     end
 
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index 3202167ca..b6de3e9d1 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -39,7 +39,7 @@ feature 'Profile' do
     visit settings_profile_path
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
-    click_on 'Save changes'
+    first('.btn[type=submit]').click
     is_expected.to have_content 'Changes successfully saved!'
 
     # View my own public profile and see the changes
diff --git a/spec/helpers/admin/action_log_helper_spec.rb b/spec/helpers/admin/action_log_helper_spec.rb
index d7af6b939..60f5ecdcc 100644
--- a/spec/helpers/admin/action_log_helper_spec.rb
+++ b/spec/helpers/admin/action_log_helper_spec.rb
@@ -31,242 +31,4 @@ RSpec.describe Admin::ActionLogsHelper, type: :helper do
       end
     end
   end
-
-  describe '#relevant_log_changes' do
-    let(:log) { double(target_type: target_type, action: log_action, recorded_changes: recorded_changes) }
-    let(:recorded_changes) { double }
-
-    after do
-      hoge.relevant_log_changes(log)
-    end
-
-    context "log.target_type == 'CustomEmoji' && [:enable, :disable, :destroy].include?(log.action)" do
-      let(:target_type) { 'CustomEmoji' }
-      let(:log_action)  { :enable }
-
-      it "calls log.recorded_changes.slice('domain')" do
-        expect(recorded_changes).to receive(:slice).with('domain')
-      end
-    end
-
-    context "log.target_type == 'CustomEmoji' && log.action == :update" do
-      let(:target_type) { 'CustomEmoji' }
-      let(:log_action)  { :update }
-
-      it "calls log.recorded_changes.slice('domain', 'visible_in_picker')" do
-        expect(recorded_changes).to receive(:slice).with('domain', 'visible_in_picker')
-      end
-    end
-
-    context "log.target_type == 'User' && [:promote, :demote].include?(log.action)" do
-      let(:target_type) { 'User' }
-      let(:log_action)  { :promote }
-
-      it "calls log.recorded_changes.slice('moderator', 'admin')" do
-        expect(recorded_changes).to receive(:slice).with('moderator', 'admin')
-      end
-    end
-
-    context "log.target_type == 'User' && [:change_email].include?(log.action)" do
-      let(:target_type) { 'User' }
-      let(:log_action)  { :change_email }
-
-      it "calls log.recorded_changes.slice('email', 'unconfirmed_email')" do
-        expect(recorded_changes).to receive(:slice).with('email', 'unconfirmed_email')
-      end
-    end
-
-    context "log.target_type == 'DomainBlock'" do
-      let(:target_type) { 'DomainBlock' }
-      let(:log_action)  { nil }
-
-      it "calls log.recorded_changes.slice('severity', 'reject_media')" do
-        expect(recorded_changes).to receive(:slice).with('severity', 'reject_media')
-      end
-    end
-
-    context "log.target_type == 'Status' && log.action == :update" do
-      let(:target_type) { 'Status' }
-      let(:log_action)  { :update }
-
-      it "log.recorded_changes.slice('sensitive')" do
-        expect(recorded_changes).to receive(:slice).with('sensitive')
-      end
-    end
-  end
-
-  describe '#log_extra_attributes' do
-    after do
-      hoge.log_extra_attributes(hoge: 'hoge')
-    end
-
-    it "calls content_tag(:span, key, class: 'diff-key')" do
-      allow(hoge).to receive(:log_change).with(anything)
-      expect(hoge).to receive(:content_tag).with(:span, :hoge, class: 'diff-key')
-    end
-
-    it 'calls safe_join twice' do
-      expect(hoge).to receive(:safe_join).with(
-        ['<span class="diff-key">hoge</span>',
-         '=',
-         '<span class="diff-neutral">hoge</span>']
-      )
-
-      expect(hoge).to receive(:safe_join).with([nil], ' ')
-    end
-  end
-
-  describe '#log_change' do
-    after do
-      hoge.log_change(val)
-    end
-
-    context '!val.is_a?(Array)' do
-      let(:val) { 'hoge' }
-
-      it "calls content_tag(:span, val, class: 'diff-neutral')" do
-        expect(hoge).to receive(:content_tag).with(:span, val, class: 'diff-neutral')
-      end
-    end
-
-    context 'val.is_a?(Array)' do
-      let(:val) { %w(foo bar) }
-
-      it 'calls #content_tag twice and #safe_join' do
-        expect(hoge).to receive(:content_tag).with(:span, 'foo', class: 'diff-old')
-        expect(hoge).to receive(:content_tag).with(:span, 'bar', class: 'diff-new')
-        expect(hoge).to receive(:safe_join).with([nil, nil], '→')
-      end
-    end
-  end
-
-  describe '#icon_for_log' do
-    subject   { hoge.icon_for_log(log) }
-
-    context "log.target_type == 'Account'" do
-      let(:log) { double(target_type: 'Account') }
-
-      it 'returns "user"' do
-        expect(subject).to be 'user'
-      end
-    end
-
-    context "log.target_type == 'User'" do
-      let(:log) { double(target_type: 'User') }
-
-      it 'returns "user"' do
-        expect(subject).to be 'user'
-      end
-    end
-
-    context "log.target_type == 'CustomEmoji'" do
-      let(:log) { double(target_type: 'CustomEmoji') }
-
-      it 'returns "file"' do
-        expect(subject).to be 'file'
-      end
-    end
-
-    context "log.target_type == 'Report'" do
-      let(:log) { double(target_type: 'Report') }
-
-      it 'returns "flag"' do
-        expect(subject).to be 'flag'
-      end
-    end
-
-    context "log.target_type == 'DomainBlock'" do
-      let(:log) { double(target_type: 'DomainBlock') }
-
-      it 'returns "lock"' do
-        expect(subject).to be 'lock'
-      end
-    end
-
-    context "log.target_type == 'EmailDomainBlock'" do
-      let(:log) { double(target_type: 'EmailDomainBlock') }
-
-      it 'returns "envelope"' do
-        expect(subject).to be 'envelope'
-      end
-    end
-
-    context "log.target_type == 'Status'" do
-      let(:log) { double(target_type: 'Status') }
-
-      it 'returns "pencil"' do
-        expect(subject).to be 'pencil'
-      end
-    end
-  end
-
-  describe '#class_for_log_icon' do
-    subject   { hoge.class_for_log_icon(log) }
-
-    %i(enable unsuspend unsilence confirm promote resolve).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-    end
-
-    context 'log.action == :create' do
-      context 'opposite_verbs?(log)' do
-        let(:log) { double(action: :create, target_type: 'DomainBlock') }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-
-      context '!opposite_verbs?(log)' do
-        let(:log) { double(action: :create, target_type: '') }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-    end
-
-    %i(update reset_password disable_2fa memorialize change_email).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "neutral"' do
-          expect(subject).to be 'neutral'
-        end
-      end
-    end
-
-    %i(demote silence disable suspend remove_avatar remove_header reopen).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-    end
-
-    context 'log.action == :destroy' do
-      context 'opposite_verbs?(log)' do
-        let(:log) { double(action: :destroy, target_type: 'DomainBlock') }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-
-      context '!opposite_verbs?(log)' do
-        let(:log) { double(action: :destroy, target_type: '') }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-    end
-  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6fbceca53..40ddf1f95 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -15,7 +15,7 @@ ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!(allow: Chewy.settings[:host])
 Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
 Sidekiq::Testing.inline!
-Sidekiq::Logging.logger = nil
+Sidekiq.logger = nil
 
 Devise::Test::ControllerHelpers.module_eval do
   alias_method :original_sign_in, :sign_in
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 5355133f4..7618e9076 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -91,10 +91,6 @@ RSpec.describe ImportService, type: :service do
 
     let(:csv) { attachment_fixture('mute-imports.txt') }
 
-    before do
-      allow(NotificationWorker).to receive(:perform_async)
-    end
-
     describe 'when no accounts are followed' do
       let(:import) { Import.create(account: account, type: 'following', data: csv) }
       it 'follows the listed accounts, including boosts' do
@@ -135,10 +131,6 @@ RSpec.describe ImportService, type: :service do
 
     let(:csv) { attachment_fixture('new-following-imports.txt') }
 
-    before do
-      allow(NotificationWorker).to receive(:perform_async)
-    end
-
     describe 'when no accounts are followed' do
       let(:import) { Import.create(account: account, type: 'following', data: csv) }
       it 'follows the listed accounts, respecting boosts' do
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 025a3da40..147a59fc3 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -79,6 +79,13 @@ RSpec.describe PostStatusService, type: :service do
     expect(status.spoiler_text).to eq spoiler_text
   end
 
+  it 'creates a sensitive status when there is a CW but no text' do
+    status = subject.call(Fabricate(:account), text: '', spoiler_text: 'foo')
+
+    expect(status).to be_persisted
+    expect(status).to be_sensitive
+  end
+
   it 'creates a status with empty default spoiler text' do
     status = create_status_with_options(spoiler_text: nil)
 
diff --git a/yarn.lock b/yarn.lock
index 8814eb961..6018c5859 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,42 +9,43 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.0", "@babel/compat-data@^7.8.1":
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.1.tgz#fc0bbbb7991e4fb2b47e168e60f2cc2c41680be9"
-  integrity sha512-Z+6ZOXvyOWYxJ50BwxzdhRnRsGST8Y3jaZgxYig575lTjVSs3KtJnmESwZegg6e2Dn0td1eDhoWlp1wI4BTCPw==
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
   dependencies:
-    browserslist "^4.8.2"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
-  integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
+"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.4"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
+    json5 "^2.1.2"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
-  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
+"@babel/generator@^7.0.0", "@babel/generator@^7.9.0":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.3.tgz#7c8b2956c6f68b3ab732bd16305916fbba521d94"
+  integrity sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.9.0"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -64,32 +65,32 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6"
-  integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==
+"@babel/helper-builder-react-jsx-experimental@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz#066d80262ade488f9c1b1823ce5db88a4cedaa43"
+  integrity sha512-3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ==
   dependencies:
-    "@babel/types" "^7.8.3"
-    esutils "^2.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-builder-react-jsx@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
+  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-compilation-targets@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.3.tgz#2deedc816fd41dca7355ef39fd40c9ea69f0719a"
-  integrity sha512-JLylPCsFjhLN+6uBSSh3iYdxKdeO9MNmoY96PE/99d8kyBFaXLORtAVhqN6iHa+wtPeqxKLghDOZry0+Aiw9Tw==
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
-    "@babel/compat-data" "^7.8.1"
-    browserslist "^4.8.2"
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
-    levenary "^1.1.0"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.8.3":
@@ -112,6 +113,15 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.6.0"
 
+"@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
@@ -166,16 +176,17 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590"
-  integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-simple-access" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
@@ -218,6 +229,16 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
@@ -233,6 +254,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
+  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -243,14 +269,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
-  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
   dependencies:
     "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
 
 "@babel/highlight@^7.8.3":
   version "7.8.3"
@@ -261,10 +287,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
-  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.3.tgz#043a5fc2ad8b7ea9facddc4e802a1f0f25da7255"
+  integrity sha512-E6SpIDJZ0cZAKoCNk+qSDd0ChfTnpiJN9FfNf3RZ20dzwA2vL2oq5IX1XTVT+4vDmRlta2nGk5HGMMskJAR+4A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -316,10 +342,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.8.3":
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb"
-  integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f"
+  integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -332,20 +366,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"
-  integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
-  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
@@ -355,6 +389,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-bigint@^7.0.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-decorators@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
@@ -390,6 +431,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
@@ -449,17 +497,17 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"
-  integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==
+"@babel/plugin-transform-classes@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d"
+  integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
@@ -477,7 +525,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -500,10 +548,10 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.3.tgz#15f17bce2fc95c7d59a24b299e83e81cedc22e18"
-  integrity sha512-ZjXznLNTxhpf4Q5q3x1NsngzGA38t9naWH8Gt+0qYZEJAcvPI9waSStSh56u19Ofjr7QmD0wUsQ8hw8s/p1VnA==
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -529,41 +577,41 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5"
-  integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==
+"@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5"
-  integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"
-  integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a"
-  integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
@@ -588,12 +636,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.3.tgz#7890576a13b17325d8b7d44cb37f21dc3bbdda59"
-  integrity sha512-/pqngtGb54JwMBZ6S/D3XYylQDFtGjWrnoCF4gXZOUpFV/ujbxnoNGNvDGu6doFWRPBveE72qTx/RRU44j5I/Q==
+"@babel/plugin-transform-parameters@^7.8.7":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a"
+  integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -611,45 +658,55 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-inline-elements@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.8.3.tgz#fc234d02a35bb188ee3f933d068824e067e42b23"
-  integrity sha512-CGKUlW3vtgk6YYrIMyfpohmmpILnaeFwszqwTIcem2LQkK1qWJj5w2yTZ7LJr2IR8F0XQ60AZoM8jgAB4zpxCg==
+"@babel/plugin-transform-react-inline-elements@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.9.0.tgz#19a39843431803765c9976132198bd8dee3d8058"
+  integrity sha512-iqqKXtOfVZpbgJ+9D4TG+JO/vgxa29FlpPUSIATzIcopKMUd3/bdwIjrrEneNp+SeiJs74nqKfUFYAUPDEu/qw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702"
-  integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==
+"@babel/plugin-transform-react-jsx-development@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
+  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+  dependencies:
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
+
+"@babel/plugin-transform-react-jsx-self@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
+  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0"
-  integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==
+"@babel/plugin-transform-react-jsx-source@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
+  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a"
-  integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==
+"@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
+  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -658,10 +715,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
-  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -698,10 +755,10 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.3.tgz#5cffb216fb25c8c64ba6bf5f76ce49d3ab079f4d"
-  integrity sha512-3TrkKd4LPqm4jHs6nPtSDI/SV9Cm5PRJkHLUgTcqRQQTMAZ44ZaAdDZJtvWFSaRcvT0a1rTmJ5ZA5tDKjleF3g==
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -713,27 +770,29 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.3.tgz#dc0fb2938f52bbddd79b3c861a4b3427dd3a6c54"
-  integrity sha512-Rs4RPL2KjSLSE2mWAx5/iCH+GC1ikKdxPrhnRS6PfFVaiZeom22VFKN4X8ZthyN61kAaR05tfXTbCvatl9WIQg==
+"@babel/preset-env@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
+  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
   dependencies:
-    "@babel/compat-data" "^7.8.0"
-    "@babel/helper-compilation-targets" "^7.8.3"
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
     "@babel/plugin-proposal-dynamic-import" "^7.8.3"
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
@@ -742,50 +801,71 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.0"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
     "@babel/plugin-transform-destructuring" "^7.8.3"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
     "@babel/plugin-transform-sticky-regex" "^7.8.3"
     "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    browserslist "^4.8.2"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.0"
+    browserslist "^4.9.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
-    levenary "^1.1.0"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-react@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2"
-  integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/preset-react@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
+  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-self" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-source" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+
+"@babel/runtime-corejs3@^7.8.3":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c"
+  integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==
+  dependencies:
+    core-js-pure "^3.0.0"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@7.0.0":
   version "7.0.0"
@@ -801,43 +881,43 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
-  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
+"@babel/template@^7.0.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
-  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
+  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
+    "@babel/generator" "^7.9.0"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.3.0", "@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
+  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
   dependencies:
-    esutils "^2.0.2"
+    "@babel/helper-validator-identifier" "^7.9.0"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -936,6 +1016,21 @@
   resolved "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz#321ba0976ee30fd14e51dbf8faa85ce7b325f76a"
   integrity sha512-J3n5SKim+ZoLbe44hRGI/VYAwSMCeIJuBy+FfP6EZaujEpNchPRFcIsVQLWAwpU1bP2Ji63rC+rEUOd1vjUB6Q==
 
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
+  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -1093,6 +1188,28 @@
     source-map "^0.6.1"
     write-file-atomic "2.4.1"
 
+"@jest/transform@^25.2.4":
+  version "25.2.4"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.4.tgz#34336f37f13f62f7d1f5b93d5d150ba9eb3e11b9"
+  integrity sha512-6eRigvb+G6bs4kW5j1/y8wu4nCrmVuIe0epPBbiWaYlwawJ8yi1EIyK3d/btDqmBpN5GpN4YhR6iPPnDmkYdTA==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^25.2.3"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^3.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-haste-map "^25.2.3"
+    jest-regex-util "^25.2.1"
+    jest-util "^25.2.3"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    realpath-native "^2.0.0"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
@@ -1102,6 +1219,21 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jest/types@^25.2.3":
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6"
+  integrity sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
+"@rails/ujs@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.2.tgz#8d32452d51c5e115374a218fb5475803dc17f4c0"
+  integrity sha512-KSQjJG8yzSWC1IT+UtFQglefABU37hpJ7uAz39K1/iWtoaJaI9ydGIaxxpJBT/PmYv4kS6lCSjXq13DELeJocw==
+
 "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.2":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
@@ -1218,150 +1350,156 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+"@types/yargs@^15.0.0":
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
+  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@types/yargs-parser" "*"
 
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
 
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
 
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -1412,11 +1550,16 @@ acorn-jsx@^5.1.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn-walk@^6.0.1, acorn-walk@^6.1.1:
+acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
+acorn-walk@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -1427,15 +1570,15 @@ acorn@^5.5.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
   integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.0, acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 aggregate-error@^3.0.0:
   version "3.0.1"
@@ -1494,6 +1637,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -1571,6 +1724,14 @@ ansi-styles@^4.0.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1587,6 +1748,14 @@ anymatch@^3.0.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1773,18 +1942,18 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.7.4:
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
-  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
+autoprefixer@^9.7.5:
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376"
+  integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==
   dependencies:
-    browserslist "^4.8.3"
-    caniuse-lite "^1.0.30001020"
+    browserslist "^4.11.0"
+    caniuse-lite "^1.0.30001036"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.26"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.27"
+    postcss-value-parser "^4.0.3"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1843,15 +2012,29 @@ babel-jest@^24.9.0:
     chalk "^2.4.2"
     slash "^2.0.0"
 
-babel-loader@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
-  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+babel-jest@^25.2.4:
+  version "25.2.4"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.4.tgz#b21b68d3af8f161c3e6e501e91f0dea8e652e344"
+  integrity sha512-+yDzlyJVWrqih9i2Cvjpt7COaN8vUwCsKGtxJLzg6I0xhxD54K8mvDUCliPKLufyzHh/c5C4MRj4Vk7VMjOjIg==
   dependencies:
-    find-cache-dir "^2.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
+    "@jest/transform" "^25.2.4"
+    "@jest/types" "^25.2.3"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^25.2.1"
+    chalk "^3.0.0"
+    slash "^3.0.0"
+
+babel-loader@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  dependencies:
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
     pify "^4.0.1"
+    schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
@@ -1885,6 +2068,17 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.0.0"
     test-exclude "^5.0.0"
 
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
 babel-plugin-jest-hoist@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
@@ -1892,6 +2086,13 @@ babel-plugin-jest-hoist@^24.9.0:
   dependencies:
     "@types/babel__traverse" "^7.0.6"
 
+babel-plugin-jest-hoist@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.1.tgz#d0003a1f3d5caa281e1107fe03bbf16b799f9955"
+  integrity sha512-HysbCQfJhxLlyxDbKcB2ucGYV0LjqK4h6dBoI3RtFuOxTiTWK6XGZMsHb0tGh8iJdV4hC6Z2GCHzVvDeh9i0lQ==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"
+
 babel-plugin-lodash@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
@@ -1903,22 +2104,22 @@ babel-plugin-lodash@^3.3.4:
     lodash "^4.17.10"
     require-package-name "^2.0.1"
 
-babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.2.tgz#98ae30a02645dfa8033628fe613854ec9541bbc8"
-  integrity sha512-Ntviq8paRTkXIxvrJBauib+2KqQbZQuh4593CEZFF8qz3IVP8VituTZmkGe6N7rsuiOIbejxXj6kx3LMlEq0UA==
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
+  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
   dependencies:
     "@babel/runtime" "^7.7.2"
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-preval@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-4.0.0.tgz#edb8501167985752aafcc31086791e1314052e9d"
-  integrity sha512-fZI/4cYneinlj2k/FsXw0/lTWSC5KKoepUueS1g25Gb5vx3GrRyaVwxWCshYqx11GEU4mZnbbFhee8vpquFS2w==
+babel-plugin-preval@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz#6cabb947ecc241664966e1f99eb56a3b4bb63d1e"
+  integrity sha512-8DqJq6/LPUjSZ0Qq6bVIFpsj2flCEE0Cbnbut9TvGU6jP9g3dOWEXtQ/sdvsA9d6souza8eNGh04WRXpuH9ThA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    babel-plugin-macros "^2.6.1"
+    "@babel/runtime" "^7.9.2"
+    babel-plugin-macros "^2.8.0"
     require-from-string "^2.0.2"
 
 babel-plugin-react-intl@^3.4.1:
@@ -1950,6 +2151,15 @@ babel-preset-jest@^24.9.0:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
     babel-plugin-jest-hoist "^24.9.0"
 
+babel-preset-jest@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2"
+  integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A==
+  dependencies:
+    "@babel/plugin-syntax-bigint" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^25.2.1"
+
 babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -2100,7 +2310,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2:
+braces@^3.0.1, braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2190,14 +2400,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.8.2, browserslist@^4.8.3:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
-  integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
+browserslist@^4.0.0, browserslist@^4.11.0, browserslist@^4.8.3, browserslist@^4.9.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
+  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
   dependencies:
-    caniuse-lite "^1.0.30001017"
-    electron-to-chromium "^1.3.322"
-    node-releases "^1.1.44"
+    caniuse-lite "^1.0.30001038"
+    electron-to-chromium "^1.3.390"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -2366,10 +2577,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020:
-  version "1.0.30001021"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254"
-  integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038:
+  version "1.0.30001038"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff"
+  integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -2403,6 +2614,19 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2648,12 +2872,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9"
-  integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==
-
-commander@~2.20.3:
+commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2814,6 +3033,11 @@ core-js-compat@^3.6.2:
     browserslist "^4.8.3"
     semver "7.0.0"
 
+core-js-pure@^3.0.0:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
+  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
+
 core-js@^2.4.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042"
@@ -2886,12 +3110,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+cross-env@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
+  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.1"
 
 cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
@@ -2904,7 +3128,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
   integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
@@ -3161,6 +3385,11 @@ csstype@^2.5.7:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"
   integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==
 
+csstype@^2.6.7:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
+  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -3325,6 +3554,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+denque@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3443,6 +3677,14 @@ dom-helpers@^3.2.1, dom-helpers@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
+dom-helpers@^5.0.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
+  integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+  dependencies:
+    "@babel/runtime" "^7.6.3"
+    csstype "^2.6.7"
+
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -3516,11 +3758,6 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-double-ended-queue@^2.1.0-0:
-  version "2.1.0-0"
-  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -3554,10 +3791,10 @@ ejs@^2.3.4, ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
   integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
 
-electron-to-chromium@^1.3.322:
-  version "1.3.322"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
-  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
+electron-to-chromium@^1.3.390:
+  version "1.3.391"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.391.tgz#9b7ee2f387814ad7d37addaafe41c8f4c4498d24"
+  integrity sha512-WOi6loSnDmfICOqGRrgeK7bZeWDAbGjCptDhI5eyJAqSzWfoeRuOOU1rOTZRL29/9AaxTndZB6Uh8YrxRfZJqw==
 
 elliptic@^6.0.0:
   version "6.5.1"
@@ -3591,6 +3828,11 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3701,7 +3943,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.13.0, es-abstract@^1.15.0, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.5.1:
+es-abstract@^1.13.0, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.5.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
   integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
@@ -3859,11 +4101,6 @@ eslint-module-utils@^2.4.1:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-eslint-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
-  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
-
 eslint-plugin-import@~2.20.1:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
@@ -3902,21 +4139,23 @@ eslint-plugin-promise@~4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
   integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
-eslint-plugin-react@~7.17.0:
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
-  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
+eslint-plugin-react@~7.19.0:
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
+  integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     doctrine "^2.1.0"
-    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
     jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.0"
-    object.fromentries "^2.0.1"
-    object.values "^1.1.0"
+    object.entries "^1.1.1"
+    object.fromentries "^2.0.2"
+    object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.13.1"
+    resolve "^1.15.1"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.2"
+    xregexp "^4.3.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -4074,7 +4313,7 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-esutils@^2.0.0, esutils@^2.0.2:
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -4283,6 +4522,11 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -4349,12 +4593,12 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa"
-  integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg==
+file-loader@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz#cb56c070efc0e40666424309bd0d9e45ac6f2bb8"
+  integrity sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==
   dependencies:
-    loader-utils "^1.2.3"
+    loader-utils "^1.4.0"
     schema-utils "^2.5.0"
 
 file-type@^10.5.0:
@@ -4397,7 +4641,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -4614,6 +4858,11 @@ fsevents@^2.0.6:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
   integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
 
+fsevents@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4834,7 +5083,7 @@ graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.2.2:
+graceful-fs@^4.2.2, graceful-fs@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -5360,6 +5609,15 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
+internal-slot@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
+  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    has "^1.0.3"
+    side-channel "^1.0.2"
+
 interpret@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -5499,11 +5757,6 @@ is-boolean-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
   integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-buffer@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
@@ -5762,7 +6015,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -5824,6 +6077,11 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
   integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==
 
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
 istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
@@ -5837,6 +6095,19 @@ istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
     istanbul-lib-coverage "^2.0.3"
     semver "^5.5.0"
 
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
+  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
@@ -5990,6 +6261,25 @@ jest-haste-map@^24.9.0:
   optionalDependencies:
     fsevents "^1.2.7"
 
+jest-haste-map@^25.2.3:
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.3.tgz#2649392b5af191f0167a27bfb62e5d96d7eaaade"
+  integrity sha512-pAP22OHtPr4qgZlJJFks2LLgoQUr4XtM1a+F5UaPIZNiCRnePA0hM3L7aiJ0gzwiNIYwMTfKRwG/S1L28J3A3A==
+  dependencies:
+    "@jest/types" "^25.2.3"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-serializer "^25.2.1"
+    jest-util "^25.2.3"
+    jest-worker "^25.2.1"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+    which "^2.0.2"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
 jest-jasmine2@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
@@ -6066,6 +6356,11 @@ jest-regex-util@^24.9.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
   integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
 
+jest-regex-util@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584"
+  integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w==
+
 jest-resolve-dependencies@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
@@ -6145,6 +6440,11 @@ jest-serializer@^24.9.0:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
   integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
 
+jest-serializer@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a"
+  integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ==
+
 jest-snapshot@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
@@ -6182,6 +6482,16 @@ jest-util@^24.9.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
+jest-util@^25.2.3:
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256"
+  integrity sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw==
+  dependencies:
+    "@jest/types" "^25.2.3"
+    chalk "^3.0.0"
+    is-ci "^2.0.0"
+    make-dir "^3.0.0"
+
 jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
@@ -6223,6 +6533,14 @@ jest-worker@^25.1.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a"
+  integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 jest@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
@@ -6350,12 +6668,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+json5@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
+  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsonfile@^3.0.0:
   version "3.0.1"
@@ -6409,29 +6727,10 @@ killable@^1.0.1:
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.2:
   version "3.0.2"
@@ -6465,10 +6764,10 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.0.tgz#fc146fe75f32dc483a0a2c64aef720f602cd6210"
-  integrity sha512-VHcwhO0UTpUW7rLPN2/OiWJdgA1e9BqEDALhrgCe/F+uUJnep6CoUsTzMeP8Rh0NGr9uKquXxqe7lwLZo509nQ==
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
   dependencies:
     leven "^3.1.0"
 
@@ -6520,7 +6819,7 @@ loader-utils@0.2.x:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -6529,6 +6828,15 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6670,11 +6978,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6784,6 +7087,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -6863,11 +7174,6 @@ minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
 minimist@1.1.x:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
@@ -6878,6 +7184,11 @@ minimist@^1.1.1, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -6950,12 +7261,17 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
+  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
 
 moo@^0.4.3:
   version "0.4.3"
@@ -7155,12 +7471,10 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.44:
-  version "1.1.45"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.45.tgz#4cf7e9175d71b1317f15ffd68ce63bce1d53e9f2"
-  integrity sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg==
-  dependencies:
-    semver "^6.3.0"
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -7335,16 +7649,6 @@ object.entries@^1.1.0, object.entries@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
-  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.15.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
 object.fromentries@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
@@ -7856,6 +8160,11 @@ picomatch@^2.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
   integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
 
+picomatch@^2.0.5:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
+  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7911,6 +8220,13 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -8275,10 +8591,10 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
-  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
+  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
 postcss@^5.0.16:
   version "5.2.18"
@@ -8290,10 +8606,10 @@ postcss@^5.0.16:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.26"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
-  integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
+  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -8341,7 +8657,7 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-private@^0.1.6:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -8539,11 +8855,6 @@ railroad-diagrams@^1.0.0:
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
   integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
 
-rails-ujs@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.2.4.tgz#31056ccd62d868f7d044395f31d77a4440550ceb"
-  integrity sha512-Mzu6bnTBKn4IuJvP7BDJRy4lzvR1zMWVDeTdPwDubXBfxpFEKqwOi5Nb6tfE2SYtTd+bb3PRETf40I94jgKw3w==
-
 randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
@@ -8592,15 +8903,15 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
-  integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
+react-dom@^16.13.0:
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866"
+  integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-event-listener@^0.6.0:
   version "0.6.5"
@@ -8622,10 +8933,12 @@ react-hotkeys@^1.1.4:
     mousetrap "^1.5.2"
     prop-types "^15.6.0"
 
-react-immutable-proptypes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
-  integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
+react-immutable-proptypes@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a"
+  integrity sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==
+  dependencies:
+    invariant "^2.2.2"
 
 react-immutable-pure-component@^1.1.1:
   version "1.2.3"
@@ -8768,10 +9081,10 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-select@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.8.tgz#06ff764e29db843bcec439ef13e196865242e0c1"
-  integrity sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==
+react-select@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz#ab098720b2e9fe275047c993f0d0caf5ded17c27"
+  integrity sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
@@ -8780,7 +9093,7 @@ react-select@^3.0.8:
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
     react-input-autosize "^2.2.2"
-    react-transition-group "^2.2.1"
+    react-transition-group "^4.3.0"
 
 react-sparklines@^1.7.0:
   version "1.7.0"
@@ -8820,15 +9133,15 @@ react-swipeable-views@^0.13.9:
     react-swipeable-views-utils "^0.13.9"
     warning "^4.0.1"
 
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f"
-  integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w==
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.13.0:
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.0.tgz#39ba3bf72cedc8210c3f81983f0bb061b14a3014"
+  integrity sha512-NQ2S9gdMUa7rgPGpKGyMcwl1d6D9MCF0lftdI3kts6kkiX+qvpC955jNjAZXlIDTjnN9jwFI8A8XhRh/9v0spA==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     react-is "^16.8.6"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-textarea-autosize@^7.1.2:
   version "7.1.2"
@@ -8855,10 +9168,20 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
-  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
+react-transition-group@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
+  integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+
+react@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -8952,24 +9275,37 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
-redis-commands@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
-  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
+realpath-native@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
+  integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==
 
-redis-parser@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
-  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
+redis-commands@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
+  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
 
-redis@^2.7.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
-  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
   dependencies:
-    double-ended-queue "^2.1.0-0"
-    redis-commands "^1.2.0"
-    redis-parser "^2.6.0"
+    redis-errors "^1.0.0"
+
+redis@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz#bd47067b8a4a3e6a2e556e57f71cc82c7360150a"
+  integrity sha512-PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==
+  dependencies:
+    denque "^1.4.1"
+    redis-commands "^1.5.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
 
 redux-immutable@^4.0.0:
   version "4.0.0"
@@ -9001,6 +9337,13 @@ regenerate-unicode-properties@^8.1.0:
   dependencies:
     regenerate "^1.4.0"
 
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -9016,17 +9359,18 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
-  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+regenerator-runtime@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
 
-regenerator-transform@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
-  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9043,6 +9387,14 @@ regexp.prototype.flags@^1.2.0:
   dependencies:
     define-properties "^1.1.2"
 
+regexp.prototype.flags@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -9060,11 +9412,28 @@ regexpu-core@^4.6.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
 regjsgen@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
   integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
 
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
 regjsparser@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
@@ -9072,6 +9441,13 @@ regjsparser@^0.6.0:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  dependencies:
+    jsesc "~0.5.0"
+
 rellax@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz#1b433ef7ac4aa3573449a33efab391c112f6b34d"
@@ -9212,6 +9588,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
@@ -9232,10 +9613,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
-  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
+resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -9418,10 +9799,10 @@ sass-loader@^8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
-sass@^1.25.0:
-  version "1.25.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.25.0.tgz#f8bd7dfbb39d6b0305e27704a8ebe637820693f3"
-  integrity sha512-uQMjye0Y70SEDGO56n0j91tauqS9E1BmpKHtiYNQScXDHeaE9uHwNEqQNFf4Bes/3DHMNinB6u79JsG10XWNyw==
+sass@^1.26.3:
+  version "1.26.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.3.tgz#412df54486143b76b5a65cdf7569e86f44659f46"
+  integrity sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -9430,10 +9811,10 @@ sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
-  integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
+scheduler@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d"
+  integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -9447,12 +9828,12 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
-  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
+  integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
   dependencies:
-    ajv "^6.10.2"
+    ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
 scroll-behavior@^0.9.1:
@@ -9626,6 +10007,14 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+side-channel@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    object-inspect "^1.7.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -9653,6 +10042,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -10011,6 +10405,18 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string.prototype.matchall@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
+  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    has-symbols "^1.0.1"
+    internal-slot "^1.0.2"
+    regexp.prototype.flags "^1.3.0"
+    side-channel "^1.0.2"
+
 string.prototype.trim@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
@@ -10050,12 +10456,12 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringz@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.0.0.tgz#0a092bc64ed9b42eff2936d0401d2398393d54e9"
-  integrity sha512-pRWc5RGpedKEDvQ/ukYs8kS8tKj+cKu5ayOoyOvsavbpiLBcm1dGX6p1o5IagaN11cbfN8tKGpgQ4fHdEq5LBA==
+stringz@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz#5896b4713eac31157556040fb90258fb02c1630c"
+  integrity sha512-KlywLT+MZ+v0IRepfMxRtnSvDCMc3nR1qqCs3m/qIbSOWkNZYT8XHQA31rS3TnKp0c5xjZu3M4GY/2aRKSi/6A==
   dependencies:
-    unicode-astral-regex "^1.0.1"
+    char-regex "^1.0.2"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -10150,7 +10556,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
   integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -10311,6 +10717,15 @@ test-exclude@^5.0.0:
     read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -10512,6 +10927,13 @@ type@^2.0.0:
   resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
   integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10525,11 +10947,6 @@ uglify-js@^3.1.4:
     commander "~2.20.3"
     source-map "~0.6.1"
 
-unicode-astral-regex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unicode-astral-regex/-/unicode-astral-regex-1.0.1.tgz#2cab8529480646f9614ddbc7b62158ad05123feb"
-  integrity sha512-UP6cmDeiWi8bMDmkyXLRsDuVPTvPjh8Wsz+pHu1VkGgTBl4pUceYAdHXY0cdc6Q3+Z2q7QMzi/0E7L/S/yOvFw==
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -10548,6 +10965,11 @@ unicode-match-property-value-ecmascript@^1.1.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
   integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
 
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
@@ -10694,11 +11116,16 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6"
+  integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==
+
 v8-compile-cache@2.0.3, v8-compile-cache@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
@@ -10813,13 +11240,13 @@ webpack-assets-manifest@^3.1.1:
     tapable "^1.0.0"
     webpack-sources "^1.0.0"
 
-webpack-bundle-analyzer@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
-  integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==
+webpack-bundle-analyzer@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b"
+  integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw==
   dependencies:
-    acorn "^6.0.7"
-    acorn-walk "^6.1.1"
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
     bfj "^6.1.1"
     chalk "^2.4.1"
     commander "^2.18.0"
@@ -10860,10 +11287,10 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz#1ff3e5cccf8e0897aa3f5909c654e623f69b1c0e"
-  integrity sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA==
+webpack-dev-server@^3.10.3:
+  version "3.10.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0"
+  integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -10922,15 +11349,15 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.41.5:
-  version "4.41.5"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c"
-  integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==
+webpack@^4.42.1:
+  version "4.42.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
+  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
     acorn "^6.2.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -10942,7 +11369,7 @@ webpack@^4.41.5:
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
@@ -11014,10 +11441,17 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wicg-inert@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.0.tgz#4f5797172fbf7ff01effd3839b52872e35d3cba2"
-  integrity sha512-sZsYZ8pk8y6CgDLkTxivfhLDBvZuDWTWBawU8OuDdO0Id6AOd1Gqjkvt9g9Ni7rgHIS7UbRvbLSv1z7MSJDYCA==
+which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wicg-inert@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.2.tgz#46d8b01142c1bda8f6fa5d78e2754ba56f6f70be"
+  integrity sha512-L2eSi1fx1M+WLLUccwzAulgK5hZtllRDvYk3UB/fe1ZqdkZS6dz718o6xfe3JUtBEJJnqvI6NF8m1bAHlg3JUg==
 
 wide-align@^1.1.0:
   version "1.1.3"
@@ -11083,6 +11517,16 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -11116,6 +11560,13 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xregexp@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
+  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.8.3"
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -11159,10 +11610,10 @@ yargs-parser@^13.1.0, yargs-parser@^13.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1"
-  integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==
+yargs-parser@^18.1.1:
+  version "18.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
+  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11218,10 +11669,10 @@ yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
-yargs@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
-  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"
@@ -11233,7 +11684,7 @@ yargs@^15.1.0:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^16.1.0"
+    yargs-parser "^18.1.1"
 
 zlibjs@^0.3.1:
   version "0.3.1"

From 5676b1e5ad70fa18bb804a77ca205d97d887021a Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 6 Apr 2020 20:38:20 +0900
Subject: [PATCH 031/200] 3.1.3 (#275) (#277)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix announcements with fully-qualified mention to local user crashing WebUI (#13164)

* [Security] Bump puma from 4.3.1 to 4.3.2 (#13167)

Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix installation failing when Redis password contains special characters (#13156)

* Add support for special characters in Redis passwords

Fixes #13154

* Refactor

* Fix elasticsearch-api and faraday incompatibilities (#13166)

* Bump puma from 4.3.2 to 4.3.3 (#13177)

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132

* Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump oj from 3.10.1 to 3.10.3 (#13187)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/core from 7.8.4 to 7.8.6 (#13185)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Add tooltips to audio/video player buttons (#13203)

* Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170)

Fixes #13168

* Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)

Blocking a domain is closer to blocking all its users than to a mute
action.

* Remove useless `respond_to` calls (#13208)

* Change GIF label to be displayed even when autoplay is enabled in web UI (#13209)

* Fix too large announcements not being scrollable in web UI (#13211)

* Add specific rate limits for posting and following (#13172)

* Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148)

* Add sorting by username, creation and last activity in moderation view (#13076)

* Add ability to order accounts in moderation view

* Display last status date in “Most recent activity” for remote users

* Fix error when searching for URLs that contain the mention syntax (#13151)

Fixes #13150

* Set BUNDLE_PATH in CircleCI (#13214)

* Change description of privacy levels to be more intuitive in web UI (#13197)

* Improve description of privacy levels in compose interface

* Change strings in defaultMessage and source as well as english

Co-authored-by: Thibaut Girka <thib@sitedethib.com>

* Add ability to delete files uploaded for settings in admin UI (#13192)

* Allow deleting site uploads

* Refactor and move links into hints

* Fix i18n tests

* Fix HTML output of site_upload_delete_hint

* Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)

* Add skip_media_remove option to tootctl statuses remove

* Add skip_media_remove option to tootctl statuses remove

Co-authored-by: tateisu <tateisu@juggler.jp>

* Code style improvements in JavaScript (#13159)

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

* Add submit button to the top of preferences pages (#13068)

* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec

* Update nginx.conf (#13066)

* Change wording of media display preferences to be more intuitive (#13198)

* Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)

* Add support for links to statuses in announcements to be opened in web UI (#13212)

* Add support for links to public statuses in announcements to be opened in WebUI

* Please CodeClimate

* Fix public posts from silenced accounts not being changed to unlisted visibility (#13096)

* Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change local media attachments to perform heavy processing asynchronously (#13210)

Fix #9106

* Add federation support for the "hide network" preference (#11673)

* Change ActivityPub follower/following collections to not link first page

* Add support for hiding followers and following of remote users

* Switch to using a single `hide_collections` column

* Address code style remarks

* Bump cld3 from 3.2.6 to 3.3.0 (#13107)

* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Change video uploads to enforce certain limits (#13218)

- Dimensions at most 1920x1200
- Frame rate at most 60

* Change video uploads to always be converted to H264/MP4 (#13220)

Even if the container format is the same (.mp4), the codec could
be different and not playable in web browsers

* Change the string "hidden" to "blocked" in WebUI (#13221)

* Change the string "hidden" to "blocked" in WebUI.

* update

* Bump file-loader from 5.0.2 to 5.1.0 (#13225)

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump wicg-inert from 3.0.0 to 3.0.2 (#13226)

Bumps [wicg-inert](https://github.com/WICG/inert) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/WICG/inert/releases)
- [Commits](https://github.com/WICG/inert/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump cross-env from 6.0.3 to 7.0.2 (#13228)

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump eslint-plugin-react from 7.17.0 to 7.19.0 (#13224)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.17.0 to 7.19.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.17.0...v7.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)

* Fix videos with unsupported colorspace not being transcoded (#13242)

* Fix regression in “Edit media” modal in web UI (#13243)

* [Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235)

* Update Dockerfile

* Update Dockerfile

* Fix detailed view of direct messages displaying a 0 boost count (#13244)

The boost count is already removed from private toots,
do the same with direct messages.

* Add titles to warning presets in admin UI (#13252)

* Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)

* Add shortcuts to blacklist a user's e-mail domain in admin UI

* Add option to blacklist resolved MX and IP records for e-mail domains

* Fix some timeouts when searching URLs by limiting some database queries (#13253)

Only look up private toots from database if the request failed because of 401,
403 or 404 errors, as those may indicate a private toot, rather than something
that isn't a toot or cannot be processed.

* Fix WebUI crash in single-column mode on prehistoric browsers (#13267)

Fixes #13266

* Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)

Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases)
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 24.9.0 to 25.1.0 (#12973)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-dom from 16.12.0 to 16.13.0 (#13181)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sass from 1.25.0 to 1.26.3 (#13263)

Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.25.0...1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump mkdirp from 0.5.1 to 1.0.3 (#12979)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump redis from 2.8.0 to 3.0.2 (#13102)

Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.0 to 3.1.1 (#13230)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simple_form from 5.0.1 to 5.0.2 (#13231)

Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webmock from 3.8.0 to 3.8.3 (#13265)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump capistrano from 3.11.2 to 3.12.1 (#13264)

* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

* Decommission support for Ruby 2.4 (#13287)

* Update Gemfile

* Update README.md

* Fix frontend crash when deleting announcements (#13283)

This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)

As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.

This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present.

* Make bookmarks also searchable (#13271)

* Add link to bookmarks in web UI dropdown (#13273)

* Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)

* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js

* [Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Sidekiq::Logger.logger -> Sidekiq.logger

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix bookmarks also searchable (#13293)

* Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)

* Change poll option hover/active styling to be less confusing (#13313)

* Fix frontend crash when deleting announcements (#13312)

Refactor and fix #13283, which only worked in some cases.

* Fix media not being marked sensitive when client sets a CW but no text (#13277)

Mastodon enforces the “sensitive” flag on media attachments whenever a toot
is posted with a Content Warning. However, it does so *after* potentially
converting the Content Warning to toot text (when there is no toot text),
which leads to inconsistent and surprising behavior for API clients.
This commit fixes this inconsistency.

* Bump browser from 3.0.3 to 4.0.0 (#13307)

Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simplecov from 0.18.2 to 0.18.5 (#13310)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump discard from 1.1.0 to 1.2.0 (#13308)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* New Crowdin translations (#13064)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations devise.en.yml (Icelandic)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations activerecord.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

* Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/core from 7.8.6 to 7.9.0 (#13303)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change `tootctl media remove-orphans` to work for all classes (#13316)

Change `tootctl media lookup` to not use an interactive prompt

* Bump react-select from 3.0.8 to 3.1.0 (#13296)

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack from 4.41.5 to 4.42.1 (#13319)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix Paperclip using deprecated URI.escape function (#13320)

Monkey-patch Paperclip to perform URL escaping in a slightly more
appropriate way, and get rid of runtime deprecation warnings.

* Bump brakeman from 4.7.2 to 4.8.0 (#13309)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix OCR not working on Safari because of unsupported worker-src CSP (#13323)

Fixes #13321

* Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors

* Fix incorrect deletion of local accounts imported by overwriting (#13350)

* Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)

* Bump pg from 1.2.2 to 1.2.3 (#13344)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.2...v1.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump oj from 3.10.3 to 3.10.5 (#13345)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump iso-639 from 0.2.8 to 0.3.5 (#13343)

Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases)
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump ox from 2.12.1 to 2.13.2 (#13342)

Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump better_errors from 2.5.1 to 2.6.0 (#13340)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix ImportsController param to permit :mode (#13347)

* Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump uuid from 3.4.0 to 7.0.2 (#13295)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)

* Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react from 16.12.0 to 16.13.1 (#13337)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump stringz from 2.0.0 to 2.1.0 (#13331)

Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 25.1.0 to 25.2.4 (#13332)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump yargs from 15.1.0 to 15.3.1 (#13334)

Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-loader from 8.0.6 to 8.1.0 (#13333)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix re-sending of e-mail confirmation not being rate limited (#13360)

Fix #13330

* Improve toot clicking areas (#13327)

* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI

* Fix background jobs not using locks like they are supposed to (#13361)

Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349

* Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump faker from 2.10.1 to 2.11.0 (#13363)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump bootsnap from 1.4.5 to 1.4.6 (#13369)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.1 to 3.1.2 (#13368)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix pinning a column in web UI sometimes redirecting out of web UI (#13376)

Fix #13216

* Fix returning results when searching for URL with non-zero offset (#13377)

Fix #13083

* Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)

Fix #13371

* Improve polls: option lengths & redesign (#13257)

This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.

* Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Add ability to filter audit log in admin UI (#13381)

* Update Vagrant box to Bionic (#13384)

* Update config.yml (#13379)

* Add explanation as to why unlocked accounts may have follow requests (#13385)

* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”

* Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)

* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3

* Bump version to 3.1.3 (#13389)

* Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review

* [Security] Update Dockerfile for Ruby 2.6.6 (#13393)

* Update .ruby-version (#13395)

* Fix “Show more” not switching to “Show less” on public pages (#13174)

* Fix “Show more” not switching to “Show less” on public pages

Fixes #13169

* Fix initial text of CW button on public pages when CW are unfolded by default

* Add rate limit for reporting (#13390)

* New Crowdin translations (#13317)

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Georgian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations simple_form.en.yml (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Hebrew)
[ci skip]

* New translations devise.en.yml (Hebrew)
[ci skip]

* New translations doorkeeper.en.yml (Hebrew)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Vietnamese)
[ci skip]

* New translations devise.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (German)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations devise.en.yml (Galician)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New t…

Co-authored-by: ThibG <thib@sitedethib.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: koyu <me@koyu.space>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: David Cook <divergentdave@gmail.com>
Co-authored-by: tateisu <tateisu@gmail.com>
Co-authored-by: tateisu <tateisu@juggler.jp>
Co-authored-by: Bèr Kessels <ber@berk.es>
Co-authored-by: guigeekz <pattusg@gmail.com>
Co-authored-by: Shlee <github@shl.ee>
Co-authored-by: mayaeh <mayaeh@marimo-net.org>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Daniel Sockwell <dsockwell@gmail.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Takeshi Umeda <noel.yoshiba@gmail.com>
Co-authored-by: Sasha Sorokin <dafri.nochiterov8@gmail.com>
Co-authored-by: fuyu <54523771+mfmfuyu@users.noreply.github.com>
---
 .circleci/config.yml                          |   13 +-
 .ruby-version                                 |    2 +-
 CHANGELOG.md                                  |   73 +
 Dockerfile                                    |    6 +-
 Gemfile                                       |   32 +-
 Gemfile.lock                                  |  258 +--
 README.md                                     |    4 +-
 Vagrantfile                                   |    2 +-
 app/chewy/statuses_index.rb                   |    5 +
 app/controllers/account_follow_controller.rb  |    2 +-
 .../admin/action_logs_controller.rb           |   14 +-
 .../admin/email_domain_blocks_controller.rb   |   28 +-
 .../admin/site_uploads_controller.rb          |   21 +
 .../admin/warning_presets_controller.rb       |    6 +-
 app/controllers/api/base_controller.rb        |    4 +
 .../accounts/follower_accounts_controller.rb  |    4 +-
 .../accounts/following_accounts_controller.rb |    4 +-
 .../v1/accounts/identity_proofs_controller.rb |    2 -
 .../api/v1/accounts/lists_controller.rb       |    2 -
 .../api/v1/accounts/pins_controller.rb        |    2 -
 .../v1/accounts/relationships_controller.rb   |    2 -
 .../api/v1/accounts/search_controller.rb      |    2 -
 .../api/v1/accounts/statuses_controller.rb    |    2 -
 app/controllers/api/v1/accounts_controller.rb |    4 +-
 .../api/v1/apps/credentials_controller.rb     |    2 -
 app/controllers/api/v1/blocks_controller.rb   |    2 -
 .../api/v1/bookmarks_controller.rb            |    2 -
 .../api/v1/conversations_controller.rb        |    2 -
 .../api/v1/custom_emojis_controller.rb        |    2 -
 .../api/v1/domain_blocks_controller.rb        |    2 -
 .../api/v1/endorsements_controller.rb         |    2 -
 .../api/v1/favourites_controller.rb           |    2 -
 .../featured_tags/suggestions_controller.rb   |    3 -
 app/controllers/api/v1/filters_controller.rb  |    2 -
 .../api/v1/instances/activity_controller.rb   |    2 -
 .../api/v1/instances/peers_controller.rb      |    2 -
 .../api/v1/instances_controller.rb            |    2 -
 app/controllers/api/v1/media_controller.rb    |   31 +-
 app/controllers/api/v1/mutes_controller.rb    |    2 -
 .../api/v1/notifications_controller.rb        |    2 -
 .../api/v1/polls/votes_controller.rb          |    2 -
 app/controllers/api/v1/polls_controller.rb    |    2 -
 .../api/v1/preferences_controller.rb          |    2 -
 app/controllers/api/v1/reports_controller.rb  |    2 +-
 .../api/v1/statuses/bookmarks_controller.rb   |    2 -
 .../favourited_by_accounts_controller.rb      |    2 -
 .../api/v1/statuses/favourites_controller.rb  |    2 -
 .../api/v1/statuses/mutes_controller.rb       |    2 -
 .../api/v1/statuses/pins_controller.rb        |    2 -
 .../reblogged_by_accounts_controller.rb       |    2 -
 .../api/v1/statuses/reblogs_controller.rb     |    3 +-
 app/controllers/api/v1/statuses_controller.rb |   14 +-
 .../api/v1/streaming_controller.rb            |    2 -
 .../api/v1/suggestions_controller.rb          |    2 -
 .../api/v1/timelines/home_controller.rb       |    2 -
 .../api/v1/timelines/public_controller.rb     |    2 -
 .../api/v1/timelines/tag_controller.rb        |    2 -
 app/controllers/api/v1/trends_controller.rb   |    2 -
 app/controllers/api/v2/media_controller.rb    |   12 +
 app/controllers/api/v2/search_controller.rb   |    2 -
 app/controllers/api/web/embeds_controller.rb  |    2 -
 .../api/web/push_subscriptions_controller.rb  |    2 -
 .../api/web/settings_controller.rb            |    2 -
 app/controllers/application_controller.rb     |    5 +
 .../authorize_interactions_controller.rb      |    2 +-
 .../concerns/rate_limit_headers.rb            |   16 +-
 .../follower_accounts_controller.rb           |   11 +-
 .../following_accounts_controller.rb          |   11 +-
 .../settings/imports_controller.rb            |    2 +-
 app/helpers/admin/action_logs_helper.rb       |   75 +-
 app/helpers/admin/filter_helper.rb            |    1 +
 app/helpers/admin/settings_helper.rb          |   11 +
 app/javascript/mastodon/actions/accounts.js   |    5 +-
 app/javascript/mastodon/actions/alerts.js     |    4 +-
 app/javascript/mastodon/actions/compose.js    |   23 +-
 .../mastodon/actions/identity_proofs.js       |    1 +
 app/javascript/mastodon/actions/timelines.js  |    1 +
 app/javascript/mastodon/common.js             |    2 +-
 .../mastodon/components/column_header.js      |    3 +-
 app/javascript/mastodon/components/domain.js  |    2 +-
 .../intersection_observer_article.js          |    2 +-
 .../mastodon/components/media_gallery.js      |    2 +-
 app/javascript/mastodon/components/poll.js    |   28 +-
 .../mastodon/components/scrollable_list.js    |   20 +-
 app/javascript/mastodon/components/status.js  |    8 +-
 .../mastodon/components/status_action_bar.js  |    4 +-
 .../mastodon/components/status_content.js     |   14 +
 .../mastodon/containers/domain_container.js   |    2 +-
 .../features/account/components/header.js     |    8 +-
 .../mastodon/features/audio/index.js          |    6 +-
 .../mastodon/features/blocks/index.js         |    2 +-
 .../features/compose/components/action_bar.js |    2 +
 .../features/compose/components/poll_form.js  |    5 +-
 .../compose/components/privacy_dropdown.js    |    8 +-
 .../components/conversation.js                |    2 +-
 .../mastodon/features/domain_blocks/index.js  |    8 +-
 .../mastodon/features/favourites/index.js     |    2 +-
 .../features/follow_requests/index.js         |   19 +-
 .../mastodon/features/followers/index.js      |    2 +-
 .../mastodon/features/following/index.js      |    2 +-
 .../components/announcements.js               |   19 +
 .../features/getting_started/index.js         |    2 +-
 .../mastodon/features/lists/index.js          |    2 +-
 .../mastodon/features/mutes/index.js          |    2 +-
 .../mastodon/features/reblogs/index.js        |    2 +-
 .../features/status/components/action_bar.js  |    4 +-
 .../features/status/components/card.js        |    2 +-
 .../status/components/detailed_status.js      |    2 +-
 .../ui/components/__tests__/column-test.js    |    2 +-
 .../mastodon/features/video/index.js          |   14 +-
 app/javascript/mastodon/locales/ast.json      |    4 +-
 app/javascript/mastodon/locales/bg.json       |    2 +-
 app/javascript/mastodon/locales/br.json       |  486 ++---
 app/javascript/mastodon/locales/cs.json       |    6 +-
 app/javascript/mastodon/locales/de.json       |   14 +-
 .../mastodon/locales/defaultMessages.json     |   46 +-
 app/javascript/mastodon/locales/el.json       |   12 +-
 app/javascript/mastodon/locales/en.json       |   25 +-
 app/javascript/mastodon/locales/eo.json       |    4 +-
 app/javascript/mastodon/locales/es-AR.json    |    4 +-
 app/javascript/mastodon/locales/eu.json       |   18 +-
 app/javascript/mastodon/locales/fa.json       |   10 +-
 app/javascript/mastodon/locales/fi.json       |   40 +-
 app/javascript/mastodon/locales/fr.json       |  166 +-
 app/javascript/mastodon/locales/ga.json       |    2 +-
 app/javascript/mastodon/locales/gl.json       |   36 +-
 app/javascript/mastodon/locales/hi.json       |    2 +-
 app/javascript/mastodon/locales/hu.json       |    2 +-
 app/javascript/mastodon/locales/hy.json       |  124 +-
 app/javascript/mastodon/locales/it.json       |    4 +-
 app/javascript/mastodon/locales/ja.json       |   24 +-
 app/javascript/mastodon/locales/kab.json      |  124 +-
 app/javascript/mastodon/locales/kn.json       |    2 +-
 app/javascript/mastodon/locales/ko.json       |   12 +-
 app/javascript/mastodon/locales/lt.json       |    2 +-
 app/javascript/mastodon/locales/lv.json       |    2 +-
 app/javascript/mastodon/locales/mk.json       |    2 +-
 app/javascript/mastodon/locales/ml.json       |    2 +-
 app/javascript/mastodon/locales/mr.json       |    2 +-
 app/javascript/mastodon/locales/ms.json       |    2 +-
 app/javascript/mastodon/locales/nl.json       |   32 +-
 app/javascript/mastodon/locales/nn.json       |   16 +-
 app/javascript/mastodon/locales/pt-BR.json    |   20 +-
 app/javascript/mastodon/locales/pt-PT.json    |   34 +-
 app/javascript/mastodon/locales/ru.json       |   18 +-
 app/javascript/mastodon/locales/sk.json       |   12 +-
 app/javascript/mastodon/locales/sr.json       |  130 +-
 app/javascript/mastodon/locales/sv.json       |    6 +-
 app/javascript/mastodon/locales/th.json       |   40 +-
 app/javascript/mastodon/locales/ur.json       |    2 +-
 app/javascript/mastodon/locales/zh-CN.json    |    2 +-
 app/javascript/mastodon/locales/zh-HK.json    |   14 +-
 app/javascript/mastodon/locales/zh-TW.json    |   14 +-
 app/javascript/mastodon/middleware/errors.js  |    2 +-
 app/javascript/mastodon/reducers/compose.js   |    1 -
 .../mastodon/reducers/notifications.js        |    4 +-
 app/javascript/mastodon/reducers/timelines.js |    4 +-
 app/javascript/mastodon/selectors/index.js    |    2 +-
 .../service_worker/web_push_notifications.js  |    2 +-
 .../mastodon/store/configureStore.js          |    2 +-
 app/javascript/mastodon/utils/log_out.js      |    2 +-
 app/javascript/packs/admin.js                 |    6 +-
 app/javascript/packs/public.js                |   38 +-
 .../styles/mastodon-light/diff.scss           |    2 +-
 app/javascript/styles/mastodon/admin.scss     |   68 +-
 .../styles/mastodon/components.scss           |   39 +-
 app/javascript/styles/mastodon/polls.scss     |   42 +-
 app/lib/activitypub/tag_manager.rb            |    2 +
 app/lib/entity_cache.rb                       |    4 +
 app/lib/exceptions.rb                         |    1 +
 app/lib/language_detector.rb                  |    4 +-
 app/lib/rate_limiter.rb                       |   64 +
 app/models/account.rb                         |   21 +-
 app/models/account_filter.rb                  |   27 +-
 app/models/account_warning_preset.rb          |    3 +
 app/models/admin/account_action.rb            |   12 -
 app/models/admin/action_log_filter.rb         |   81 +
 app/models/announcement.rb                    |   11 +
 app/models/concerns/account_interactions.rb   |   16 +-
 app/models/concerns/attachmentable.rb         |    2 +-
 app/models/concerns/rate_limitable.rb         |   36 +
 app/models/email_domain_block.rb              |   14 +
 app/models/follow.rb                          |    3 +
 app/models/follow_request.rb                  |    3 +
 app/models/media_attachment.rb                |  142 +-
 app/models/report.rb                          |   11 +
 app/models/status.rb                          |   20 +
 app/policies/settings_policy.rb               |    4 +
 .../rest/announcement_serializer.rb           |   13 +
 .../rest/media_attachment_serializer.rb       |    4 +-
 app/services/account_search_service.rb        |    2 +-
 .../activitypub/process_account_service.rb    |   25 +-
 app/services/fetch_resource_service.rb        |    3 +
 app/services/follow_service.rb                |   74 +-
 app/services/import_service.rb                |    3 +-
 app/services/post_status_service.rb           |   17 +-
 app/services/reblog_service.rb                |   16 +-
 app/services/resolve_url_service.rb           |   10 +-
 app/services/search_service.rb                |    4 +-
 app/validators/poll_validator.rb              |    2 +-
 app/views/admin/account_actions/new.html.haml |    2 +-
 app/views/admin/accounts/_account.html.haml   |    2 +
 app/views/admin/accounts/index.html.haml      |    6 +
 app/views/admin/accounts/show.html.haml       |   15 +-
 .../admin/action_logs/_action_log.html.haml   |    6 -
 app/views/admin/action_logs/index.html.haml   |   24 +-
 .../_email_domain_block.html.haml             |   10 +
 .../admin/email_domain_blocks/new.html.haml   |    5 +-
 app/views/admin/settings/edit.html.haml       |   11 +-
 .../warning_presets/_warning_preset.html.haml |   10 +
 .../admin/warning_presets/edit.html.haml      |    3 +
 .../admin/warning_presets/index.html.haml     |   24 +-
 app/views/errors/429.html.haml                |    5 +
 .../preferences/appearance/show.html.haml     |    5 +-
 .../preferences/notifications/show.html.haml  |    8 +-
 .../settings/preferences/other/show.html.haml |    5 +-
 app/views/settings/profiles/show.html.haml    |    5 +-
 app/views/statuses/_poll.html.haml            |   10 +-
 .../distribute_poll_update_worker.rb          |    2 +-
 .../synchronize_featured_collection_worker.rb |    2 +-
 .../after_remote_follow_request_worker.rb     |    9 -
 app/workers/after_remote_follow_worker.rb     |    9 -
 app/workers/backup_worker.rb                  |    8 +-
 app/workers/notification_worker.rb            |    9 -
 app/workers/poll_expiration_notify_worker.rb  |    2 +-
 app/workers/post_process_media_worker.rb      |   34 +
 app/workers/processing_worker.rb              |    9 -
 .../publish_scheduled_announcement_worker.rb  |   15 +-
 .../publish_scheduled_status_worker.rb        |    2 +-
 .../pubsubhubbub/confirmation_worker.rb       |    9 -
 app/workers/pubsubhubbub/delivery_worker.rb   |    9 -
 .../pubsubhubbub/distribution_worker.rb       |    9 -
 .../pubsubhubbub/raw_distribution_worker.rb   |    9 -
 app/workers/pubsubhubbub/subscribe_worker.rb  |    9 -
 .../pubsubhubbub/unsubscribe_worker.rb        |    9 -
 app/workers/regeneration_worker.rb            |    2 +-
 app/workers/remote_profile_update_worker.rb   |    9 -
 app/workers/resolve_account_worker.rb         |    2 +-
 app/workers/salmon_worker.rb                  |    9 -
 .../scheduler/backup_cleanup_scheduler.rb     |    2 +-
 .../scheduler/doorkeeper_cleanup_scheduler.rb |    2 +-
 app/workers/scheduler/email_scheduler.rb      |    2 +-
 .../scheduler/feed_cleanup_scheduler.rb       |    2 +-
 app/workers/scheduler/ip_cleanup_scheduler.rb |    2 +-
 .../scheduler/media_cleanup_scheduler.rb      |    2 +-
 app/workers/scheduler/pghero_scheduler.rb     |    2 +-
 .../scheduler/scheduled_statuses_scheduler.rb |    2 +-
 .../subscriptions_cleanup_scheduler.rb        |    9 -
 .../scheduler/subscriptions_scheduler.rb      |    9 -
 .../scheduler/trending_tags_scheduler.rb      |    2 +-
 .../scheduler/user_cleanup_scheduler.rb       |    2 +-
 app/workers/verify_account_links_worker.rb    |    2 +-
 config/application.rb                         |    2 +
 config/deploy.rb                              |    2 +-
 .../initializers/content_security_policy.rb   |    2 +
 config/initializers/kaminari_config.rb        |    2 +-
 config/initializers/rack_attack.rb            |    2 +-
 config/initializers/sidekiq.rb                |    7 +-
 config/locales/activerecord.br.yml            |    6 +-
 config/locales/activerecord.hy.yml            |   16 +
 config/locales/activerecord.kab.yml           |    5 +
 config/locales/activerecord.zh-HK.yml         |    4 +
 config/locales/ar.yml                         |   70 +-
 config/locales/ast.yml                        |    3 +-
 config/locales/bg.yml                         |    2 +-
 config/locales/bn.yml                         |    2 +-
 config/locales/br.yml                         |  219 ++-
 config/locales/ca.yml                         |   50 +-
 config/locales/co.yml                         |   50 +-
 config/locales/cs.yml                         |    4 +-
 config/locales/cy.yml                         |    6 +-
 config/locales/da.yml                         |    1 -
 config/locales/de.yml                         |   50 +-
 config/locales/devise.br.yml                  |    8 +
 config/locales/devise.fr.yml                  |   20 +-
 config/locales/devise.hy.yml                  |    6 +
 config/locales/devise.is.yml                  |    4 +-
 config/locales/devise.kab.yml                 |    9 +-
 config/locales/devise.nn.yml                  |   62 +-
 config/locales/devise.pt-BR.yml               |  106 +-
 config/locales/devise.pt-PT.yml               |    4 +-
 config/locales/devise.ru.yml                  |   24 +-
 config/locales/devise.zh-HK.yml               |   16 +
 config/locales/doorkeeper.br.yml              |   51 +
 config/locales/doorkeeper.fr.yml              |   10 +-
 config/locales/doorkeeper.kab.yml             |   10 +-
 config/locales/doorkeeper.ko.yml              |    4 +-
 config/locales/doorkeeper.nn.yml              |   24 +-
 config/locales/doorkeeper.pt-BR.yml           |    2 +-
 config/locales/doorkeeper.sk.yml              |    4 +-
 config/locales/doorkeeper.th.yml              |    2 +-
 config/locales/el.yml                         |   60 +-
 config/locales/en.yml                         |   51 +-
 config/locales/en_GB.yml                      |    1 -
 config/locales/eo.yml                         |   13 +-
 config/locales/es-AR.yml                      |   52 +-
 config/locales/es.yml                         |   50 +-
 config/locales/et.yml                         |    1 -
 config/locales/eu.yml                         |   21 +-
 config/locales/fa.yml                         |   59 +-
 config/locales/fi.yml                         |   19 +
 config/locales/fr.yml                         |  194 +-
 config/locales/gl.yml                         |   50 +-
 config/locales/hi.yml                         |    2 +-
 config/locales/hr.yml                         |    2 +-
 config/locales/hu.yml                         |   88 +-
 config/locales/hy.yml                         |    7 +-
 config/locales/id.yml                         |   31 +-
 config/locales/io.yml                         |    2 +-
 config/locales/is.yml                         |   54 +-
 config/locales/it.yml                         |   52 +-
 config/locales/ja.yml                         |   50 +-
 config/locales/kab.yml                        |  105 +-
 config/locales/kk.yml                         |    1 -
 config/locales/kn.yml                         |    2 +-
 config/locales/ko.yml                         |   50 +-
 config/locales/lt.yml                         |    1 -
 config/locales/lv.yml                         |    2 +-
 config/locales/mk.yml                         |    2 +-
 config/locales/ml.yml                         |    2 +-
 config/locales/mr.yml                         |    2 +-
 config/locales/ms.yml                         |    2 +-
 config/locales/nl.yml                         |    5 +-
 config/locales/nn.yml                         |    5 +-
 config/locales/no.yml                         |    1 -
 config/locales/oc.yml                         |   31 +-
 config/locales/pl.yml                         |  212 ++-
 config/locales/pt-BR.yml                      |   76 +-
 config/locales/pt-PT.yml                      |   84 +-
 config/locales/ru.yml                         |   81 +-
 config/locales/simple_form.ar.yml             |    2 +
 config/locales/simple_form.ast.yml            |    2 +
 config/locales/simple_form.br.yml             |   22 +
 config/locales/simple_form.ca.yml             |    7 +
 config/locales/simple_form.co.yml             |    7 +
 config/locales/simple_form.cy.yml             |    2 +
 config/locales/simple_form.de.yml             |    9 +-
 config/locales/simple_form.el.yml             |   20 +-
 config/locales/simple_form.en.yml             |   11 +-
 config/locales/simple_form.eo.yml             |    6 +-
 config/locales/simple_form.es-AR.yml          |    7 +
 config/locales/simple_form.es.yml             |    7 +
 config/locales/simple_form.eu.yml             |   25 +-
 config/locales/simple_form.fa.yml             |   13 +-
 config/locales/simple_form.fr.yml             |   43 +-
 config/locales/simple_form.gl.yml             |    7 +
 config/locales/simple_form.hu.yml             |    7 +
 config/locales/simple_form.id.yml             |    7 +
 config/locales/simple_form.is.yml             |    7 +
 config/locales/simple_form.it.yml             |    9 +
 config/locales/simple_form.ja.yml             |   13 +-
 config/locales/simple_form.kab.yml            |   20 +-
 config/locales/simple_form.ko.yml             |    7 +
 config/locales/simple_form.nl.yml             |    2 +-
 config/locales/simple_form.oc.yml             |    4 +
 config/locales/simple_form.pl.yml             |   24 +
 config/locales/simple_form.pt-BR.yml          |   13 +-
 config/locales/simple_form.pt-PT.yml          |   17 +-
 config/locales/simple_form.ru.yml             |    9 +-
 config/locales/simple_form.sk.yml             |    8 +-
 config/locales/simple_form.sv.yml             |    3 +
 config/locales/simple_form.ta.yml             |    9 +
 config/locales/simple_form.th.yml             |   20 +-
 config/locales/simple_form.zh-CN.yml          |    7 +
 config/locales/simple_form.zh-HK.yml          |   33 +
 config/locales/simple_form.zh-TW.yml          |   33 +
 config/locales/sk.yml                         |   29 +-
 config/locales/sl.yml                         |    1 -
 config/locales/sq.yml                         |    1 -
 config/locales/sr.yml                         |    1 -
 config/locales/sv.yml                         |    9 +-
 config/locales/ta.yml                         |   15 +-
 config/locales/te.yml                         |    2 +-
 config/locales/th.yml                         |   67 +-
 config/locales/tr.yml                         |    1 -
 config/locales/uk.yml                         |    1 -
 config/locales/ur.yml                         |    2 +-
 config/locales/vi.yml                         |    1 -
 config/locales/zh-CN.yml                      |   17 +-
 config/locales/zh-HK.yml                      |   89 +-
 config/locales/zh-TW.yml                      |   89 +-
 config/routes.rb                              |    6 +-
 config/webpack/development.js                 |    2 +-
 config/webpack/shared.js                      |    4 +-
 ...163405_add_hide_collections_to_accounts.rb |    5 +
 ...625_add_processing_to_media_attachments.rb |    5 +
 ...58_add_title_to_account_warning_presets.rb |   15 +
 ...2162302_add_status_ids_to_announcements.rb |    6 +
 ...43_add_parent_id_to_email_domain_blocks.rb |    5 +
 db/schema.rb                                  |    8 +-
 dist/nginx.conf                               |   12 +-
 lib/mastodon/media_cli.rb                     |  113 +-
 lib/mastodon/redis_config.rb                  |    4 +-
 lib/mastodon/statuses_cli.rb                  |    8 +-
 lib/mastodon/version.rb                       |    2 +-
 lib/paperclip/attachment_extensions.rb        |   43 +
 lib/paperclip/url_generator_extensions.rb     |   17 +
 lib/paperclip/video_transcoder.rb             |   18 +-
 lib/tasks/mastodon.rake                       |   15 +-
 package.json                                  |   61 +-
 .../account_follow_controller_spec.rb         |    2 +-
 .../admin/reports_controller_spec.rb          |   20 +
 .../api/v1/statuses_controller_spec.rb        |   46 +-
 spec/features/profile_spec.rb                 |    2 +-
 spec/helpers/admin/action_log_helper_spec.rb  |  238 ---
 spec/rails_helper.rb                          |    2 +-
 spec/services/import_service_spec.rb          |    8 -
 spec/services/post_status_service_spec.rb     |    7 +
 yarn.lock                                     | 1611 +++++++++++------
 409 files changed, 6155 insertions(+), 3050 deletions(-)
 create mode 100644 app/controllers/admin/site_uploads_controller.rb
 create mode 100644 app/controllers/api/v2/media_controller.rb
 create mode 100644 app/helpers/admin/settings_helper.rb
 create mode 100644 app/lib/rate_limiter.rb
 create mode 100644 app/models/admin/action_log_filter.rb
 create mode 100644 app/models/concerns/rate_limitable.rb
 create mode 100644 app/views/admin/warning_presets/_warning_preset.html.haml
 create mode 100644 app/views/errors/429.html.haml
 delete mode 100644 app/workers/after_remote_follow_request_worker.rb
 delete mode 100644 app/workers/after_remote_follow_worker.rb
 delete mode 100644 app/workers/notification_worker.rb
 create mode 100644 app/workers/post_process_media_worker.rb
 delete mode 100644 app/workers/processing_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/confirmation_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/delivery_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/distribution_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/raw_distribution_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/subscribe_worker.rb
 delete mode 100644 app/workers/pubsubhubbub/unsubscribe_worker.rb
 delete mode 100644 app/workers/remote_profile_update_worker.rb
 delete mode 100644 app/workers/salmon_worker.rb
 delete mode 100644 app/workers/scheduler/subscriptions_cleanup_scheduler.rb
 delete mode 100644 app/workers/scheduler/subscriptions_scheduler.rb
 create mode 100644 db/migrate/20191212163405_add_hide_collections_to_accounts.rb
 create mode 100644 db/migrate/20200306035625_add_processing_to_media_attachments.rb
 create mode 100644 db/migrate/20200312144258_add_title_to_account_warning_presets.rb
 create mode 100644 db/migrate/20200312162302_add_status_ids_to_announcements.rb
 create mode 100644 db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
 create mode 100644 lib/paperclip/attachment_extensions.rb
 create mode 100644 lib/paperclip/url_generator_extensions.rb

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ba027d95..dd943e327 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ aliases:
       - image: circleci/ruby:2.7-buster-node
         environment: &ruby_environment
           BUNDLE_APP_CONFIG: ./.bundle/
+          BUNDLE_PATH: ./vendor/bundle/
           DB_HOST: localhost
           DB_USER: root
           RAILS_ENV: test
@@ -138,9 +139,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.7-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     steps:
       - *attach_workspace
@@ -157,9 +159,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.7-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
@@ -168,9 +171,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.6-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
@@ -179,9 +183,10 @@ jobs:
     docker:
       - image: circleci/ruby:2.5-buster-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.6-alpine
+      - image: circleci/postgres:12.2
         environment:
           POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
       - image: circleci/redis:5-alpine
     <<: *test_steps
 
diff --git a/.ruby-version b/.ruby-version
index 57cf282eb..338a5b5d8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.5
+2.6.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33663c2ad..ad353e2ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,79 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [v3.1.3] - 2020-04-05
+### Added
+
+- Add ability to filter audit log in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13381))
+- Add titles to warning presets in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13252))
+- Add option to include resolved DNS records when blacklisting e-mail domains in admin UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13254))
+- Add ability to delete files uploaded for settings in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13192))
+- Add sorting by username, creation and last activity in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13076))
+- Add explanation as to why unlocked accounts may have follow requests in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13385))
+- Add link to bookmarks to dropdown in web UI ([mayaeh](https://github.com/tootsuite/mastodon/pull/13273))
+- Add support for links to statuses in announcements to be opened in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13212), [ThibG](https://github.com/tootsuite/mastodon/pull/13250))
+- Add tooltips to audio/video player buttons in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13203))
+- Add submit button to the top of preferences pages ([guigeekz](https://github.com/tootsuite/mastodon/pull/13068))
+- Add specific rate limits for posting, following and reporting ([Gargron](https://github.com/tootsuite/mastodon/pull/13172), [Gargron](https://github.com/tootsuite/mastodon/pull/13390))
+  - 300 posts every 3 hours
+  - 400 follows or follow requests every 24 hours
+  - 400 reports every 24 hours
+- Add federation support for the "hide network" preference ([ThibG](https://github.com/tootsuite/mastodon/pull/11673))
+- Add `--skip-media-remove` option to `tootctl statuses remove` ([tateisu](https://github.com/tootsuite/mastodon/pull/13080))
+
+### Changed
+
+- **Change design of polls in web UI** ([Sasha-Sorokin](https://github.com/tootsuite/mastodon/pull/13257), [ThibG](https://github.com/tootsuite/mastodon/pull/13313))
+- Change status click areas in web UI to be bigger ([ariasuni](https://github.com/tootsuite/mastodon/pull/13327))
+- **Change `tootctl media remove-orphans` to work for all classes** ([Gargron](https://github.com/tootsuite/mastodon/pull/13316))
+- **Change local media attachments to perform heavy processing asynchronously** ([Gargron](https://github.com/tootsuite/mastodon/pull/13210))
+- Change video uploads to always be converted to H264/MP4 ([Gargron](https://github.com/tootsuite/mastodon/pull/13220), [ThibG](https://github.com/tootsuite/mastodon/pull/13239), [ThibG](https://github.com/tootsuite/mastodon/pull/13242))
+- Change video uploads to enforce certain limits ([Gargron](https://github.com/tootsuite/mastodon/pull/13218))
+  - Dimensions smaller than 1920x1200px
+  - Frame rate at most 60fps
+- Change the tooltip "Toggle visibility" to "Hide media" in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13199))
+- Change description of privacy levels to be more intuitive in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13197))
+- Change GIF label to be displayed even when autoplay is enabled in web UI ([koyuawsmbrtn](https://github.com/tootsuite/mastodon/pull/13209))
+- Change the string "Hide everything from …" to "Block domain …" in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13178), [mayaeh](https://github.com/tootsuite/mastodon/pull/13221))
+- Change wording of media display preferences to be more intuitive ([ariasuni](https://github.com/tootsuite/mastodon/pull/13198))
+
+### Deprecated
+
+- `POST /api/v1/media` → `POST /api/v2/media` ([Gargron](https://github.com/tootsuite/mastodon/pull/13210))
+
+### Fixed
+
+- Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` ([Gargron](https://github.com/tootsuite/mastodon/pull/13375))
+- Fix returning results when searching for URL with non-zero offset ([Gargron](https://github.com/tootsuite/mastodon/pull/13377))
+- Fix pinning a column in web UI sometimes redirecting out of web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/13376))
+- Fix background jobs not using locks like they are supposed to ([Gargron](https://github.com/tootsuite/mastodon/pull/13361))
+- Fix content warning being unnecessarily cleared when hiding content warning input in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13348))
+- Fix "Show more" not switching to "Show less" on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/13174))
+- Fix import overwrite option not being selectable ([noellabo](https://github.com/tootsuite/mastodon/pull/13347))
+- Fix wrong color for ellipsis in boost confirmation dialog in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13355))
+- Fix unnecessary unfollowing when importing follows with overwrite option ([noellabo](https://github.com/tootsuite/mastodon/pull/13350))
+- Fix 404 and 410 API errors being silently discarded in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13279))
+- Fix OCR not working on Safari because of unsupported worker-src CSP ([ThibG](https://github.com/tootsuite/mastodon/pull/13323))
+- Fix media not being marked sensitive when a content warning is set with no text ([ThibG](https://github.com/tootsuite/mastodon/pull/13277))
+- Fix crash after deleting announcements in web UI ([codesections](https://github.com/tootsuite/mastodon/pull/13283), [ThibG](https://github.com/tootsuite/mastodon/pull/13312))
+- Fix bookmarks not being searchable ([Kjwon15](https://github.com/tootsuite/mastodon/pull/13271), [noellabo](https://github.com/tootsuite/mastodon/pull/13293))
+- Fix reported accounts not being whitelisted from further spam checks when resolving a spam check report ([ThibG](https://github.com/tootsuite/mastodon/pull/13289))
+- Fix web UI crash in single-column mode on prehistoric browsers ([ThibG](https://github.com/tootsuite/mastodon/pull/13267))
+- Fix some timeouts when searching for URLs ([ThibG](https://github.com/tootsuite/mastodon/pull/13253))
+- Fix detailed view of direct messages displaying a 0 boost count in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13244))
+- Fix regression in “Edit media” modal in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13243))
+- Fix public posts from silenced accounts not being changed to unlisted visibility ([ThibG](https://github.com/tootsuite/mastodon/pull/13096))
+- Fix error when searching for URLs that contain the mention syntax ([ThibG](https://github.com/tootsuite/mastodon/pull/13151))
+- Fix text area above/right of emoji picker being accidentally clickable in web UI ([ariasuni](https://github.com/tootsuite/mastodon/pull/13148))
+- Fix too large announcements not being scrollable in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13211))
+- Fix `tootctl media remove-orphans` crashing when encountering invalid media ([ThibG](https://github.com/tootsuite/mastodon/pull/13170))
+- Fix installation failing when Redis password contains special characters ([ThibG](https://github.com/tootsuite/mastodon/pull/13156))
+- Fix announcements with fully-qualified mentions to local users crashing web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/13164))
+
+### Security
+
+- Fix re-sending of e-mail confirmation not being rate limited ([Gargron](https://github.com/tootsuite/mastodon/pull/13360))
+
 ## [v3.1.2] - 2020-02-27
 ### Added
 
diff --git a/Dockerfile b/Dockerfile
index a22efe672..0537d8fac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:18.04 as build-dep
 SHELL ["bash", "-c"]
 
 # Install Node v12 (LTS)
-ENV NODE_VER="12.14.0"  
+ENV NODE_VER="12.16.1"
 RUN	ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \
@@ -38,8 +38,8 @@ RUN apt update && \
 	make -j$(nproc) > /dev/null && \
 	make install_bin install_include install_lib
 
-# Install ruby
-ENV RUBY_VER="2.6.5"
+# Install Ruby
+ENV RUBY_VER="2.6.6"
 ENV CPPFLAGS="-I/opt/jemalloc/include"
 ENV LDFLAGS="-L/opt/jemalloc/lib/"
 RUN apt update && \
diff --git a/Gemfile b/Gemfile
index c35b21be4..57bf27183 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 2.4.0', '< 3.0.0'
+ruby '>= 2.5.0', '< 3.0.0'
 
 gem 'pkg-config', '~> 1.4'
 
 gem 'puma', '~> 4.3'
-gem 'rails', '~> 5.2.4'
+gem 'rails', '~> 5.2.4.2'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 0.20'
 gem 'rack', '~> 2.2.2'
@@ -20,7 +20,7 @@ gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.4'
 gem 'dotenv-rails', '~> 2.7'
 
-gem 'aws-sdk-s3', '~> 1.60', require: false
+gem 'aws-sdk-s3', '~> 1.61', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
@@ -35,7 +35,7 @@ gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'iso-639'
 gem 'chewy', '~> 5.1'
-gem 'cld3', '~> 3.2.6'
+gem 'cld3', '~> 3.3.0'
 gem 'devise', '~> 4.7'
 gem 'devise-two-factor', '~> 3.1'
 
@@ -48,8 +48,8 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.9'
 
-gem 'discard', '~> 1.1'
-gem 'doorkeeper', '~> 5.2'
+gem 'discard', '~> 1.2'
+gem 'doorkeeper', '~> 5.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
@@ -69,7 +69,7 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b
 gem 'nokogiri', '~> 1.10'
 gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.10'
-gem 'ox', '~> 2.12'
+gem 'ox', '~> 2.13'
 gem 'parslet'
 gem 'parallel', '~> 1.19'
 gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c'
@@ -84,7 +84,7 @@ gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 1.1'
 gem 'ruby-progressbar', '~> 1.10'
 gem 'sanitize', '~> 5.1'
-gem 'sidekiq', '~> 5.2'
+gem 'sidekiq', '~> 6.0'
 gem 'sidekiq-scheduler', '~> 3.0'
 gem 'sidekiq-unique-jobs', '~> 6.0'
 gem 'sidekiq-bulk', '~>0.2.0'
@@ -92,9 +92,9 @@ gem 'simple-navigation', '~> 4.1'
 gem 'simple_form', '~> 5.0'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'stoplight', '~> 2.2.0'
-gem 'strong_migrations', '~> 0.5'
+gem 'strong_migrations', '~> 0.6'
 gem 'tty-command', '~> 0.9', require: false
-gem 'tty-prompt', '~> 0.20', require: false
+gem 'tty-prompt', '~> 0.21', require: false
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2019'
 gem 'webpacker', '~> 4.2'
@@ -112,7 +112,7 @@ group :development, :test do
   gem 'i18n-tasks', '~> 0.9', require: false
   gem 'pry-byebug', '~> 3.8'
   gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 3.9'
+  gem 'rspec-rails', '~> 4.0'
 end
 
 group :production, :test do
@@ -122,19 +122,19 @@ end
 group :test do
   gem 'capybara', '~> 3.31'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.10'
+  gem 'faker', '~> 2.11'
   gem 'microformats', '~> 4.2'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
   gem 'simplecov', '~> 0.18', require: false
   gem 'webmock', '~> 3.8'
-  gem 'parallel_tests', '~> 2.30'
+  gem 'parallel_tests', '~> 2.32'
 end
 
 group :development do
   gem 'active_record_query_trace', '~> 1.7'
   gem 'annotate', '~> 3.0'
-  gem 'better_errors', '~> 2.5'
+  gem 'better_errors', '~> 2.6'
   gem 'binding_of_caller', '~> 0.7'
   gem 'bullet', '~> 6.1'
   gem 'letter_opener', '~> 1.7'
@@ -142,10 +142,10 @@ group :development do
   gem 'memory_profiler'
   gem 'rubocop', '~> 0.79', require: false
   gem 'rubocop-rails', '~> 2.4', require: false
-  gem 'brakeman', '~> 4.7', require: false
+  gem 'brakeman', '~> 4.8', require: false
   gem 'bundler-audit', '~> 0.6', require: false
 
-  gem 'capistrano', '~> 3.11'
+  gem 'capistrano', '~> 3.12'
   gem 'capistrano-rails', '~> 1.4'
   gem 'capistrano-rbenv', '~> 2.1'
   gem 'capistrano-yarn', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d0b75f91..3ac0a06ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,25 +31,25 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.1)
-      actionpack (= 5.2.4.1)
+    actioncable (5.2.4.2)
+      actionpack (= 5.2.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
+    actionmailer (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionpack (5.2.4.2)
+      actionview (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionview (5.2.4.2)
+      activesupport (= 5.2.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -60,20 +60,20 @@ GEM
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_query_trace (1.7)
-    activejob (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activejob (5.2.4.2)
+      activesupport (= 5.2.4.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       arel (>= 9.0)
-    activestorage (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
+    activestorage (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.1)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -92,23 +92,23 @@ GEM
     av (0.9.0)
       cocaine (~> 0.5.3)
     aws-eventstream (1.0.3)
-    aws-partitions (1.261.0)
-    aws-sdk-core (3.86.0)
+    aws-partitions (1.286.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.27.0)
+    aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.1)
+    aws-sdk-s3 (1.61.1)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
     bcrypt (3.1.12)
-    better_errors (2.5.1)
+    better_errors (2.6.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -116,10 +116,10 @@ GEM
       debug_inspector (>= 0.0.1)
     blurhash (0.1.4)
       ffi (~> 1.10.0)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
-    brakeman (4.7.2)
-    browser (3.0.3)
+    brakeman (4.8.0)
+    browser (4.0.0)
     builder (3.2.4)
     bullet (6.1.0)
       activesupport (>= 3.0.0)
@@ -128,7 +128,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     byebug (11.1.1)
-    capistrano (3.11.2)
+    capistrano (3.12.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -160,13 +160,13 @@ GEM
       elasticsearch (>= 2.0.0)
       elasticsearch-dsl
     chunky_png (1.3.11)
-    cld3 (3.2.6)
+    cld3 (3.3.0)
       ffi (>= 1.1.0, < 1.12.0)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -190,37 +190,37 @@ GEM
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
     diff-lcs (1.3)
-    discard (1.1.0)
+    discard (1.2.0)
       activerecord (>= 4.2, < 7)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.2.3)
+    doorkeeper (5.3.1)
       railties (>= 5)
     dotenv (2.7.5)
     dotenv-rails (2.7.5)
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     e2mmap (0.1.0)
-    elasticsearch (7.3.0)
-      elasticsearch-api (= 7.3.0)
-      elasticsearch-transport (= 7.3.0)
-    elasticsearch-api (7.3.0)
+    elasticsearch (7.5.0)
+      elasticsearch-api (= 7.5.0)
+      elasticsearch-transport (= 7.5.0)
+    elasticsearch-api (7.5.0)
       multi_json
     elasticsearch-dsl (0.1.8)
-    elasticsearch-transport (7.3.0)
-      faraday
+    elasticsearch-transport (7.5.0)
+      faraday (>= 0.14, < 1)
       multi_json
     encryptor (3.0.0)
     equatable (0.6.1)
     erubi (1.9.0)
-    et-orbi (1.1.6)
+    et-orbi (1.2.3)
       tzinfo
     excon (0.71.0)
     fabrication (2.21.0)
-    faker (2.10.1)
+    faker (2.11.0)
       i18n (>= 1.6, < 2)
-    faraday (1.0.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
     fastimage (2.1.7)
@@ -241,8 +241,8 @@ GEM
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     formatador (0.2.5)
-    fugit (1.1.6)
-      et-orbi (~> 1.1, >= 1.1.6)
+    fugit (1.3.3)
+      et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
@@ -265,8 +265,8 @@ GEM
       railties (>= 4.0.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashdiff (1.0.0)
-    hashie (3.6.0)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
     highline (2.0.3)
     hiredis (0.6.3)
     hkdf (0.3.0)
@@ -287,7 +287,7 @@ GEM
       rainbow (>= 2.0.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.30)
+    i18n-tasks (0.9.31)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -299,19 +299,19 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.0)
     ipaddress (0.8.3)
-    iso-639 (0.2.8)
+    iso-639 (0.3.5)
     jaro_winkler (1.5.4)
     jmespath (1.4.0)
     json (2.3.0)
     json-canonicalization (0.2.0)
-    json-ld (3.1.0)
+    json-ld (3.1.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.1)
+      json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.14)
       rack (~> 2.0)
       rdf (~> 3.1)
-    json-ld-preloaded (3.1.0)
+    json-ld-preloaded (3.1.2)
       json-ld (~> 3.1)
       rdf (~> 3.1)
     jsonapi-renderer (0.2.2)
@@ -361,11 +361,11 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.3)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.1)
@@ -374,7 +374,7 @@ GEM
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -383,9 +383,9 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.10.1)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    oj (3.10.5)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-cas (1.1.1)
       addressable (~> 2.3)
@@ -395,7 +395,7 @@ GEM
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.7)
     orm_adapter (0.5.0)
-    ox (2.12.1)
+    ox (2.13.2)
     paperclip (6.0.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -406,15 +406,15 @@ GEM
       av (~> 0.9.0)
       paperclip (>= 2.5.2)
     parallel (1.19.1)
-    parallel_tests (2.30.1)
+    parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.2)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.3)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    pg (1.2.2)
+    pg (1.2.3)
     pghero (2.4.1)
       activerecord (>= 5)
     pkg-config (1.4.1)
@@ -435,7 +435,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.1)
+    puma (4.3.3)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -445,24 +445,24 @@ GEM
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (2.0.7)
+    rack-protection (2.0.8.1)
       rack
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.1)
-      actioncable (= 5.2.4.1)
-      actionmailer (= 5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      activestorage (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    rails (5.2.4.2)
+      actioncable (= 5.2.4.2)
+      actionmailer (= 5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      activestorage (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.1)
+      railties (= 5.2.4.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -478,9 +478,9 @@ GEM
       railties (>= 5.0, < 6)
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -523,26 +523,26 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
     rqrcode_core (0.1.1)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
     rspec-sidekiq (3.0.3)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -556,38 +556,40 @@ GEM
     ruby-progressbar (1.10.1)
     ruby-saml (1.9.0)
       nokogiri (>= 1.5.10)
-    rufus-scheduler (3.5.2)
-      fugit (~> 1.1, >= 1.1.5)
+    rufus-scheduler (3.6.0)
+      fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
     sanitize (5.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.0.4)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (3.0.0)
+    sidekiq-scheduler (3.0.1)
+      e2mmap
       redis (>= 3, < 5)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 3)
+      thwait
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (6.0.18)
+    sidekiq-unique-jobs (6.0.21)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 4.0, < 7.0)
       thor (~> 0)
     simple-navigation (4.1.0)
       activesupport (>= 2.3.2)
-    simple_form (5.0.1)
+    simple_form (5.0.2)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.18.2)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.0)
+    simplecov-html (0.12.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -595,7 +597,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.20.0)
+    sshkit (1.21.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.15)
@@ -603,7 +605,7 @@ GEM
     stoplight (2.2.0)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
-    strong_migrations (0.5.1)
+    strong_migrations (0.6.2)
       activerecord (>= 5)
     temple (0.8.2)
     terminal-table (1.8.0)
@@ -614,11 +616,11 @@ GEM
     thread_safe (0.3.6)
     thwait (0.1.0)
     tilt (2.0.10)
-    tty-color (0.5.0)
+    tty-color (0.5.1)
     tty-command (0.9.0)
       pastel (~> 0.7.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.20.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.21.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
       tty-reader (~> 0.7.0)
@@ -626,10 +628,10 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
@@ -640,7 +642,7 @@ GEM
     uniform_notifier (1.13.0)
     warden (1.2.8)
       rack (>= 2.0.6)
-    webmock (3.8.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -666,35 +668,35 @@ DEPENDENCIES
   active_record_query_trace (~> 1.7)
   addressable (~> 2.7)
   annotate (~> 3.0)
-  aws-sdk-s3 (~> 1.60)
-  better_errors (~> 2.5)
+  aws-sdk-s3 (~> 1.61)
+  better_errors (~> 2.6)
   binding_of_caller (~> 0.7)
   blurhash (~> 0.1)
   bootsnap (~> 1.4)
-  brakeman (~> 4.7)
+  brakeman (~> 4.8)
   browser
   bullet (~> 6.1)
   bundler-audit (~> 0.6)
-  capistrano (~> 3.11)
+  capistrano (~> 3.12)
   capistrano-rails (~> 1.4)
   capistrano-rbenv (~> 2.1)
   capistrano-yarn (~> 2.0)
   capybara (~> 3.31)
   charlock_holmes (~> 0.7.7)
   chewy (~> 5.1)
-  cld3 (~> 3.2.6)
+  cld3 (~> 3.3.0)
   climate_control (~> 0.2)
   concurrent-ruby
   connection_pool
   devise (~> 4.7)
   devise-two-factor (~> 3.1)
   devise_pam_authenticatable2 (~> 9.2)
-  discard (~> 1.1)
-  doorkeeper (~> 5.2)
+  discard (~> 1.2)
+  doorkeeper (~> 5.3)
   dotenv-rails (~> 2.7)
   e2mmap (~> 0.1.0)
   fabrication (~> 2.21)
-  faker (~> 2.10)
+  faker (~> 2.11)
   fast_blank (~> 1.0)
   fastimage
   fog-core (<= 2.1.0)
@@ -732,11 +734,11 @@ DEPENDENCIES
   omniauth (~> 1.9)
   omniauth-cas (~> 1.1)
   omniauth-saml (~> 1.10)
-  ox (~> 2.12)
+  ox (~> 2.13)
   paperclip (~> 6.0)
   paperclip-av-transcoder (~> 0.6)
   parallel (~> 1.19)
-  parallel_tests (~> 2.30)
+  parallel_tests (~> 2.32)
   parslet
   pg (~> 1.2)
   pghero (~> 2.4)
@@ -751,7 +753,7 @@ DEPENDENCIES
   rack (~> 2.2.2)
   rack-attack (~> 6.2)
   rack-cors (~> 1.1)
-  rails (~> 5.2.4)
+  rails (~> 5.2.4.2)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 5.1)
   rails-settings-cached (~> 0.6)
@@ -761,13 +763,13 @@ DEPENDENCIES
   redis-namespace (~> 1.7)
   redis-rails (~> 5.0)
   rqrcode (~> 1.1)
-  rspec-rails (~> 3.9)
+  rspec-rails (~> 4.0)
   rspec-sidekiq (~> 3.0)
   rubocop (~> 0.79)
   rubocop-rails (~> 2.4)
   ruby-progressbar (~> 1.10)
   sanitize (~> 5.1)
-  sidekiq (~> 5.2)
+  sidekiq (~> 6.0)
   sidekiq-bulk (~> 0.2.0)
   sidekiq-scheduler (~> 3.0)
   sidekiq-unique-jobs (~> 6.0)
@@ -779,11 +781,11 @@ DEPENDENCIES
   stackprof
   stoplight (~> 2.2.0)
   streamio-ffmpeg (~> 3.0)
-  strong_migrations (~> 0.5)
+  strong_migrations (~> 0.6)
   thor (~> 0.20)
   thwait (~> 0.1.0)
   tty-command (~> 0.9)
-  tty-prompt (~> 0.20)
+  tty-prompt (~> 0.21)
   twitter-text (~> 1.14)
   tzinfo-data (~> 1.2019)
   webmock (~> 3.8)
diff --git a/README.md b/README.md
index 7db66abfa..9ef4acb17 100644
--- a/README.md
+++ b/README.md
@@ -68,8 +68,8 @@ Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Strea
 **Requirements:**
 
 - **PostgreSQL** 9.5+
-- **Redis**
-- **Ruby** 2.4+
+- **Redis** 4+
+- **Ruby** 2.5+
 - **Node.js** 10.13+
 
 The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
diff --git a/Vagrantfile b/Vagrantfile
index 79af1dc5d..7d0f7b3de 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -91,7 +91,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index f5735421c..bec9ed88b 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -47,6 +47,11 @@ class StatusesIndex < Chewy::Index
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
+    crutch :bookmarks do |collection|
+      data = ::Bookmark.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id)
+      data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
+    end
+
     root date_detection: false do
       field :id, type: 'long'
       field :account_id, type: 'long'
diff --git a/app/controllers/account_follow_controller.rb b/app/controllers/account_follow_controller.rb
index 185a355f8..33394074d 100644
--- a/app/controllers/account_follow_controller.rb
+++ b/app/controllers/account_follow_controller.rb
@@ -6,7 +6,7 @@ class AccountFollowController < ApplicationController
   before_action :authenticate_user!
 
   def create
-    FollowService.new.call(current_user.account, @account.acct)
+    FollowService.new.call(current_user.account, @account, with_rate_limit: true)
     redirect_to account_path(@account)
   end
 end
diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index e273dfeae..2d77620df 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -2,8 +2,18 @@
 
 module Admin
   class ActionLogsController < BaseController
-    def index
-      @action_logs = Admin::ActionLog.page(params[:page])
+    before_action :set_action_logs
+
+    def index; end
+
+    private
+
+    def set_action_logs
+      @action_logs = Admin::ActionLogFilter.new(filter_params).results.page(params[:page])
+    end
+
+    def filter_params
+      params.slice(:page, *Admin::ActionLogFilter::KEYS).permit(:page, *Admin::ActionLogFilter::KEYS)
     end
   end
 end
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index 9fe85064e..c25919726 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -6,12 +6,12 @@ module Admin
 
     def index
       authorize :email_domain_block, :index?
-      @email_domain_blocks = EmailDomainBlock.page(params[:page])
+      @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page])
     end
 
     def new
       authorize :email_domain_block, :create?
-      @email_domain_block = EmailDomainBlock.new
+      @email_domain_block = EmailDomainBlock.new(domain: params[:_domain])
     end
 
     def create
@@ -21,6 +21,28 @@ module Admin
 
       if @email_domain_block.save
         log_action :create, @email_domain_block
+
+        if @email_domain_block.with_dns_records?
+          hostnames = []
+          ips       = []
+
+          Resolv::DNS.open do |dns|
+            dns.timeouts = 1
+
+            hostnames = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+
+            ([@email_domain_block.domain] + hostnames).uniq.each do |hostname|
+              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
+              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
+            end
+          end
+
+          (hostnames + ips).each do |hostname|
+            another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: @email_domain_block)
+            log_action :create, another_email_domain_block if another_email_domain_block.save
+          end
+        end
+
         redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg')
       else
         render :new
@@ -41,7 +63,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:email_domain_block).permit(:domain)
+      params.require(:email_domain_block).permit(:domain, :with_dns_records)
     end
   end
 end
diff --git a/app/controllers/admin/site_uploads_controller.rb b/app/controllers/admin/site_uploads_controller.rb
new file mode 100644
index 000000000..cacecedb0
--- /dev/null
+++ b/app/controllers/admin/site_uploads_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Admin
+  class SiteUploadsController < BaseController
+    before_action :set_site_upload
+
+    def destroy
+      authorize :settings, :destroy?
+
+      @site_upload.destroy!
+
+      redirect_to edit_admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
+    end
+
+    private
+
+    def set_site_upload
+      @site_upload = SiteUpload.find(params[:id])
+    end
+  end
+end
diff --git a/app/controllers/admin/warning_presets_controller.rb b/app/controllers/admin/warning_presets_controller.rb
index 37be842c5..b376f8d9b 100644
--- a/app/controllers/admin/warning_presets_controller.rb
+++ b/app/controllers/admin/warning_presets_controller.rb
@@ -7,7 +7,7 @@ module Admin
     def index
       authorize :account_warning_preset, :index?
 
-      @warning_presets = AccountWarningPreset.all
+      @warning_presets = AccountWarningPreset.alphabetic
       @warning_preset  = AccountWarningPreset.new
     end
 
@@ -19,7 +19,7 @@ module Admin
       if @warning_preset.save
         redirect_to admin_warning_presets_path
       else
-        @warning_presets = AccountWarningPreset.all
+        @warning_presets = AccountWarningPreset.alphabetic
         render :index
       end
     end
@@ -52,7 +52,7 @@ module Admin
     end
 
     def warning_preset_params
-      params.require(:account_warning_preset).permit(:text)
+      params.require(:account_warning_preset).permit(:title, :text)
     end
   end
 end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 68bf425f4..153ade253 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -44,6 +44,10 @@ class Api::BaseController < ApplicationController
     render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
   end
 
+  rescue_from Mastodon::RateLimitExceededError do
+    render json: { error: I18n.t('errors.429') }, status: 429
+  end
+
   rescue_from ActionController::ParameterMissing do |e|
     render json: { error: e.to_s }, status: 400
   end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index e360b8a92..1daa1ed0d 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   before_action :set_account
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
@@ -27,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    (@account.hides_followers? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index a405b365f..6fc23cf75 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   before_action :set_account
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
@@ -27,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def hide_results?
-    (@account.user_hides_network? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
+    (@account.hides_following? && current_account&.id != @account.id) || (current_account && @account.blocking?(current_account))
   end
 
   def default_accounts
diff --git a/app/controllers/api/v1/accounts/identity_proofs_controller.rb b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
index bea51ae11..8dad6fee9 100644
--- a/app/controllers/api/v1/accounts/identity_proofs_controller.rb
+++ b/app/controllers/api/v1/accounts/identity_proofs_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::IdentityProofsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def index
     @proofs = @account.identity_proofs.active
     render json: @proofs, each_serializer: REST::IdentityProofSerializer
diff --git a/app/controllers/api/v1/accounts/lists_controller.rb b/app/controllers/api/v1/accounts/lists_controller.rb
index 72392453c..ccb751f8f 100644
--- a/app/controllers/api/v1/accounts/lists_controller.rb
+++ b/app/controllers/api/v1/accounts/lists_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Accounts::ListsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def index
     @lists = @account.lists.where(account: current_account)
     render json: @lists, each_serializer: REST::ListSerializer
diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb
index 0a0239c42..3915b5669 100644
--- a/app/controllers/api/v1/accounts/pins_controller.rb
+++ b/app/controllers/api/v1/accounts/pins_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Accounts::PinsController < Api::BaseController
   before_action :require_user!
   before_action :set_account
 
-  respond_to :json
-
   def create
     AccountPin.create!(account: current_account, target_account: @account)
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index ab8a0461f..1d3992a28 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:follows' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     accounts = Account.where(id: account_ids).select('id')
     # .where doesn't guarantee that our results are in the same order
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index 4217b527a..3061fcb7e 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Accounts::SearchController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
   before_action :require_user!
 
-  respond_to :json
-
   def show
     @accounts = account_search
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 333db9618..114ee0a82 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
 
   after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index d68d2715f..0080faf33 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::AccountsController < Api::BaseController
 
   skip_before_action :require_authenticated_user!, only: :create
 
-  respond_to :json
+  override_rate_limit_headers :follow, family: :follows
 
   def show
     render json: @account, serializer: REST::AccountSerializer
@@ -31,7 +31,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def follow
-    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs))
+    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs), with_rate_limit: true)
 
     options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
 
diff --git a/app/controllers/api/v1/apps/credentials_controller.rb b/app/controllers/api/v1/apps/credentials_controller.rb
index 8b63d0490..0475b2d4a 100644
--- a/app/controllers/api/v1/apps/credentials_controller.rb
+++ b/app/controllers/api/v1/apps/credentials_controller.rb
@@ -3,8 +3,6 @@
 class Api::V1::Apps::CredentialsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read }
 
-  respond_to :json
-
   def show
     render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key)
   end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 4cff04cad..a2baeef90 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::BlocksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index e1b244e76..c15212f0a 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::BookmarksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index b19f27ebf..bc8013379 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -9,8 +9,6 @@ class Api::V1::ConversationsController < Api::BaseController
   before_action :set_conversation, except: :index
   after_action :insert_pagination_headers, only: :index
 
-  respond_to :json
-
   def index
     @conversations = paginated_conversations
     render json: @conversations, each_serializer: REST::ConversationSerializer
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index 4e6d5d7c6..08b3474cc 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::CustomEmojisController < Api::BaseController
-  respond_to :json
-
   skip_before_action :set_cache_headers
 
   def index
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index af9e7a20f..5bb02d834 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -8,8 +8,6 @@ class Api::V1::DomainBlocksController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers, only: :show
 
-  respond_to :json
-
   def show
     @blocks = load_domain_blocks
     render json: @blocks.map(&:domain)
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 2770c7aef..c87dbc4ce 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::EndorsementsController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index db827f9d4..3e242905d 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::FavouritesController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index fb27ef88b..8c1b81a0f 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -2,12 +2,9 @@
 
 class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
-
   before_action :require_user!
   before_action :set_most_used_tags, only: :index
 
-  respond_to :json
-
   def index
     render json: @most_used_tags, each_serializer: REST::TagSerializer
   end
diff --git a/app/controllers/api/v1/filters_controller.rb b/app/controllers/api/v1/filters_controller.rb
index e5ebaff4d..b0ace3af0 100644
--- a/app/controllers/api/v1/filters_controller.rb
+++ b/app/controllers/api/v1/filters_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::FiltersController < Api::BaseController
   before_action :set_filters, only: :index
   before_action :set_filter, only: [:show, :update, :destroy]
 
-  respond_to :json
-
   def index
     render json: @filters, each_serializer: REST::FilterSerializer
   end
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb
index b30e8464c..4f6b4bcbf 100644
--- a/app/controllers/api/v1/instances/activity_controller.rb
+++ b/app/controllers/api/v1/instances/activity_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Instances::ActivityController < Api::BaseController
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
-  respond_to :json
-
   def show
     expires_in 1.day, public: true
     render_with_cache json: :activity, expires_in: 1.day
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index cc00d8a6b..9fa440935 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::Instances::PeersController < Api::BaseController
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
-  respond_to :json
-
   def index
     expires_in 1.day, public: true
     render_with_cache(expires_in: 1.day) { Account.remote.domains }
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index c323b60b4..5b5058a7b 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::InstancesController < Api::BaseController
-  respond_to :json
-
   skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index 81825db15..0bb3d0d27 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -3,27 +3,42 @@
 class Api::V1::MediaController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:media' }
   before_action :require_user!
-
-  respond_to :json
+  before_action :set_media_attachment, except: [:create]
+  before_action :check_processing, except: [:create]
 
   def create
-    @media = current_account.media_attachments.create!(media_params)
-    render json: @media, serializer: REST::MediaAttachmentSerializer
+    @media_attachment = current_account.media_attachments.create!(media_attachment_params)
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     render json: file_type_error, status: 422
   rescue Paperclip::Error
     render json: processing_error, status: 500
   end
 
+  def show
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
+  end
+
   def update
-    @media = current_account.media_attachments.where(status_id: nil).find(params[:id])
-    @media.update!(media_params)
-    render json: @media, serializer: REST::MediaAttachmentSerializer
+    @media_attachment.update!(media_attachment_params)
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
   end
 
   private
 
-  def media_params
+  def status_code_for_media_attachment
+    @media_attachment.not_processed? ? 206 : 200
+  end
+
+  def set_media_attachment
+    @media_attachment = current_account.media_attachments.unattached.find(params[:id])
+  end
+
+  def check_processing
+    render json: processing_error, status: 422 if @media_attachment.processing_failed?
+  end
+
+  def media_attachment_params
     params.permit(:file, :description, :focus)
   end
 
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index df6c8e86c..65439fe9b 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::MutesController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index bf3002e79..8ac227765 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -6,8 +6,6 @@ class Api::V1::NotificationsController < Api::BaseController
   before_action :require_user!
   after_action :insert_pagination_headers, only: :index
 
-  respond_to :json
-
   DEFAULT_NOTIFICATIONS_LIMIT = 15
 
   def index
diff --git a/app/controllers/api/v1/polls/votes_controller.rb b/app/controllers/api/v1/polls/votes_controller.rb
index 3fa0b6a76..e1d26106a 100644
--- a/app/controllers/api/v1/polls/votes_controller.rb
+++ b/app/controllers/api/v1/polls/votes_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Polls::VotesController < Api::BaseController
   before_action :require_user!
   before_action :set_poll
 
-  respond_to :json
-
   def create
     VoteService.new.call(current_account, @poll, vote_params[:choices])
     render json: @poll, serializer: REST::PollSerializer
diff --git a/app/controllers/api/v1/polls_controller.rb b/app/controllers/api/v1/polls_controller.rb
index 031e6d42d..744baf7bb 100644
--- a/app/controllers/api/v1/polls_controller.rb
+++ b/app/controllers/api/v1/polls_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::PollsController < Api::BaseController
   before_action :set_poll
   before_action :refresh_poll
 
-  respond_to :json
-
   def show
     render json: @poll, serializer: REST::PollSerializer, include_results: true
   end
diff --git a/app/controllers/api/v1/preferences_controller.rb b/app/controllers/api/v1/preferences_controller.rb
index 077d39f5d..1640a8224 100644
--- a/app/controllers/api/v1/preferences_controller.rb
+++ b/app/controllers/api/v1/preferences_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::PreferencesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     render json: current_account, serializer: REST::PreferencesSerializer
   end
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 1b0b4b05b..e10083d45 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::ReportsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:reports' }, only: [:create]
   before_action :require_user!
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :reports
 
   def create
     @report = ReportService.new.call(
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
index a7f1eed00..3954af3c9 100644
--- a/app/controllers/api/v1/statuses/bookmarks_controller.rb
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     current_account.bookmarks.find_or_create_by!(account: current_account, status: @status)
     render json: @status, serializer: REST::StatusSerializer
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 05f4acc33..8229786d6 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
   before_action :set_status
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb
index f18ace996..7afa822ed 100644
--- a/app/controllers/api/v1/statuses/favourites_controller.rb
+++ b/app/controllers/api/v1/statuses/favourites_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     FavouriteService.new.call(current_account, @status)
     render json: @status, serializer: REST::StatusSerializer
diff --git a/app/controllers/api/v1/statuses/mutes_controller.rb b/app/controllers/api/v1/statuses/mutes_controller.rb
index b02469b4f..43c7a525a 100644
--- a/app/controllers/api/v1/statuses/mutes_controller.rb
+++ b/app/controllers/api/v1/statuses/mutes_controller.rb
@@ -8,8 +8,6 @@ class Api::V1::Statuses::MutesController < Api::BaseController
   before_action :set_status
   before_action :set_conversation
 
-  respond_to :json
-
   def create
     current_account.mute_conversation!(@conversation)
     @mutes_map = { @conversation.id => true }
diff --git a/app/controllers/api/v1/statuses/pins_controller.rb b/app/controllers/api/v1/statuses/pins_controller.rb
index 4118a8ce4..51b1621b6 100644
--- a/app/controllers/api/v1/statuses/pins_controller.rb
+++ b/app/controllers/api/v1/statuses/pins_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::PinsController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     StatusPin.create!(account: current_account, status: @status)
     distribute_add_activity!
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index fa60e7d84..6c9e49d90 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
   before_action :set_status
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
diff --git a/app/controllers/api/v1/statuses/reblogs_controller.rb b/app/controllers/api/v1/statuses/reblogs_controller.rb
index 67106ccbe..7fa774a4d 100644
--- a/app/controllers/api/v1/statuses/reblogs_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogs_controller.rb
@@ -7,10 +7,11 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
   before_action :require_user!
   before_action :set_reblog
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :statuses
 
   def create
     @status = ReblogService.new.call(current_account, @reblog, reblog_params)
+
     render json: @status, serializer: REST::StatusSerializer
   end
 
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index bba3c0651..93a253cbb 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -7,8 +7,9 @@ class Api::V1::StatusesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :destroy]
   before_action :require_user!, except:  [:show, :context]
   before_action :set_status, only:       [:show, :context]
+  before_action :set_thread, only:       [:create]
 
-  respond_to :json
+  override_rate_limit_headers :create, family: :statuses
 
   # This API was originally unlimited, pagination cannot be introduced without
   # breaking backwards-compatibility. Arbitrarily high number to cover most
@@ -36,7 +37,7 @@ class Api::V1::StatusesController < Api::BaseController
   def create
     @status = PostStatusService.new.call(current_user.account,
                                          text: status_params[:status],
-                                         thread: status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id]),
+                                         thread: @thread,
                                          media_ids: status_params[:media_ids],
                                          sensitive: status_params[:sensitive],
                                          spoiler_text: status_params[:spoiler_text],
@@ -44,7 +45,8 @@ class Api::V1::StatusesController < Api::BaseController
                                          scheduled_at: status_params[:scheduled_at],
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
-                                         idempotency: request.headers['Idempotency-Key'])
+                                         idempotency: request.headers['Idempotency-Key'],
+                                         with_rate_limit: true)
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
@@ -68,6 +70,12 @@ class Api::V1::StatusesController < Api::BaseController
     raise ActiveRecord::RecordNotFound
   end
 
+  def set_thread
+    @thread = status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id])
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
+  end
+
   def status_params
     params.permit(
       :status,
diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb
index ebb17608c..7cd60615a 100644
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::V1::StreamingController < Api::BaseController
-  respond_to :json
-
   def index
     if Rails.configuration.x.streaming_api_base_url != request.host
       redirect_to streaming_api_url, status: 301
diff --git a/app/controllers/api/v1/suggestions_controller.rb b/app/controllers/api/v1/suggestions_controller.rb
index 9da2b60ae..52054160d 100644
--- a/app/controllers/api/v1/suggestions_controller.rb
+++ b/app/controllers/api/v1/suggestions_controller.rb
@@ -7,8 +7,6 @@ class Api::V1::SuggestionsController < Api::BaseController
   before_action :require_user!
   before_action :set_accounts
 
-  respond_to :json
-
   def index
     render json: @accounts, each_serializer: REST::AccountSerializer
   end
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ff5ede138..ae6dbcb8b 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -5,8 +5,6 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   before_action :require_user!, only: [:show]
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
 
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index ccc10f966..581befef1 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   before_action :require_user!, only: [:show], if: :require_auth?
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 9adc4ad29..2d6ad5a80 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -4,8 +4,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
   before_action :load_tag
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  respond_to :json
-
   def show
     @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
diff --git a/app/controllers/api/v1/trends_controller.rb b/app/controllers/api/v1/trends_controller.rb
index bcea9857e..c875e9041 100644
--- a/app/controllers/api/v1/trends_controller.rb
+++ b/app/controllers/api/v1/trends_controller.rb
@@ -3,8 +3,6 @@
 class Api::V1::TrendsController < Api::BaseController
   before_action :set_tags
 
-  respond_to :json
-
   def index
     render json: @tags, each_serializer: REST::TagSerializer
   end
diff --git a/app/controllers/api/v2/media_controller.rb b/app/controllers/api/v2/media_controller.rb
new file mode 100644
index 000000000..0c1baf01d
--- /dev/null
+++ b/app/controllers/api/v2/media_controller.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Api::V2::MediaController < Api::V1::MediaController
+  def create
+    @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: 202
+  rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+    render json: file_type_error, status: 422
+  rescue Paperclip::Error
+    render json: processing_error, status: 500
+  end
+end
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index cbd9b551d..f17431dd1 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -8,8 +8,6 @@ class Api::V2::SearchController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:search' }
   before_action :require_user!
 
-  respond_to :json
-
   def index
     @search = Search.new(search_results)
     render json: @search, serializer: REST::SearchSerializer
diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb
index 4aa31695c..741ba910f 100644
--- a/app/controllers/api/web/embeds_controller.rb
+++ b/app/controllers/api/web/embeds_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::EmbedsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def create
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index f388b17e5..7916b82fa 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::PushSubscriptionsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def create
diff --git a/app/controllers/api/web/settings_controller.rb b/app/controllers/api/web/settings_controller.rb
index e3178bf48..3d65e46ed 100644
--- a/app/controllers/api/web/settings_controller.rb
+++ b/app/controllers/api/web/settings_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Api::Web::SettingsController < Api::Web::BaseController
-  respond_to :json
-
   before_action :require_user!
 
   def update
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0cfa2b386..973db6aca 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,6 +29,7 @@ class ApplicationController < ActionController::Base
   rescue_from Mastodon::NotPermittedError, with: :forbidden
   rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error
   rescue_from Mastodon::RaceConditionError, with: :service_unavailable
+  rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests
 
   before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
   before_action :require_functional!, if: :user_signed_in?
@@ -111,6 +112,10 @@ class ApplicationController < ActionController::Base
     respond_with_error(503)
   end
 
+  def too_many_requests
+    respond_with_error(429)
+  end
+
   def single_user_mode?
     @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.where('id > 0').exists?
   end
diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb
index e27366ea3..29c0288d0 100644
--- a/app/controllers/authorize_interactions_controller.rb
+++ b/app/controllers/authorize_interactions_controller.rb
@@ -20,7 +20,7 @@ class AuthorizeInteractionsController < ApplicationController
   end
 
   def create
-    if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource)
+    if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource, with_rate_limit: true)
       render :success
     else
       render :error
diff --git a/app/controllers/concerns/rate_limit_headers.rb b/app/controllers/concerns/rate_limit_headers.rb
index b79c558d8..86fe58a71 100644
--- a/app/controllers/concerns/rate_limit_headers.rb
+++ b/app/controllers/concerns/rate_limit_headers.rb
@@ -3,6 +3,20 @@
 module RateLimitHeaders
   extend ActiveSupport::Concern
 
+  class_methods do
+    def override_rate_limit_headers(method_name, options = {})
+      around_action(only: method_name, if: :current_account) do |_controller, block|
+        begin
+          block.call
+        ensure
+          rate_limiter = RateLimiter.new(current_account, options)
+          rate_limit_headers = rate_limiter.to_headers
+          response.headers.merge!(rate_limit_headers) unless response.headers['X-RateLimit-Remaining'].present? && rate_limit_headers['X-RateLimit-Remaining'].to_i > response.headers['X-RateLimit-Remaining'].to_i
+        end
+      end
+    end
+  end
+
   included do
     before_action :set_rate_limit_headers, if: :rate_limited_request?
   end
@@ -44,7 +58,7 @@ module RateLimitHeaders
   end
 
   def api_throttle_data
-    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] }
+    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] - v[:count] }
     request.env['rack.attack.throttle_data'][most_limited_type]
   end
 
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 7103749ad..14e22dd1e 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -28,7 +28,8 @@ class FollowerAccountsController < ApplicationController
         render json: collection_presenter,
                serializer: ActivityPub::CollectionSerializer,
                adapter: ActivityPub::Adapter,
-               content_type: 'application/activity+json'
+               content_type: 'application/activity+json',
+               fields: restrict_fields_to
       end
     end
   end
@@ -71,4 +72,12 @@ class FollowerAccountsController < ApplicationController
       )
     end
   end
+
+  def restrict_fields_to
+    if page_requested? || !@account.user_hides_network?
+      # Return all fields
+    else
+      %i(id type totalItems)
+    end
+  end
 end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 6c8fb84d8..95849ffb9 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -28,7 +28,8 @@ class FollowingAccountsController < ApplicationController
         render json: collection_presenter,
                serializer: ActivityPub::CollectionSerializer,
                adapter: ActivityPub::Adapter,
-               content_type: 'application/activity+json'
+               content_type: 'application/activity+json',
+               fields: restrict_fields_to
       end
     end
   end
@@ -71,4 +72,12 @@ class FollowingAccountsController < ApplicationController
       )
     end
   end
+
+  def restrict_fields_to
+    if page_requested? || !@account.user_hides_network?
+      # Return all fields
+    else
+      %i(id type totalItems)
+    end
+  end
 end
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 38f2e39c1..7b8c4ae23 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -29,6 +29,6 @@ class Settings::ImportsController < Settings::BaseController
   end
 
   def import_params
-    params.require(:import).permit(:data, :type)
+    params.require(:import).permit(:data, :type, :mode)
   end
 end
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 6bc75aa56..88d6e4580 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -9,79 +9,8 @@ module Admin::ActionLogsHelper
     end
   end
 
-  def relevant_log_changes(log)
-    if log.target_type == 'CustomEmoji' && [:enable, :disable, :destroy].include?(log.action)
-      log.recorded_changes.slice('domain')
-    elsif log.target_type == 'CustomEmoji' && log.action == :update
-      log.recorded_changes.slice('domain', 'visible_in_picker')
-    elsif log.target_type == 'User' && [:promote, :demote].include?(log.action)
-      log.recorded_changes.slice('moderator', 'admin')
-    elsif log.target_type == 'User' && [:change_email].include?(log.action)
-      log.recorded_changes.slice('email', 'unconfirmed_email')
-    elsif log.target_type == 'DomainBlock'
-      log.recorded_changes.slice('severity', 'reject_media')
-    elsif log.target_type == 'Status' && log.action == :update
-      log.recorded_changes.slice('sensitive')
-    elsif log.target_type == 'Announcement' && log.action == :update
-      log.recorded_changes.slice('text', 'starts_at', 'ends_at', 'all_day')
-    end
-  end
-
-  def log_extra_attributes(hash)
-    safe_join(hash.to_a.map { |key, value| safe_join([content_tag(:span, key, class: 'diff-key'), '=', log_change(value)]) }, ' ')
-  end
-
-  def log_change(val)
-    return content_tag(:span, val, class: 'diff-neutral') unless val.is_a?(Array)
-    safe_join([content_tag(:span, val.first, class: 'diff-old'), content_tag(:span, val.last, class: 'diff-new')], '→')
-  end
-
-  def icon_for_log(log)
-    case log.target_type
-    when 'Account', 'User'
-      'user'
-    when 'CustomEmoji'
-      'file'
-    when 'Report'
-      'flag'
-    when 'DomainBlock'
-      'lock'
-    when 'DomainAllow'
-      'plus-circle'
-    when 'EmailDomainBlock'
-      'envelope'
-    when 'Status'
-      'pencil'
-    when 'AccountWarning'
-      'warning'
-    when 'Announcement'
-      'bullhorn'
-    end
-  end
-
-  def class_for_log_icon(log)
-    case log.action
-    when :enable, :unsuspend, :unsilence, :confirm, :promote, :resolve
-      'positive'
-    when :create
-      opposite_verbs?(log) ? 'negative' : 'positive'
-    when :update, :reset_password, :disable_2fa, :memorialize, :change_email
-      'neutral'
-    when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen
-      'negative'
-    when :destroy
-      opposite_verbs?(log) ? 'positive' : 'negative'
-    else
-      ''
-    end
-  end
-
   private
 
-  def opposite_verbs?(log)
-    %w(DomainBlock EmailDomainBlock AccountWarning).include?(log.target_type)
-  end
-
   def linkable_log_target(record)
     case record.class.name
     when 'Account'
@@ -99,7 +28,7 @@ module Admin::ActionLogsHelper
     when 'AccountWarning'
       link_to record.target_account.acct, admin_account_path(record.target_account_id)
     when 'Announcement'
-      link_to "##{record.id}", edit_admin_announcement_path(record.id)
+      link_to truncate(record.text), edit_admin_announcement_path(record.id)
     end
   end
 
@@ -118,7 +47,7 @@ module Admin::ActionLogsHelper
         I18n.t('admin.action_logs.deleted_status')
       end
     when 'Announcement'
-      "##{attributes['id']}"
+      truncate(attributes['text'])
     end
   end
 end
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 6ab92939d..ba0ca9638 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -10,6 +10,7 @@ module Admin::FilterHelper
     InviteFilter::KEYS,
     RelationshipFilter::KEYS,
     AnnouncementFilter::KEYS,
+    Admin::ActionLogFilter::KEYS,
   ].flatten.freeze
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb
new file mode 100644
index 000000000..baf14ab25
--- /dev/null
+++ b/app/helpers/admin/settings_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Admin::SettingsHelper
+  def site_upload_delete_hint(hint, var)
+    upload = SiteUpload.find_by(var: var.to_s)
+    return hint unless upload
+
+    link = link_to t('admin.site_uploads.delete'), admin_site_upload_path(upload), data: { method: :delete }
+    safe_join([hint, link], '<br/>'.html_safe)
+  end
+end
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index d4a824e2c..cb2c682a4 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -106,7 +106,7 @@ export function fetchAccount(id) {
       dispatch,
       getState,
       db.transaction('accounts', 'read').objectStore('accounts').index('id'),
-      id
+      id,
     ).then(() => db.close(), error => {
       db.close();
       throw error;
@@ -396,6 +396,7 @@ export function fetchFollowersFail(id, error) {
     type: FOLLOWERS_FETCH_FAIL,
     id,
     error,
+    skipNotFound: true,
   };
 };
 
@@ -482,6 +483,7 @@ export function fetchFollowingFail(id, error) {
     type: FOLLOWING_FETCH_FAIL,
     id,
     error,
+    skipNotFound: true,
   };
 };
 
@@ -571,6 +573,7 @@ export function fetchRelationshipsFail(error) {
     type: RELATIONSHIPS_FETCH_FAIL,
     error,
     skipLoading: true,
+    skipNotFound: true,
   };
 };
 
diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js
index cd36d8007..1670f9c10 100644
--- a/app/javascript/mastodon/actions/alerts.js
+++ b/app/javascript/mastodon/actions/alerts.js
@@ -34,11 +34,11 @@ export function showAlert(title = messages.unexpectedTitle, message = messages.u
   };
 };
 
-export function showAlertForError(error) {
+export function showAlertForError(error, skipNotFound = false) {
   if (error.response) {
     const { data, status, statusText, headers } = error.response;
 
-    if (status === 404 || status === 410) {
+    if (skipNotFound && (status === 404 || status === 410)) {
       // Skip these errors as they are reflected in the UI
       return { type: ALERT_NOOP };
     }
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index c3c6ff1a1..6b73fc90e 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -230,12 +230,31 @@ export function uploadCompose(files) {
         // Account for disparity in size of original image and resized data
         total += file.size - f.size;
 
-        return api(getState).post('/api/v1/media', data, {
+        return api(getState).post('/api/v2/media', data, {
           onUploadProgress: function({ loaded }){
             progress[i] = loaded;
             dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
           },
-        }).then(({ data }) => dispatch(uploadComposeSuccess(data, f)));
+        }).then(({ status, data }) => {
+          // If server-side processing of the media attachment has not completed yet,
+          // poll the server until it is, before showing the media attachment as uploaded
+
+          if (status === 200) {
+            dispatch(uploadComposeSuccess(data, f));
+          } else if (status === 202) {
+            const poll = () => {
+              api(getState).get(`/api/v1/media/${data.id}`).then(response => {
+                if (response.status === 200) {
+                  dispatch(uploadComposeSuccess(response.data, f));
+                } else if (response.status === 206) {
+                  setTimeout(() => poll(), 1000);
+                }
+              }).catch(error => dispatch(uploadComposeFail(error)));
+            };
+
+            poll();
+          }
+        });
       }).catch(error => dispatch(uploadComposeFail(error)));
     };
   };
diff --git a/app/javascript/mastodon/actions/identity_proofs.js b/app/javascript/mastodon/actions/identity_proofs.js
index 449debf61..103983956 100644
--- a/app/javascript/mastodon/actions/identity_proofs.js
+++ b/app/javascript/mastodon/actions/identity_proofs.js
@@ -27,4 +27,5 @@ export const fetchAccountIdentityProofsFail = (accountId, err) => ({
   type: IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL,
   accountId,
   err,
+  skipNotFound: true,
 });
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 054668655..cdd2111f8 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -149,6 +149,7 @@ export function expandTimelineFail(timeline, error, isLoadingMore) {
     timeline,
     error,
     skipLoading: !isLoadingMore,
+    skipNotFound: timeline.startsWith('account:'),
   };
 };
 
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index fba21316a..6818aa5d5 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -1,4 +1,4 @@
-import Rails from 'rails-ujs';
+import Rails from '@rails/ujs';
 
 export function start() {
   require('font-awesome/css/font-awesome.css');
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index ea82f9ef9..1bb583583 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -76,8 +76,9 @@ class ColumnHeader extends React.PureComponent {
 
   handlePin = () => {
     if (!this.props.pinned) {
-      this.historyBack();
+      this.context.router.history.replace('/');
     }
+
     this.props.onPin();
   }
 
diff --git a/app/javascript/mastodon/components/domain.js b/app/javascript/mastodon/components/domain.js
index 85729ca94..697065d87 100644
--- a/app/javascript/mastodon/components/domain.js
+++ b/app/javascript/mastodon/components/domain.js
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 export default @injectIntl
diff --git a/app/javascript/mastodon/components/intersection_observer_article.js b/app/javascript/mastodon/components/intersection_observer_article.js
index e453730ba..124b34b02 100644
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@@ -44,7 +44,7 @@ export default class IntersectionObserverArticle extends React.Component {
     intersectionObserverWrapper.observe(
       id,
       this.node,
-      this.handleIntersection
+      this.handleIntersection,
     );
 
     this.componentMounted = true;
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index cfe164a50..283d7e0a5 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -10,7 +10,7 @@ import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_s
 import { decode } from 'blurhash';
 
 const messages = defineMessages({
-  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
+  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Hide media' },
 });
 
 class Item extends React.PureComponent {
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 3a17e80e7..7525a1030 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -127,15 +127,7 @@ class Poll extends ImmutablePureComponent {
 
     return (
       <li key={option.get('title')}>
-        {showResults && (
-          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
-            {({ width }) =>
-              <span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
-            }
-          </Motion>
-        )}
-
-        <label className={classNames('poll__text', { selectable: !showResults })}>
+        <label className={classNames('poll__option', { selectable: !showResults })}>
           <input
             name='vote-options'
             type={poll.get('multiple') ? 'checkbox' : 'radio'}
@@ -157,12 +149,26 @@ class Poll extends ImmutablePureComponent {
             />
           )}
           {showResults && <span className='poll__number'>
-            {!!voted && <Icon id='check' className='poll__vote__mark' title={intl.formatMessage(messages.voted)} />}
             {Math.round(percent)}%
           </span>}
 
-          <span dangerouslySetInnerHTML={{ __html: titleEmojified }} />
+          <span
+            className='poll__option__text'
+            dangerouslySetInnerHTML={{ __html: titleEmojified }}
+          />
+
+          {!!voted && <span className='poll__voted'>
+            <Icon id='check' className='poll__voted__mark' title={intl.formatMessage(messages.voted)} />
+          </span>}
         </label>
+
+        {showResults && (
+          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
+            {({ width }) =>
+              <span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
+            }
+          </Motion>
+        )}
       </li>
     );
   }
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 3a490e78e..65ca43911 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -82,15 +82,19 @@ export default class ScrollableList extends PureComponent {
   lastScrollWasSynthetic = false;
   scrollToTopOnMouseIdle = false;
 
+  _getScrollingElement = () => {
+    if (this.props.bindToDocument) {
+      return (document.scrollingElement || document.body);
+    } else {
+      return this.node;
+    }
+  }
+
   setScrollTop = newScrollTop => {
     if (this.getScrollTop() !== newScrollTop) {
       this.lastScrollWasSynthetic = true;
 
-      if (this.props.bindToDocument) {
-        document.scrollingElement.scrollTop = newScrollTop;
-      } else {
-        this.node.scrollTop = newScrollTop;
-      }
+      this._getScrollingElement().scrollTop = newScrollTop;
     }
   };
 
@@ -151,15 +155,15 @@ export default class ScrollableList extends PureComponent {
   }
 
   getScrollTop = () => {
-    return this.props.bindToDocument ? document.scrollingElement.scrollTop : this.node.scrollTop;
+    return this._getScrollingElement().scrollTop;
   }
 
   getScrollHeight = () => {
-    return this.props.bindToDocument ? document.scrollingElement.scrollHeight : this.node.scrollHeight;
+    return this._getScrollingElement().scrollHeight;
   }
 
   getClientHeight = () => {
-    return this.props.bindToDocument ? document.scrollingElement.clientHeight : this.node.clientHeight;
+    return this._getScrollingElement().clientHeight;
   }
 
   updateScrollBottom = (snapshot) => {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 0dc00cb98..075ee1b87 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -432,16 +432,10 @@ class Status extends ImmutablePureComponent {
               </a>
             </div>
 
-            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
+            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
 
             {media}
 
-            {showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && (
-              <button className='status__content__read-more-button' onClick={this.handleClick}>
-                <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
-              </button>
-            )}
-
             <StatusActionBar status={status} account={account} {...other} />
           </div>
         </div>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index ea303a58b..c3fc6c853 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -36,8 +36,8 @@ const messages = defineMessages({
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
 });
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5d921fd41..3200f2d82 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -20,6 +20,7 @@ export default class StatusContent extends React.PureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     expanded: PropTypes.bool,
+    showThread: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
@@ -181,6 +182,7 @@ export default class StatusContent extends React.PureComponent {
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
+    const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
@@ -195,6 +197,12 @@ export default class StatusContent extends React.PureComponent {
       directionStyle.direction = 'rtl';
     }
 
+    const showThreadButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick}>
+        <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
+      </button>
+    );
+
     const readMoreButton = (
       <button className='status__content__read-more-button' onClick={this.props.onClick} key='read-more'>
         <FormattedMessage id='status.read_more' defaultMessage='Read more' /><Icon id='angle-right' fixedWidth />
@@ -229,6 +237,8 @@ export default class StatusContent extends React.PureComponent {
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>
       );
     } else if (this.props.onClick) {
@@ -237,6 +247,8 @@ export default class StatusContent extends React.PureComponent {
           <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>,
       ];
 
@@ -251,6 +263,8 @@ export default class StatusContent extends React.PureComponent {
           <div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} />
 
           {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+
+          {renderViewThread && showThreadButton}
         </div>
       );
     }
diff --git a/app/javascript/mastodon/containers/domain_container.js b/app/javascript/mastodon/containers/domain_container.js
index 813178bbf..8a8ba1df1 100644
--- a/app/javascript/mastodon/containers/domain_container.js
+++ b/app/javascript/mastodon/containers/domain_container.js
@@ -6,7 +6,7 @@ import Domain from '../components/domain';
 import { openModal } from '../actions/modal';
 
 const messages = defineMessages({
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
+  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
 });
 
 const makeMapStateToProps = () => {
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 8bd7f2db5..92780a70b 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -29,8 +29,8 @@ const messages = defineMessages({
   report: { id: 'account.report', defaultMessage: 'Report @{name}' },
   share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
   media: { id: 'account.media', defaultMessage: 'Media' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
@@ -39,7 +39,7 @@ const messages = defineMessages({
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
-  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
+  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Blocked domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
   unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
@@ -142,7 +142,7 @@ class Header extends ImmutablePureComponent {
     if (me !== account.get('id') && account.getIn(['relationship', 'muting'])) {
       info.push(<span key='muted' className='relationship-tag'><FormattedMessage id='account.muted' defaultMessage='Muted' /></span>);
     } else if (me !== account.get('id') && account.getIn(['relationship', 'domain_blocking'])) {
-      info.push(<span key='domain_blocked' className='relationship-tag'><FormattedMessage id='account.domain_blocked' defaultMessage='Domain hidden' /></span>);
+      info.push(<span key='domain_blocked' className='relationship-tag'><FormattedMessage id='account.domain_blocked' defaultMessage='Domain blocked' /></span>);
     }
 
     if (me !== account.get('id')) {
diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index fda5a074f..95c9c7751 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -214,8 +214,8 @@ class Audio extends React.PureComponent {
         <div className='video-player__controls active'>
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className='video-player__volume' onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
                 &nbsp;
@@ -236,7 +236,7 @@ class Audio extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
-              <button type='button' aria-label={intl.formatMessage(messages.download)}>
+              <button type='button' title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)}>
                 <a className='video-player__download__icon' href={this.props.src} download>
                   <Icon id={'download'} fixedWidth />
                 </a>
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index 051431ed2..870c0de09 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -68,7 +68,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />
+            <AccountContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index dd2632796..07d92bb7e 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -16,6 +16,7 @@ const messages = defineMessages({
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
+  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
 });
 
 export default @injectIntl
@@ -42,6 +43,7 @@ class ActionBar extends React.PureComponent {
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
     menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
     menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index 01df31d3a..2f37ce64b 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -75,7 +75,7 @@ class Option extends React.PureComponent {
 
     return (
       <li>
-        <label className='poll__text editable'>
+        <label className='poll__option editable'>
           <span
             className={classNames('poll__input', { checkbox: isPollMultiple })}
             onClick={this.handleToggleMultiple}
@@ -88,7 +88,7 @@ class Option extends React.PureComponent {
 
           <AutosuggestInput
             placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={25}
+            maxLength={50}
             value={title}
             onChange={this.handleOptionTitleChange}
             suggestions={this.props.suggestions}
@@ -155,6 +155,7 @@ class PollForm extends ImmutablePureComponent {
         <div className='poll__footer'>
           <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 
+          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={expiresIn} onChange={this.handleSelectDuration}>
             <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
             <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 7cbfe463a..de030b7a2 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -11,13 +11,13 @@ import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Post to public timelines' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all, shown in public timelines' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Do not show in public timelines' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but not in public timelines' },
   private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
 
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 235cb7ad8..f9e45067f 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -160,7 +160,7 @@ class Conversation extends ImmutablePureComponent {
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex='0'>
-          <div className='conversation__avatar'>
+          <div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
             <AvatarComposite accounts={accounts} size={48} />
           </div>
 
diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js
index 482245c86..a6d988912 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.js
+++ b/app/javascript/mastodon/features/domain_blocks/index.js
@@ -13,8 +13,8 @@ import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_bloc
 import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
-  heading: { id: 'column.domain_blocks', defaultMessage: 'Hidden domains' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 const mapStateToProps = state => ({
@@ -55,7 +55,7 @@ class Blocks extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
+    const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no blocked domains yet.' />;
 
     return (
       <Column bindToDocument={!multiColumn} icon='minus-circle' heading={intl.formatMessage(messages.heading)}>
@@ -69,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {domains.map(domain =>
-            <DomainContainer key={domain} domain={domain} />
+            <DomainContainer key={domain} domain={domain} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index 249e6a044..75cb00c0e 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -79,7 +79,7 @@ class Favourites extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 57ef44145..7078e4e6c 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -11,6 +11,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountAuthorizeContainer from './containers/account_authorize_container';
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
+import { me } from '../../initial_state';
 
 const messages = defineMessages({
   heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
@@ -19,6 +20,8 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
   hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
+  locked: !!state.getIn(['accounts', me, 'locked']),
+  domain: state.getIn(['meta', 'domain']),
 });
 
 export default @connect(mapStateToProps)
@@ -31,6 +34,8 @@ class FollowRequests extends ImmutablePureComponent {
     shouldUpdateScroll: PropTypes.func,
     hasMore: PropTypes.bool,
     accountIds: ImmutablePropTypes.list,
+    locked: PropTypes.bool,
+    domain: PropTypes.string,
     intl: PropTypes.object.isRequired,
     multiColumn: PropTypes.bool,
   };
@@ -44,7 +49,7 @@ class FollowRequests extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn } = this.props;
+    const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn, locked, domain } = this.props;
 
     if (!accountIds) {
       return (
@@ -55,6 +60,15 @@ class FollowRequests extends ImmutablePureComponent {
     }
 
     const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
+    const unlockedPrependMessage = locked ? null : (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='follow_requests.unlocked_explanation'
+          defaultMessage='Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.'
+          values={{ domain: domain }}
+        />
+      </div>
+    );
 
     return (
       <Column bindToDocument={!multiColumn} icon='user-plus' heading={intl.formatMessage(messages.heading)}>
@@ -66,9 +80,10 @@ class FollowRequests extends ImmutablePureComponent {
           shouldUpdateScroll={shouldUpdateScroll}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
+          prepend={unlockedPrependMessage}
         >
           {accountIds.map(id =>
-            <AccountAuthorizeContainer key={id} id={id} />
+            <AccountAuthorizeContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 9e635d250..f8723e055 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -93,7 +93,7 @@ class Followers extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {blockedBy ? [] : accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 284ae2c11..5112bfa9d 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -93,7 +93,7 @@ class Following extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {blockedBy ? [] : accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js
index 91cf6215e..1896994da 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@@ -95,6 +95,10 @@ class Content extends ImmutablePureComponent {
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
       } else {
+        let status = this.props.announcement.get('statuses').find(item => link.href === item.get('url'));
+        if (status) {
+          link.addEventListener('click', this.onStatusClick.bind(this, status), false);
+        }
         link.setAttribute('title', link.href);
         link.classList.add('unhandled-link');
       }
@@ -120,6 +124,13 @@ class Content extends ImmutablePureComponent {
     }
   }
 
+  onStatusClick = (status, e) => {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      this.context.router.history.push(`/statuses/${status.get('id')}`);
+    }
+  }
+
   handleEmojiMouseEnter = ({ target }) => {
     target.src = target.getAttribute('data-original');
   }
@@ -367,6 +378,14 @@ class Announcements extends ImmutablePureComponent {
     index: 0,
   };
 
+  static getDerivedStateFromProps(props, state) {
+    if (props.announcements.size > 0 && state.index >= props.announcements.size) {
+      return { index: props.announcements.size - 1 };
+    } else {
+      return null;
+    }
+  }
+
   componentDidMount () {
     this._markAnnouncementAsRead();
   }
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 405093037..411c726ec 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -132,7 +132,7 @@ class GettingStarted extends ImmutablePureComponent {
       <ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
       <ColumnLink key={i++} icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
       <ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
+      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
     );
 
     height += 48*4;
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js
index 7f7f5009c..ca1fa1f5e 100644
--- a/app/javascript/mastodon/features/lists/index.js
+++ b/app/javascript/mastodon/features/lists/index.js
@@ -74,7 +74,7 @@ class Lists extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {lists.map(list =>
-            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
+            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index 91dd268c1..3f58a62d2 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -68,7 +68,7 @@ class Mutes extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />
+            <AccountContainer key={id} id={id} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 9179e51db..4becb5fb7 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -79,7 +79,7 @@ class Reblogs extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 959774da4..ba62d7b10 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -32,8 +32,8 @@ const messages = defineMessages({
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
-  blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+  blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
 });
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 2993fe29a..b8344a667 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -98,7 +98,7 @@ export default class Card extends React.PureComponent {
           },
         },
       ]),
-      0
+      0,
     );
   };
 
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 2fec247c1..7a82fa13a 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -166,7 +166,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
       reblogIcon = 'lock';
     }
 
-    if (status.get('visibility') === 'private') {
+    if (['private', 'direct'].includes(status.get('visibility'))) {
       reblogLink = <Icon id={reblogIcon} />;
     } else if (this.context.router) {
       reblogLink = (
diff --git a/app/javascript/mastodon/features/ui/components/__tests__/column-test.js b/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
index 11cc1b6e8..89cb2458d 100644
--- a/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
+++ b/app/javascript/mastodon/features/ui/components/__tests__/column-test.js
@@ -19,7 +19,7 @@ describe('<Column />', () => {
       const wrapper = mount(
         <Column heading='notifications'>
           <div className='scrollable' />
-        </Column>
+        </Column>,
       );
       wrapper.find(ColumnHeader).find('button').simulate('click');
       expect(global.requestAnimationFrame.mock.calls.length).toEqual(1);
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 8ac9c8db7..42ded9d21 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -492,8 +492,8 @@ class Video extends React.PureComponent {
 
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
-              <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
-              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(paused ? messages.play : messages.pause)} aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay} autoFocus={detailed}><Icon id={paused ? 'play' : 'pause'} fixedWidth /></button>
+              <button type='button' title={intl.formatMessage(muted ? messages.unmute : messages.mute)} aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><Icon id={muted ? 'volume-off' : 'volume-up'} fixedWidth /></button>
 
               <div className='video-player__volume' onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
                 &nbsp;
@@ -517,11 +517,11 @@ class Video extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
-              {(!onCloseVideo && !editable && !fullscreen) && <button type='button' aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
-              {(!fullscreen && onOpenVideo) && <button type='button' aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
-              {onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
-              <button type='button' aria-label={intl.formatMessage(messages.download)}><a className='video-player__download__icon' href={this.props.src} download><Icon id={'download'} fixedWidth /></a></button>
-              <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
+              {(!onCloseVideo && !editable && !fullscreen) && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
+              {(!fullscreen && onOpenVideo) && <button type='button' title={intl.formatMessage(messages.expand)} aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><Icon id='expand' fixedWidth /></button>}
+              {onCloseVideo && <button type='button' title={intl.formatMessage(messages.close)} aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><Icon id='compress' fixedWidth /></button>}
+              <button type='button' title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)}><a className='video-player__download__icon' href={this.props.src} download><Icon id={'download'} fixedWidth /></a></button>
+              <button type='button' title={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><Icon id={fullscreen ? 'compress' : 'arrows-alt'} fixedWidth /></button>
             </div>
           </div>
         </div>
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 8006a1306..38653e0fe 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -123,7 +123,7 @@
   "directory.federated": "Dende'l fediversu",
   "directory.local": "Dende {domain} namái",
   "directory.new_arrivals": "Cuentes nueves",
-  "directory.recently_active": "Recently active",
+  "directory.recently_active": "Actividá recién",
   "embed.instructions": "Empotra esti estáu nun sitiu web copiando'l códigu d'embaxo.",
   "embed.preview": "Asina ye cómo va vese:",
   "emoji_button.activity": "Actividaes",
@@ -154,7 +154,7 @@
   "empty_column.home": "¡Tienes la llinia temporal balera! Visita {public} o usa la gueta pa entamar y conocer a otros usuarios.",
   "empty_column.home.public_timeline": "la llinia temporal pública",
   "empty_column.list": "Entá nun hai nada nesta llista. Cuando los miembros d'esta llista espublicen estaos nuevos, van apaecer equí.",
-  "empty_column.lists": "Entá nun tienes nunenguna llista. Cuando crees una, va amosase equí.",
+  "empty_column.lists": "Entá nun tienes nenguna llista. Cuando crees una, va amosase equí.",
   "empty_column.mutes": "Entá nun silenciesti a nunengún usuariu.",
   "empty_column.notifications": "Entá nun tienes nunengún avisu. Interactúa con otros p'aniciar la conversación.",
   "empty_column.public": "¡Equí nun hai nada! Escribi daqué público o sigui a usuarios d'otros sirvidores pa rellenar esto",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 5429f358f..c1a7bb533 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Зареждане...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 96092457f..19a091fa0 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -1,64 +1,64 @@
 {
-  "account.add_or_remove_from_list": "Ouzhpenn pe lemel ag ar listennadoù",
+  "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
-  "account.block": "Stankañ @{name}",
-  "account.block_domain": "Kuzh kement tra a {domain}",
+  "account.block": "Berzañ @{name}",
+  "account.block_domain": "Berzañ pep tra eus {domain}",
   "account.blocked": "Stanket",
-  "account.cancel_follow_request": "Nullañ ar pedad heuliañ",
-  "account.direct": "Kas ur c'hemennad da @{name}",
-  "account.domain_blocked": "Domani kuzhet",
+  "account.cancel_follow_request": "Nullañ ar bedadenn heuliañ",
+  "account.direct": "Kas ur gemennadenn da @{name}",
+  "account.domain_blocked": "Domani berzet",
   "account.edit_profile": "Aozañ ar profil",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.follow": "Heuliañ",
-  "account.followers": "Heilour·ezed·ion",
-  "account.followers.empty": "Den na heul an implijour-mañ c'hoazh.",
+  "account.followers": "Heulier·ezed·ien",
+  "account.followers.empty": "Den na heul an implijer-mañ c'hoazh.",
   "account.follows": "Koumanantoù",
-  "account.follows.empty": "An implijer-mañ na heul ket den ebet.",
+  "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
   "account.follows_you": "Ho heul",
-  "account.hide_reblogs": "Kuzh toudoù skignet gant @{name}",
+  "account.hide_reblogs": "Kuzh toudoù rannet gant @{name}",
   "account.last_status": "Oberiantiz zivezhañ",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.link_verified_on": "Gwiriet eo bet perc'hennidigezh al liamm d'an deiziad-mañ : {date}",
+  "account.locked_info": "Prennet eo ar gon-mañ. Dibab a ra ar perc'henn ar re a c'hall heuliañ anezhi pe anezhañ.",
   "account.media": "Media",
   "account.mention": "Menegiñ @{name}",
-  "account.moved_to": "Dilojet en·he deus {name} da:",
+  "account.moved_to": "Dilojet en·he deus {name} da :",
   "account.mute": "Kuzhat @{name}",
-  "account.mute_notifications": "Kuzh kemennoù a @{name}",
+  "account.mute_notifications": "Kuzh kemennoù eus @{name}",
   "account.muted": "Kuzhet",
   "account.never_active": "Birviken",
-  "account.posts": "Toudoù",
+  "account.posts": "a doudoù",
   "account.posts_with_replies": "Toudoù ha respontoù",
   "account.report": "Disklêriañ @{name}",
-  "account.requested": "É c'hortoz bout aprouet. Clikit da nullañ ar pedad heuliañ",
+  "account.requested": "O c'hortoz an asant. Klikit evit nullañ ar goulenn heuliañ",
   "account.share": "Skignañ profil @{name}",
-  "account.show_reblogs": "Diskouez toudoù a @{name}",
-  "account.unblock": "Distankañ @{name}",
-  "account.unblock_domain": "Diguzh {domain}",
+  "account.show_reblogs": "Diskouez skignadennoù @{name}",
+  "account.unblock": "Diverzañ @{name}",
+  "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unendorse": "Paouez da lakaat war-wel war ar profil",
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
   "account.unmute_notifications": "Diguzhat kemennoù a @{name}",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
-  "alert.unexpected.title": "C'hem !",
+  "alert.unexpected.title": "Hopala!",
   "announcement.announcement": "Kemenn",
   "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Klask endro",
+  "bundle_column_error.body": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
+  "bundle_column_error.retry": "Klask en-dro",
   "bundle_column_error.title": "Fazi rouedad",
   "bundle_modal_error.close": "Serriñ",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Klask endro",
-  "column.blocks": "Implijour·ezed·ion stanket",
+  "bundle_modal_error.message": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
+  "bundle_modal_error.retry": "Klask en-dro",
+  "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
   "column.direct": "Kemennadoù prevez",
   "column.directory": "Mont a-dreuz ar profiloù",
-  "column.domain_blocks": "Domani kuzhet",
-  "column.favourites": "Ar re vuiañ-karet",
+  "column.domain_blocks": "Domani berzet",
+  "column.favourites": "Muiañ-karet",
   "column.follow_requests": "Pedadoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
@@ -68,150 +68,150 @@
   "column.public": "Red-amzer kevreet",
   "column_back_button.label": "Distro",
   "column_header.hide_settings": "Kuzhat an arventennoù",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
+  "column_header.moveRight_settings": "Dilec'hiañ ar bannad a-zehou",
   "column_header.pin": "Spilhennañ",
   "column_header.show_settings": "Diskouez an arventennoù",
   "column_header.unpin": "Dispilhennañ",
   "column_subheading.settings": "Arventennoù",
   "community.column_settings.media_only": "Nemet Mediaoù",
-  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ion·ezed meneget.",
-  "compose_form.direct_message_warning_learn_more": "Gouiet hiroc'h",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ezed·ien meneget.",
+  "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
+  "compose_form.hashtag_warning": "Ne vo ket lakaet an toud-mañ er rolloù gerioù-klik dre mard eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
+  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal heuliañ ac'hanoc'h evit gwelout ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra eh oc'h é soñjal a-barzh ?",
   "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
-  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.duration": "Pad ar sontadeg",
   "compose_form.poll.option_placeholder": "Dibab {number}",
   "compose_form.poll.remove_option": "Lemel an dibab-mañ",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
+  "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
   "compose_form.publish": "Toudañ",
   "compose_form.publish_loud": "{publish} !",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
+  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
+  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
+  "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Skrivit ho kemenn amañ",
   "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
+  "confirmations.block.confirm": "Stankañ",
+  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
-  "confirmations.domain_block.confirm": "Kuzhat an domani a-bezh",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
+  "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.logout.confirm": "Digevreañ",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "Kuzhat a raio an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met aotren a raio anezhañ·i da welet ho todoù ha a heuliañ ac'hanoc'h.",
   "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.redraft.message": "Ha sur oc'h e fell deoc'h dilemel ar statud-mañ hag adlakaat anezhañ er bouilhoñs? Kollet e vo ar merkoù muiañ-karet hag ar skignadennoù hag emzivat e vo ar respontoù d'an toud orin.",
   "confirmations.reply.confirm": "Respont",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
+  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name}?",
+  "conversation.delete": "Dilemel ar gaozeadenn",
+  "conversation.mark_as_read": "Merkañ evel lennet",
+  "conversation.open": "Gwelout ar gaozeadenn",
+  "conversation.with": "Gant {names}",
+  "directory.federated": "Eus ar c'hevrebed anavezet",
+  "directory.local": "Eus {domain} hepken",
+  "directory.new_arrivals": "Degouezhet a-nevez",
+  "directory.recently_active": "Oberiant nevez zo",
+  "embed.instructions": "Enkorfit ar statud war ho lec'hienn en ur eilañ ar c'hod dindan.",
+  "embed.preview": "Setu penaos e vo diskouezet:",
+  "emoji_button.activity": "Obererezh",
+  "emoji_button.custom": "Kempennet",
+  "emoji_button.flags": "Bannieloù",
+  "emoji_button.food": "Boued hag Evaj",
+  "emoji_button.label": "Enlakaat un emoji",
+  "emoji_button.nature": "Natur",
+  "emoji_button.not_found": "Emoji ebet !! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.objects": "Traoù",
+  "emoji_button.people": "Tud",
+  "emoji_button.recent": "Implijet alies",
+  "emoji_button.search": "O klask...",
+  "emoji_button.search_results": "Disoc'hoù an enklask",
+  "emoji_button.symbols": "Arouezioù",
+  "emoji_button.travel": "Lec'hioù ha Beajoù",
+  "empty_column.account_timeline": "Toud ebet amañ!",
+  "empty_column.account_unavailable": "Profil dihegerz",
+  "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
+  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
+  "empty_column.direct": "N'ho peus kemennad prevez ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
+  "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
+  "empty_column.favourites": "Den ebet n'eus lakaet an toud-mañ en e reoù muiañ-karet. Pa vo graet gant unan bennak e vo diskouezet amañ.",
+  "empty_column.follow_requests": "N'ho peus goulenn heuliañ ebet c'hoazh. Pa resevot reoù e vo diskouezet amañ.",
+  "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.",
+  "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.",
+  "empty_column.home.public_timeline": "ar red-amzer publik",
+  "empty_column.list": "Goullo eo ar roll-mañ evit ar poent. Pa vo toudet gant e izili e vo diskouezet amañ.",
+  "empty_column.lists": "N'ho peus roll ebet c'hoazh. Pa vo krouet unan ganeoc'h e vo diskouezet amañ.",
+  "empty_column.mutes": "N'ho peus kuzhet implijer ebet c'hoazh.",
+  "empty_column.notifications": "N'ho peus kemenn ebet c'hoazh. Grit gant implijer·ezed·ien all evit loc'hañ ar gomz.",
+  "empty_column.public": "N'eus netra amañ! Skrivit un dra bennak foran pe heuilhit implijer·ien·ezed eus dafariadoù all evit leuniañ",
+  "error.unexpected_crash.explanation": "Abalamour d'ur beug en hor c'hod pe d'ur gudenn geverlec'hded n'hallomp ket skrammañ ar bajenn-mañ en un doare dereat.",
+  "error.unexpected_crash.next_steps": "Klaskit azbevaat ar bajenn. Ma n'a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheñvel pe dre an arload genidik.",
+  "errors.unexpected_crash.copy_stacktrace": "Eilañ ar roudoù diveugañ er golver",
+  "errors.unexpected_crash.report_issue": "Danevellañ ur fazi",
+  "follow_request.authorize": "Aotren",
+  "follow_request.reject": "Nac'hañ",
+  "getting_started.developers": "Diorroerien",
+  "getting_started.directory": "Roll ar profiloù",
+  "getting_started.documentation": "Teuliadur",
+  "getting_started.heading": "Loc'hañ",
+  "getting_started.invite": "Pediñ tud",
   "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
+  "getting_started.security": "Arventennoù ar gont",
+  "getting_started.terms": "Divizoù gwerzhañ hollek",
+  "hashtag.column_header.tag_mode.all": "ha {additional}",
+  "hashtag.column_header.tag_mode.any": "pe {additional}",
+  "hashtag.column_header.tag_mode.none": "hep {additional}",
+  "hashtag.column_settings.select.no_options_message": "N'eus bet kavet ali ebet",
+  "hashtag.column_settings.select.placeholder": "Ouzhpennañ gerioù-klik…",
+  "hashtag.column_settings.tag_mode.all": "An holl elfennoù-mañ",
+  "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
+  "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
+  "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
+  "home.column_settings.basic": "Diazez",
+  "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
+  "home.column_settings.show_replies": "Diskouez ar respontoù",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
+  "intervals.full.days": "{number, plural, one {# devezh} other{# a zevezhioù}}",
+  "intervals.full.hours": "{number, plural, one {# eurvezh} other{# eurvezh}}",
+  "intervals.full.minutes": "{number, plural, one {# munut} other{# a vunutoù}}",
+  "introduction.federation.action": "Da-heul",
+  "introduction.federation.federated.headline": "Kevreet",
   "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.headline": "Degemer",
   "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
-  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.headline": "Lec'hel",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
   "introduction.interactions.action": "Finish toot-orial!",
-  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.headline": "Muiañ-karet",
   "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
-  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.headline": "Skignañ",
   "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
-  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.headline": "Respont",
   "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
-  "introduction.welcome.action": "Let's go!",
-  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.action": "Bec'h dezhi!",
+  "introduction.welcome.headline": "Pazennoù kentañ",
   "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "da skignañ",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.description": "Deskrivadur",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
@@ -230,7 +230,7 @@
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.reply": "da respont",
   "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.start": "to open \"get started\" column",
@@ -239,48 +239,48 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
+  "lightbox.close": "Serriñ",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
   "lightbox.view_context": "View context",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
+  "lists.account.add": "Ouzhpennañ d'al listenn",
+  "lists.account.remove": "Lemel kuit eus al listenn",
+  "lists.delete": "Dilemel al listenn",
+  "lists.edit": "Aozañ al listenn",
+  "lists.edit.submit": "Cheñch an titl",
+  "lists.new.create": "Ouzhpennañ ul listenn",
+  "lists.new.title_placeholder": "Titl nevez al listenn",
   "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "O kargañ...",
   "media_gallery.toggle_visible": "Toggle visibility",
-  "missing_indicator.label": "Not found",
+  "missing_indicator.label": "Digavet",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.apps": "Arloadoù pellgomz",
+  "navigation_bar.blocks": "Implijer·ezed·ien berzet",
+  "navigation_bar.bookmarks": "Sinedoù",
+  "navigation_bar.community_timeline": "Red-amzer lec'hel",
+  "navigation_bar.compose": "Skrivañ un toud nevez",
+  "navigation_bar.direct": "Kemennadoù prevez",
+  "navigation_bar.discover": "Dizoleiñ",
+  "navigation_bar.domain_blocks": "Domanioù kuzhet",
+  "navigation_bar.edit_profile": "Aozañ ar profil",
+  "navigation_bar.favourites": "Ar re vuiañ-karet",
+  "navigation_bar.filters": "Gerioù kuzhet",
+  "navigation_bar.follow_requests": "Pedadoù heuliañ",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
+  "navigation_bar.info": "Diwar-benn an dafariad-mañ",
+  "navigation_bar.keyboard_shortcuts": "Berradurioù",
+  "navigation_bar.lists": "Listennoù",
+  "navigation_bar.logout": "Digennaskañ",
+  "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
+  "navigation_bar.personal": "Personel",
+  "navigation_bar.pins": "Toudoù spilhennet",
+  "navigation_bar.preferences": "Gwellvezioù",
+  "navigation_bar.public_timeline": "Red-amzer kevreet",
+  "navigation_bar.security": "Diogelroez",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -291,135 +291,135 @@
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.favourite": "Ar re vuiañ-karet:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
+  "notifications.column_settings.filter_bar.show": "Diskouez",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
-  "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.mention": "Menegoù:",
+  "notifications.column_settings.poll": "Disoc'hoù ar sontadeg:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
+  "notifications.column_settings.reblog": "Skignadennoù:",
+  "notifications.column_settings.show": "Diskouez er bann",
+  "notifications.column_settings.sound": "Seniñ",
+  "notifications.filter.all": "Pep tra",
+  "notifications.filter.boosts": "Skignadennoù",
+  "notifications.filter.favourites": "Muiañ-karet",
   "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.group": "{count} notifications",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
+  "notifications.filter.mentions": "Menegoù",
+  "notifications.filter.polls": "Disoc'hoù ar sontadegoù",
+  "notifications.group": "{count} a gemennoù",
+  "poll.closed": "Serret",
+  "poll.refresh": "Azbevaat",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
   "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
-  "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "poll.vote": "Mouezhiañ",
+  "poll.voted": "Mouezhiet ho peus evit ar respont-mañ",
+  "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
+  "poll_button.remove_poll": "Dilemel ar sontadeg",
+  "privacy.change": "Kemmañ gwelidigezh ar statud",
+  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
+  "privacy.direct.short": "War-eeun",
+  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
+  "privacy.private.short": "Ar re a heuilh ac'hanon hepken",
+  "privacy.public.long": "Embann war ar redoù-amzer foran",
+  "privacy.public.short": "Publik",
+  "privacy.unlisted.long": "Na embann war ar redoù-amzer foran",
+  "privacy.unlisted.short": "Anlistennet",
+  "refresh": "Freskaat",
+  "regeneration_indicator.label": "O kargañ…",
+  "regeneration_indicator.sublabel": "War brientiñ emañ ho red degemer!",
   "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.hours": "{number}e",
+  "relative_time.just_now": "bremañ",
   "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
-  "report.forward": "Forward to {target}",
+  "relative_time.seconds": "{number}eil",
+  "relative_time.today": "hiziv",
+  "reply_indicator.cancel": "Nullañ",
+  "report.forward": "Treuzkas da: {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
   "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Report {target}",
-  "search.placeholder": "Search",
+  "search.placeholder": "Klask",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.hashtag": "ger-klik",
+  "search_popout.tips.status": "statud",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_popout.tips.user": "implijer·ez",
+  "search_results.accounts": "Tud",
+  "search_results.hashtags": "Gerioù-klik",
+  "search_results.statuses": "a doudoù",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to status",
-  "status.delete": "Delete",
+  "status.delete": "Dilemel",
   "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
+  "status.direct": "Kas ur c'hemennad da @{name}",
+  "status.embed": "Enframmañ",
+  "status.favourite": "Muiañ-karet",
   "status.filtered": "Filtered",
-  "status.load_more": "Load more",
-  "status.media_hidden": "Media hidden",
-  "status.mention": "Mention @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
+  "status.load_more": "Kargañ muioc'h",
+  "status.media_hidden": "Media kuzhet",
+  "status.mention": "Menegiñ @{name}",
+  "status.more": "Muioc'h",
+  "status.mute": "Kuzhat @{name}",
+  "status.mute_conversation": "Kuzhat ar gaozeadenn",
   "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
+  "status.pin": "Spilhennañ d'ar profil",
+  "status.pinned": "Toud spilhennet",
+  "status.read_more": "Lenn muioc'h",
+  "status.reblog": "Skignañ",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
+  "status.reply": "Respont",
   "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
+  "status.report": "Disklêriañ @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
+  "status.share": "Rannañ",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
+  "status.unmute_conversation": "Diguzhat ar gaozeadenn",
+  "status.unpin": "Dispilhennañ eus ar profil",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
+  "tabs_bar.home": "Degemer",
+  "tabs_bar.local_timeline": "Lec'hel",
+  "tabs_bar.notifications": "Kemennoù",
+  "tabs_bar.search": "Klask",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
-  "trends.trending_now": "Trending now",
+  "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media ({formats})",
+  "upload_button.label": "Ouzhpennañ ur media ({formats})",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.undo": "Delete",
+  "upload_form.edit": "Aozañ",
+  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
@@ -428,9 +428,9 @@
   "upload_modal.edit_media": "Edit media",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
   "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading…",
+  "upload_progress.label": "O pellgargañ...",
   "video.close": "Close video",
-  "video.download": "Download file",
+  "video.download": "Pellgargañ ar restr",
   "video.exit_fullscreen": "Exit full screen",
   "video.expand": "Expand video",
   "video.fullscreen": "Full screen",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 7b427c3f0..9df1e0c65 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Skrýt oznámení",
+  "home.show_announcements": "Zobrazit oznámení",
   "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodin} other {# hodin}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "teď",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
-  "relative_time.today": "today",
+  "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušit",
   "report.forward": "Přeposlat na {target}",
   "report.forward_hint": "Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii?",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cd4ba01a5..cf28408c4 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -3,7 +3,7 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "@{name} blockieren",
-  "account.block_domain": "Alles von {domain} verstecken",
+  "account.block_domain": "Alles von {domain} blockieren",
   "account.blocked": "Blockiert",
   "account.cancel_follow_request": "Folgeanfrage abbrechen",
   "account.direct": "Direktnachricht an @{name}",
@@ -34,7 +34,7 @@
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Von @{name} geteilte Beiträge anzeigen",
   "account.unblock": "@{name} entblocken",
-  "account.unblock_domain": "{domain} wieder anzeigen",
+  "account.unblock_domain": "Blockieren von {domain} beenden",
   "account.unendorse": "Nicht auf Profil hervorheben",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
@@ -86,7 +86,7 @@
   "compose_form.poll.option_placeholder": "Wahl {number}",
   "compose_form.poll.remove_option": "Wahl entfernen",
   "compose_form.poll.switch_to_multiple": "Umfrage ändern, um mehrere Optionen zu erlauben",
-  "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu ermöglichen",
+  "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu erlauben",
   "compose_form.publish": "Tröt",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Medien als heikel markieren",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Keine Beiträge!",
   "empty_column.account_unavailable": "Konto nicht verfügbar",
   "empty_column.blocks": "Du hast keine Profile blockiert.",
-  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Toots gespeichert. Wenn du einen Beitrag als Toot speicherst, wird er hier erscheinen.",
+  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
   "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
   "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
   "empty_column.domain_blocks": "Es ist noch keine versteckten Domains.",
@@ -158,7 +158,7 @@
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
   "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufüllen",
-  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browsereinkompatibilität konnte diese Seite nicht korrekt angezeigt werden.",
+  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browser-Inkompatibilität konnte diese Seite nicht korrekt angezeigt werden.",
   "error.unexpected_crash.next_steps": "Versuche die Seite zu aktualisieren. Wenn das nicht hilft, kannst du Mastodon über einen anderen Browser oder eine native App verwenden.",
   "errors.unexpected_crash.copy_stacktrace": "Fehlerlog in die Zwischenablage kopieren",
   "errors.unexpected_crash.report_issue": "Problem melden",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
   "notifications.column_settings.filter_bar.show": "Anzeigen",
   "notifications.column_settings.follow": "Neue Folgende:",
-  "notifications.column_settings.follow_request": "Neue Folge-Anfragen:",
+  "notifications.column_settings.follow_request": "Neue Folgeanfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
   "notifications.column_settings.poll": "Ergebnisse von Umfragen:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
@@ -321,7 +321,7 @@
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Wird an erwähnte Profile gesendet",
   "privacy.direct.short": "Direktnachricht",
-  "privacy.private.long": "Wird nur für deine Folgende sichtbar sein",
+  "privacy.private.long": "Beitrag nur an Folgende",
   "privacy.private.short": "Nur für Folgende",
   "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
   "privacy.public.short": "Öffentlich",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 0eb054acd..284232c20 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -142,7 +142,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       }
     ],
@@ -217,7 +217,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Toggle visibility",
+        "defaultMessage": "Hide media",
         "id": "media_gallery.toggle_visible"
       },
       {
@@ -451,11 +451,11 @@
         "id": "status.copy"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -523,7 +523,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Hide entire domain",
+        "defaultMessage": "Block entire domain",
         "id": "confirmations.domain_block.confirm"
       },
       {
@@ -697,11 +697,11 @@
         "id": "account.media"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -737,7 +737,7 @@
         "id": "navigation_bar.blocks"
       },
       {
-        "defaultMessage": "Hidden domains",
+        "defaultMessage": "Blocked domains",
         "id": "navigation_bar.domain_blocks"
       },
       {
@@ -773,7 +773,7 @@
         "id": "account.muted"
       },
       {
-        "defaultMessage": "Domain hidden",
+        "defaultMessage": "Domain blocked",
         "id": "account.domain_blocked"
       },
       {
@@ -917,6 +917,10 @@
       {
         "defaultMessage": "Logout",
         "id": "navigation_bar.logout"
+      },
+      {
+        "defaultMessage": "Bookmarks",
+        "id": "navigation_bar.bookmarks"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/action_bar.json"
@@ -1073,7 +1077,7 @@
         "id": "privacy.public.short"
       },
       {
-        "defaultMessage": "Post to public timelines",
+        "defaultMessage": "Visible for all, shown in public timelines",
         "id": "privacy.public.long"
       },
       {
@@ -1081,7 +1085,7 @@
         "id": "privacy.unlisted.short"
       },
       {
-        "defaultMessage": "Do not show in public timelines",
+        "defaultMessage": "Visible for all, but not in public timelines",
         "id": "privacy.unlisted.long"
       },
       {
@@ -1089,7 +1093,7 @@
         "id": "privacy.private.short"
       },
       {
-        "defaultMessage": "Post to followers only",
+        "defaultMessage": "Visible for followers only",
         "id": "privacy.private.long"
       },
       {
@@ -1097,7 +1101,7 @@
         "id": "privacy.direct.short"
       },
       {
-        "defaultMessage": "Post to mentioned users only",
+        "defaultMessage": "Visible for mentioned users only",
         "id": "privacy.direct.long"
       },
       {
@@ -1466,15 +1470,15 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Hidden domains",
+        "defaultMessage": "Blocked domains",
         "id": "column.domain_blocks"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
-        "defaultMessage": "There are no hidden domains yet.",
+        "defaultMessage": "There are no blocked domains yet.",
         "id": "empty_column.domain_blocks"
       }
     ],
@@ -1528,6 +1532,10 @@
       {
         "defaultMessage": "You don't have any follow requests yet. When you receive one, it will show up here.",
         "id": "empty_column.follow_requests"
+      },
+      {
+        "defaultMessage": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+        "id": "follow_requests.unlocked_explanation"
       }
     ],
     "path": "app/javascript/mastodon/features/follow_requests/index.json"
@@ -2384,11 +2392,11 @@
         "id": "status.copy"
       },
       {
-        "defaultMessage": "Hide everything from {domain}",
+        "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
       {
-        "defaultMessage": "Unhide {domain}",
+        "defaultMessage": "Unblock domain {domain}",
         "id": "account.unblock_domain"
       },
       {
@@ -2944,4 +2952,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
\ No newline at end of file
+]
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 5b0067acb..d92a0e35a 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -150,7 +150,7 @@
   "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.favourites": "Κανείς δεν έχει αγαπήσει αυτό το τουτ ακόμα. Μόλις το κάνει κάποια, θα εμφανιστούν εδώ.",
   "empty_column.follow_requests": "Δεν έχεις κανένα αίτημα παρακολούθησης ακόμα. Μόλις λάβεις κάποιο, θα εμφανιστεί εδώ.",
-  "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ταμπέλα.",
+  "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.",
   "empty_column.home": "Η τοπική σου ροή είναι κενή! Πήγαινε στο {public} ή κάνε αναζήτηση για να ξεκινήσεις και να γνωρίσεις άλλους χρήστες.",
   "empty_column.home.public_timeline": "η δημόσια ροή",
   "empty_column.list": "Δεν υπάρχει τίποτα σε αυτή τη λίστα ακόμα. Όταν τα μέλη της δημοσιεύσουν νέες καταστάσεις, θα εμφανιστούν εδώ.",
@@ -176,7 +176,7 @@
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
   "hashtag.column_settings.select.no_options_message": "Δεν βρέθηκαν προτάσεις",
-  "hashtag.column_settings.select.placeholder": "Γράψε μερικές ταμπέλες…",
+  "hashtag.column_settings.select.placeholder": "Γράψε μερικές ετικέτες…",
   "hashtag.column_settings.tag_mode.all": "Όλα αυτά",
   "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
   "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
@@ -345,13 +345,13 @@
   "report.target": "Καταγγελία {target}",
   "search.placeholder": "Αναζήτηση",
   "search_popout.search_format": "Προχωρημένη αναζήτηση",
-  "search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, σημειώσει ως αγαπημένες, προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ταμπέλες ταιριάζουν.",
-  "search_popout.tips.hashtag": "ταμπέλα",
+  "search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, έχεις σημειώσει ως αγαπημένες, έχεις προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ετικέτες ταιριάζουν.",
+  "search_popout.tips.hashtag": "ετικέτα",
   "search_popout.tips.status": "κατάσταση",
-  "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ταμπέλες που ταιριάζουν",
+  "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ετικέτες που ταιριάζουν",
   "search_popout.tips.user": "χρήστης",
   "search_results.accounts": "Άνθρωποι",
-  "search_results.hashtags": "Ταμπέλες",
+  "search_results.hashtags": "Ετικέτες",
   "search_results.statuses": "Τουτ",
   "search_results.statuses_fts_disabled": "Η αναζήτηση τουτ βάσει του περιεχόμενού τους δεν είναι ενεργοποιημένη σε αυτό τον κόμβο.",
   "search_results.total": "{count, number} {count, plural, zero {αποτελέσματα} one {αποτέλεσμα} other {αποτελέσματα}}",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5927aeb6c..616780785 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
   "account.block": "Block @{name}",
-  "account.block_domain": "Hide everything from {domain}",
+  "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.cancel_follow_request": "Cancel follow request",
   "account.direct": "Direct message @{name}",
-  "account.domain_blocked": "Domain hidden",
+  "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.endorse": "Feature on profile",
   "account.follow": "Follow",
@@ -34,7 +34,7 @@
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_domain": "Unblock domain {domain}",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
@@ -57,7 +57,7 @@
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
+  "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
   "column.follow_requests": "Follow requests",
   "column.home": "Home",
@@ -103,7 +103,7 @@
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "Block entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
@@ -146,7 +146,7 @@
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
@@ -164,6 +164,7 @@
   "errors.unexpected_crash.report_issue": "Report issue",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "getting_started.developers": "Developers",
   "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
@@ -254,7 +255,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
@@ -265,7 +266,7 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -319,13 +320,13 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.long": "Visible for mentioned users only",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
+  "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all, shown in public timelines",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not post to public timelines",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a315c9226..5138b85a0 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -374,7 +374,7 @@
   "status.more": "Pli",
   "status.mute": "Silentigi @{name}",
   "status.mute_conversation": "Silentigi konversacion",
-  "status.open": "Grandigi",
+  "status.open": "Grandigi ĉi tiun mesaĝon",
   "status.pin": "Alpingli profile",
   "status.pinned": "Alpinglita mesaĝo",
   "status.read_more": "Legi pli",
@@ -392,7 +392,7 @@
   "status.show_less": "Malgrandigi",
   "status.show_less_all": "Malgrandigi ĉiujn",
   "status.show_more": "Grandigi",
-  "status.show_more_all": "Grandigi ĉiujn",
+  "status.show_more_all": "Malfoldi ĉiun",
   "status.show_thread": "Montri la fadenon",
   "status.uncached_media_warning": "Nedisponebla",
   "status.unmute_conversation": "Malsilentigi la konversacion",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 8e1f84ab8..4f7a9e59f 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -375,7 +375,7 @@
   "status.mute": "Silenciar a @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir este estado",
-  "status.pin": "Pin en el perfil",
+  "status.pin": "Fijar en el perfil",
   "status.pinned": "Toot fijado",
   "status.read_more": "Leer más",
   "status.reblog": "Retootear",
@@ -396,7 +396,7 @@
   "status.show_thread": "Mostrar hilo",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
-  "status.unpin": "Desmarcar del perfil",
+  "status.unpin": "Dejar de fijar",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te interese…",
   "tabs_bar.federated_timeline": "Federado",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 5dc4e60c2..3a44dceb5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -27,8 +27,8 @@
   "account.mute_notifications": "Mututu @{name}(r)en jakinarazpenak",
   "account.muted": "Mutututa",
   "account.never_active": "Inoiz ez",
-  "account.posts": "Tootak",
-  "account.posts_with_replies": "Toot-ak eta erantzunak",
+  "account.posts": "Toot",
+  "account.posts_with_replies": "Tootak eta erantzunak",
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
   "account.share": "@{name}(e)ren profila elkarbanatu",
@@ -64,7 +64,7 @@
   "column.lists": "Zerrendak",
   "column.mutes": "Mutututako erabiltzaileak",
   "column.notifications": "Jakinarazpenak",
-  "column.pins": "Finkatutako toot-ak",
+  "column.pins": "Finkatutako tootak",
   "column.public": "Federatutako denbora-lerroa",
   "column_back_button.label": "Atzera",
   "column_header.hide_settings": "Ezkutatu ezarpenak",
@@ -140,7 +140,7 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
-  "empty_column.account_timeline": "Ez dago toot-ik hemen!",
+  "empty_column.account_timeline": "Ez dago tootik hemen!",
   "empty_column.account_unavailable": "Profila ez dago eskuragarri",
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
   "empty_column.bookmarked_statuses": "Oraindik ez dituzu toot laster-markatutarik. Bat laster-markatzerakoan, hemen agertuko da.",
@@ -228,7 +228,7 @@
   "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
   "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
   "keyboard_shortcuts.open_media": "media zabaltzeko",
-  "keyboard_shortcuts.pinned": "finkatutako toot-en zerrenda irekitzeko",
+  "keyboard_shortcuts.pinned": "finkatutako tooten zerrenda irekitzeko",
   "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "erantzutea",
   "keyboard_shortcuts.requests": "jarraitzeko eskarien zerrenda irekitzeko",
@@ -277,7 +277,7 @@
   "navigation_bar.logout": "Amaitu saioa",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.personal": "Pertsonala",
-  "navigation_bar.pins": "Finkatutako toot-ak",
+  "navigation_bar.pins": "Finkatutako tootak",
   "navigation_bar.preferences": "Hobespenak",
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.security": "Segurtasuna",
@@ -352,8 +352,8 @@
   "search_popout.tips.user": "erabiltzailea",
   "search_results.accounts": "Jendea",
   "search_results.hashtags": "Traolak",
-  "search_results.statuses": "Toot-ak",
-  "search_results.statuses_fts_disabled": "Mastodon zerbitzari honek ez du Toot-en edukiaren bilaketa gaitu.",
+  "search_results.statuses": "Tootak",
+  "search_results.statuses_fts_disabled": "Mastodon zerbitzari honek ez du tooten edukiaren bilaketa gaitu.",
   "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitza}}",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_status": "Ireki mezu hau moderazio interfazean",
@@ -376,7 +376,7 @@
   "status.mute_conversation": "Mututu elkarrizketa",
   "status.open": "Hedatu mezu hau",
   "status.pin": "Finkatu profilean",
-  "status.pinned": "Finkatutako toot-a",
+  "status.pinned": "Finkatutako toota",
   "status.read_more": "Irakurri gehiago",
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 0fc39b16d..f2e7f300a 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -254,7 +254,7 @@
   "lists.subheading": "فهرست‌های شما",
   "load_pending": "{count, plural, one {# مورد تازه} other {# مورد تازه}}",
   "loading_indicator.label": "بارگیری...",
-  "media_gallery.toggle_visible": "تغییر پیدایی",
+  "media_gallery.toggle_visible": "تغییر وضعیت نمایانی",
   "missing_indicator.label": "پیدا نشد",
   "missing_indicator.sublabel": "این منبع پیدا نشد",
   "mute_modal.hide_notifications": "اعلان‌های این کاربر پنهان شود؟",
@@ -319,13 +319,13 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "حذف نظرسنجی",
   "privacy.change": "تنظیم محرمانگی نوشته",
-  "privacy.direct.long": "تنها به کاربران نام‌برده‌شده نشان بده",
+  "privacy.direct.long": "ارسال فقط به کاربران اشاره‌شده",
   "privacy.direct.short": "خصوصی",
-  "privacy.private.long": "تنها به پیگیران نشان بده",
+  "privacy.private.long": "ارسال فقط به پی‌گیران",
   "privacy.private.short": "خصوصی",
-  "privacy.public.long": "نمایش در فهرست عمومی",
+  "privacy.public.long": "ارسال به خط‌زمانی عمومی",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
+  "privacy.unlisted.long": "ارسال نکردن به خط‌زمانی عمومی",
   "privacy.unlisted.short": "فهرست‌نشده",
   "refresh": "به‌روزرسانی",
   "regeneration_indicator.label": "در حال باز شدن…",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b46083477..32bc8de49 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
-  "account.badges.group": "Group",
+  "account.badges.group": "Ryhmä",
   "account.block": "Estä @{name}",
   "account.block_domain": "Piilota kaikki sisältö verkkotunnuksesta {domain}",
   "account.blocked": "Estetty",
@@ -34,7 +34,7 @@
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä buustaukset käyttäjältä @{name}",
   "account.unblock": "Salli @{name}",
-  "account.unblock_domain": "Näytä {domain}",
+  "account.unblock_domain": "Salli {domain}",
   "account.unendorse": "Poista suosittelu profiilistasi",
   "account.unfollow": "Lakkaa seuraamasta",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "Määrää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Ilmoitus",
   "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.body": "Jokin meni vikaan komponenttia ladattaessa.",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Äänestyksen kesto",
   "compose_form.poll.option_placeholder": "Valinta numero",
   "compose_form.poll.remove_option": "Poista tämä valinta",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
+  "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
   "compose_form.publish": "Tuuttaa",
   "compose_form.publish_loud": "Julkista!",
   "compose_form.sensitive.hide": "Valitse tämä arkaluontoisena",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Ei ole 'toots' täällä!",
   "empty_column.account_unavailable": "Profiilia ei löydy",
   "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Et ole vielä lisännyt tuuttauksia kirjanmerkkeihisi. Kun teet niin, tuuttaus näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Homma lähtee käyntiin, kun kirjoitat jotain julkista!",
   "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
   "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä piilotettu.",
@@ -160,7 +160,7 @@
   "empty_column.public": "Täällä ei ole mitään! Saat sisältöä, kun kirjoitat jotain julkisesti tai käyt seuraamassa muiden instanssien käyttäjiä",
   "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
   "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos tämä ei auta, saatat yhä pystyä käyttämään Mastodonia toisen selaimen tai sovelluksen kautta.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.copy_stacktrace": "Kopioi stacktrace leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Piilota ilmoitukset",
+  "home.show_announcements": "Näytä ilmoitukset",
   "intervals.full.days": "Päivä päiviä",
   "intervals.full.hours": "Tunti tunteja",
   "intervals.full.minutes": "Minuuti minuuteja",
@@ -215,7 +215,7 @@
   "keyboard_shortcuts.direct": "avaa pikaviestisarake",
   "keyboard_shortcuts.down": "siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "avaa tilapäivitys",
-  "keyboard_shortcuts.favourite": "tykkää",
+  "keyboard_shortcuts.favourite": "lisää suosikkeihin",
   "keyboard_shortcuts.favourites": "avaa lista suosikeista",
   "keyboard_shortcuts.federated": "avaa yleinen aikajana",
   "keyboard_shortcuts.heading": "Näppäinkomennot",
@@ -227,7 +227,7 @@
   "keyboard_shortcuts.muted": "avaa lista mykistetyistä käyttäjistä",
   "keyboard_shortcuts.my_profile": "avaa profiilisi",
   "keyboard_shortcuts.notifications": "avaa ilmoitukset-sarake",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "median avaus",
   "keyboard_shortcuts.pinned": "avaa lista kiinnitetyistä tuuttauksista",
   "keyboard_shortcuts.profile": "avaa kirjoittajan profiili",
   "keyboard_shortcuts.reply": "vastaa",
@@ -260,7 +260,7 @@
   "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
   "navigation_bar.apps": "Mobiilisovellukset",
   "navigation_bar.blocks": "Estetyt käyttäjät",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Kirjoita uusi tuuttaus",
   "navigation_bar.direct": "Viestit",
@@ -283,9 +283,9 @@
   "navigation_bar.security": "Tunnukset",
   "notification.favourite": "{name} tykkäsi tilastasi",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} haluaa seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
-  "notification.own_poll": "Your poll has ended",
+  "notification.own_poll": "Kyselysi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} buustasi tilaasi",
   "notifications.clear": "Tyhjennä ilmoitukset",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
   "notifications.column_settings.filter_bar.show": "Näytä",
   "notifications.column_settings.follow": "Uudet seuraajat:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.poll": "Kyselyn tulokset:",
   "notifications.column_settings.push": "Push-ilmoitukset",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "nyt",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
-  "relative_time.today": "today",
+  "relative_time.today": "tänään",
   "reply_indicator.cancel": "Peruuta",
   "report.forward": "Välitä kohteeseen {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
@@ -358,7 +358,7 @@
   "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}",
   "status.admin_status": "Avaa tilapäivitys moderaattorinäkymässä",
   "status.block": "Estä @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Tallenna kirjanmerkki",
   "status.cancel_reblog_private": "Peru buustaus",
   "status.cannot_reblog": "Tätä julkaisua ei voi buustata",
   "status.copy": "Kopioi linkki tilapäivitykseen",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name} buustasi",
   "status.reblogs.empty": "Kukaan ei ole vielä buustannut tätä tuuttausta. Kun joku tekee niin, näkyy kyseinen henkilö tässä.",
   "status.redraft": "Poista & palauta muokattavaksi",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "Poista kirjanmerkki",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
   "status.report": "Raportoi @{name}",
@@ -416,11 +416,11 @@
   "upload_button.label": "Lisää mediaa",
   "upload_error.limit": "Tiedostolatauksien raja ylitetty.",
   "upload_error.poll": "Tiedon lataaminen ei ole sallittua kyselyissä.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Kuvaile kuulovammaisille",
   "upload_form.description": "Anna kuvaus näkörajoitteisia varten",
   "upload_form.edit": "Muokkaa",
   "upload_form.undo": "Peru",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Kuvaile kuulo- tai näkövammaisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
   "upload_modal.description_placeholder": "Eräänä jäätävänä ja pimeänä yönä gorilla ratkaisi sudokun kahdessa minuutissa",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index f61c15d57..cf07cd3db 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -3,29 +3,29 @@
   "account.badges.bot": "Robot",
   "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
-  "account.block_domain": "Tout masquer venant de {domain}",
+  "account.block_domain": "Bloquer le domaine {domain}",
   "account.blocked": "Bloqué·e",
   "account.cancel_follow_request": "Annuler la demande de suivi",
   "account.direct": "Envoyer un message direct à @{name}",
-  "account.domain_blocked": "Domaine caché",
+  "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
   "account.endorse": "Recommander sur le profil",
   "account.follow": "Suivre",
-  "account.followers": "Abonné⋅e⋅s",
-  "account.followers.empty": "Personne ne suit cet utilisateur·rice pour l’instant.",
+  "account.followers": "Abonné·e·s",
+  "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.follows": "Abonnements",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.last_status": "Dernière activité",
   "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
-  "account.locked_info": "Ce compte est verrouillé. Son propriétaire approuve manuellement qui peut le ou la suivre.",
-  "account.media": "Média",
+  "account.locked_info": "Ce compte est verrouillé. Son ou sa propriétaire approuve manuellement qui peut le suivre.",
+  "account.media": "Médias",
   "account.mention": "Mentionner @{name}",
   "account.moved_to": "{name} a déménagé vers :",
   "account.mute": "Masquer @{name}",
   "account.mute_notifications": "Ignorer les notifications de @{name}",
-  "account.muted": "Silencé·e",
+  "account.muted": "Masqué·e",
   "account.never_active": "Jamais",
   "account.posts": "Pouets",
   "account.posts_with_replies": "Pouets et réponses",
@@ -38,14 +38,14 @@
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer @{name}",
-  "account.unmute_notifications": "Réactiver les notifications de @{name}",
+  "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Débit limité",
+  "alert.rate_limited.title": "Taux limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
   "announcement.announcement": "Annonce",
   "autosuggest_hashtag.per_week": "{count} par semaine",
-  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci, la prochaine fois",
+  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.body": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_column_error.retry": "Réessayer",
   "bundle_column_error.title": "Erreur réseau",
@@ -55,7 +55,7 @@
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
   "column.community": "Fil public local",
-  "column.direct": "Messages privés",
+  "column.direct": "Messages directs",
   "column.directory": "Parcourir les profils",
   "column.domain_blocks": "Domaines cachés",
   "column.favourites": "Favoris",
@@ -67,7 +67,7 @@
   "column.pins": "Pouets épinglés",
   "column.public": "Fil public global",
   "column_back_button.label": "Retour",
-  "column_header.hide_settings": "Masquer les paramètres",
+  "column_header.hide_settings": "Cacher les paramètres",
   "column_header.moveLeft_settings": "Déplacer la colonne vers la gauche",
   "column_header.moveRight_settings": "Déplacer la colonne vers la droite",
   "column_header.pin": "Épingler",
@@ -94,39 +94,39 @@
   "compose_form.sensitive.unmarked": "Le média n’est pas marqué comme sensible",
   "compose_form.spoiler.marked": "Le texte est caché derrière un avertissement",
   "compose_form.spoiler.unmarked": "Le texte n’est pas caché",
-  "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
+  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Confirmez-vous le blocage de {name} ?",
+  "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.delete.confirm": "Supprimer",
-  "confirmations.delete.message": "Confirmez-vous la suppression de ce pouet ?",
+  "confirmations.delete.message": "Voulez-vous vraiment supprimer ce pouet ?",
   "confirmations.delete_list.confirm": "Supprimer",
-  "confirmations.delete_list.message": "Êtes-vous sûr·e de vouloir supprimer définitivement cette liste ?",
+  "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.domain_block.confirm": "Masquer le domaine entier",
-  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
-  "confirmations.logout.confirm": "Déconnexion",
-  "confirmations.logout.message": "Êtes-vous sûr·e de vouloir vous déconnecter ?",
+  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
+  "confirmations.logout.confirm": "Se déconnecter",
+  "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Êtes-vous sûr·e de vouloir masquer {name} ?",
-  "confirmations.redraft.confirm": "Effacer et ré-écrire",
-  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
+  "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
+  "confirmations.redraft.confirm": "Supprimer et ré-écrire",
+  "confirmations.redraft.message": "Voulez-vous vraiment supprimer ce pouet pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
-  "confirmations.reply.message": "Répondre maintenant écrasera le message que vous composez actuellement. Êtes-vous sûr·e de vouloir continuer ?",
+  "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez actuellement. Voulez-vous vraiment continuer ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Êtes-vous sûr·e de vouloir arrêter de suivre {name} ?",
+  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name} ?",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
   "conversation.with": "Avec {names}",
   "directory.federated": "Du fédiverse connu",
   "directory.local": "De {domain} seulement",
-  "directory.new_arrivals": "Nouveaux·elles arrivant·e·s",
-  "directory.recently_active": "Récemment actif·ve·s",
+  "directory.new_arrivals": "Inscrit·e·s récemment",
+  "directory.recently_active": "Actif·ve·s récemment",
   "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
-  "emoji_button.activity": "Activités",
+  "emoji_button.activity": "Activité",
   "emoji_button.custom": "Personnalisés",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Nourriture & Boisson",
@@ -136,7 +136,7 @@
   "emoji_button.objects": "Objets",
   "emoji_button.people": "Personnes",
   "emoji_button.recent": "Fréquemment utilisés",
-  "emoji_button.search": "Recherche…",
+  "emoji_button.search": "Recherche...",
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux & Voyages",
@@ -155,7 +155,7 @@
   "empty_column.home.public_timeline": "le fil public",
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Dès que des personnes de cette liste publieront de nouveaux statuts, ils apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
-  "empty_column.mutes": "Vous n’avez pas encore silencié d’utilisateur·rice·s.",
+  "empty_column.mutes": "Vous n’avez masqué aucun·e utilisateur·rice pour le moment.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -176,12 +176,12 @@
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
   "hashtag.column_settings.select.no_options_message": "Aucune suggestion trouvée",
-  "hashtag.column_settings.select.placeholder": "Ajouter des hashtags…",
+  "hashtag.column_settings.select.placeholder": "Entrer des hashtags…",
   "hashtag.column_settings.tag_mode.all": "Tous ces éléments",
   "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
   "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
-  "hashtag.column_settings.tag_toggle": "Inclure des mots-clés additionnels dans cette colonne",
-  "home.column_settings.basic": "Base",
+  "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -199,46 +199,46 @@
   "introduction.interactions.action": "Finir le tutoriel !",
   "introduction.interactions.favourite.headline": "Favoris",
   "introduction.interactions.favourite.text": "Vous pouvez garder un pouet pour plus tard et faire savoir à son auteur·ice que vous l’avez aimé, en l'ajoutant aux favoris.",
-  "introduction.interactions.reblog.headline": "Repartager",
+  "introduction.interactions.reblog.headline": "Partager",
   "introduction.interactions.reblog.text": "Vous pouvez partager les pouets d'autres personnes avec vos abonné·e·s en les repartageant.",
   "introduction.interactions.reply.headline": "Répondre",
   "introduction.interactions.reply.text": "Vous pouvez répondre aux pouets d'autres personnes et à vos propres pouets, ce qui les enchaînera dans une conversation.",
   "introduction.welcome.action": "Allons-y !",
   "introduction.welcome.headline": "Premiers pas",
   "introduction.welcome.text": "Bienvenue dans le fédiverse ! Dans quelques instants, vous pourrez diffuser des messages et parler à vos ami·e·s sur une grande variété de serveurs. Mais ce serveur, {domain}, est spécial - il héberge votre profil, alors souvenez-vous de son nom.",
-  "keyboard_shortcuts.back": "pour revenir en arrière",
-  "keyboard_shortcuts.blocked": "pour ouvrir la liste des comptes bloqués",
-  "keyboard_shortcuts.boost": "pour partager",
-  "keyboard_shortcuts.column": "pour focaliser un statut dans l’une des colonnes",
-  "keyboard_shortcuts.compose": "pour focaliser la zone de rédaction",
+  "keyboard_shortcuts.back": "revenir en arrière",
+  "keyboard_shortcuts.blocked": "ouvrir la liste des comptes bloqués",
+  "keyboard_shortcuts.boost": "partager",
+  "keyboard_shortcuts.column": "cibler un pouet d’une des colonnes",
+  "keyboard_shortcuts.compose": "cibler la zone de rédaction",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "pour ouvrir la colonne des messages directs",
-  "keyboard_shortcuts.down": "pour descendre dans la liste",
-  "keyboard_shortcuts.enter": "pour ouvrir le statut",
-  "keyboard_shortcuts.favourite": "pour ajouter aux favoris",
-  "keyboard_shortcuts.favourites": "pour ouvrir la liste des pouets favoris",
-  "keyboard_shortcuts.federated": "pour ouvrir le fil public global",
+  "keyboard_shortcuts.direct": "ouvrir la colonne des messages directs",
+  "keyboard_shortcuts.down": "descendre dans la liste",
+  "keyboard_shortcuts.enter": "ouvrir le pouet",
+  "keyboard_shortcuts.favourite": "ajouter aux favoris",
+  "keyboard_shortcuts.favourites": "ouvrir la liste des favoris",
+  "keyboard_shortcuts.federated": "ouvrir le fil public global",
   "keyboard_shortcuts.heading": "Raccourcis clavier",
-  "keyboard_shortcuts.home": "pour ouvrir l’accueil",
-  "keyboard_shortcuts.hotkey": "Raccourci",
-  "keyboard_shortcuts.legend": "pour afficher cette légende",
-  "keyboard_shortcuts.local": "pour ouvrir le fil public local",
-  "keyboard_shortcuts.mention": "pour mentionner l’auteur·rice",
-  "keyboard_shortcuts.muted": "pour ouvrir la liste des utilisateur·rice·s muté·e·s",
-  "keyboard_shortcuts.my_profile": "pour ouvrir votre profil",
-  "keyboard_shortcuts.notifications": "pour ouvrir votre colonne de notifications",
-  "keyboard_shortcuts.open_media": "pour ouvrir le média",
-  "keyboard_shortcuts.pinned": "pour ouvrir une liste des pouets épinglés",
-  "keyboard_shortcuts.profile": "pour ouvrir le profil de l’auteur·rice",
-  "keyboard_shortcuts.reply": "pour répondre",
-  "keyboard_shortcuts.requests": "pour ouvrir la liste de demandes de suivi",
-  "keyboard_shortcuts.search": "pour cibler la recherche",
-  "keyboard_shortcuts.start": "pour ouvrir la colonne « pour commencer »",
-  "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
-  "keyboard_shortcuts.toggle_sensitivity": "pour afficher/cacher les médias",
-  "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
-  "keyboard_shortcuts.unfocus": "pour quitter la zone de composition/recherche",
-  "keyboard_shortcuts.up": "pour remonter dans la liste",
+  "keyboard_shortcuts.home": "le fil d’accueil",
+  "keyboard_shortcuts.hotkey": "Raccourci clavier",
+  "keyboard_shortcuts.legend": "afficher cet aide-mémoire",
+  "keyboard_shortcuts.local": "ouvrir le fil public local",
+  "keyboard_shortcuts.mention": "mentionner l’auteur·rice",
+  "keyboard_shortcuts.muted": "ouvrir la liste des comptes masqués",
+  "keyboard_shortcuts.my_profile": "ouvrir votre profil",
+  "keyboard_shortcuts.notifications": "ouvrir la colonne de notifications",
+  "keyboard_shortcuts.open_media": "ouvrir le média",
+  "keyboard_shortcuts.pinned": "ouvrir la liste des pouets épinglés",
+  "keyboard_shortcuts.profile": "ouvrir le profil de l’auteur·rice",
+  "keyboard_shortcuts.reply": "répondre",
+  "keyboard_shortcuts.requests": "ouvrir la liste de demandes d’abonnement",
+  "keyboard_shortcuts.search": "cibler la zone de recherche",
+  "keyboard_shortcuts.start": "ouvrir la colonne « Pour commencer »",
+  "keyboard_shortcuts.toggle_hidden": "déplier/replier le texte derrière un CW",
+  "keyboard_shortcuts.toggle_sensitivity": "afficher/cacher les médias",
+  "keyboard_shortcuts.toot": "démarrer un tout nouveau pouet",
+  "keyboard_shortcuts.unfocus": "quitter la zone de rédaction/recherche",
+  "keyboard_shortcuts.up": "remonter dans la liste",
   "lightbox.close": "Fermer",
   "lightbox.next": "Suivant",
   "lightbox.previous": "Précédent",
@@ -254,7 +254,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "Modifier la visibilité",
+  "media_gallery.toggle_visible": "Intervertir la visibilité",
   "missing_indicator.label": "Non trouvé",
   "missing_indicator.sublabel": "Ressource introuvable",
   "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
@@ -268,7 +268,7 @@
   "navigation_bar.domain_blocks": "Domaines cachés",
   "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.favourites": "Favoris",
-  "navigation_bar.filters": "Mots silenciés",
+  "navigation_bar.filters": "Mots masqués",
   "navigation_bar.follow_requests": "Demandes de suivi",
   "navigation_bar.follows_and_followers": "Abonnements et abonné⋅e·s",
   "navigation_bar.info": "À propos de ce serveur",
@@ -287,15 +287,15 @@
   "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
-  "notification.reblog": "{name} a partagé votre statut :",
-  "notifications.clear": "Nettoyer les notifications",
-  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
-  "notifications.column_settings.alert": "Notifications locales",
+  "notification.reblog": "{name} a partagé votre statut",
+  "notifications.clear": "Effacer les notifications",
+  "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
+  "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
   "notifications.column_settings.filter_bar.show": "Afficher",
-  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e·s :",
+  "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
   "notifications.column_settings.poll": "Résultats des sondage :",
@@ -306,7 +306,7 @@
   "notifications.filter.all": "Tout",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favoris",
-  "notifications.filter.follows": "Abonné·e·s",
+  "notifications.filter.follows": "Abonnés",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Résultats des sondages",
   "notifications.group": "{count} notifications",
@@ -321,8 +321,8 @@
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "N’envoyer qu’aux personnes mentionnées",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Seul⋅e⋅s vos abonné⋅e⋅s verront vos statuts",
-  "privacy.private.short": "Abonné⋅e⋅s uniquement",
+  "privacy.private.long": "Seul·e·s vos abonné·e·s verront vos statuts",
+  "privacy.private.short": "Abonné·e·s uniquement",
   "privacy.public.long": "Afficher dans les fils publics",
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
@@ -347,22 +347,22 @@
   "search_popout.search_format": "Recherche avancée",
   "search_popout.tips.full_text": "Un texte normal retourne les pouets que vous avez écris, mis en favori, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondant.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "statuts",
+  "search_popout.tips.status": "pouet",
   "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les identifiants et les hashtags correspondants",
-  "search_popout.tips.user": "utilisateur⋅ice",
+  "search_popout.tips.user": "utilisateur·ice",
   "search_results.accounts": "Comptes",
   "search_results.hashtags": "Hashtags",
   "search_results.statuses": "Pouets",
   "search_results.statuses_fts_disabled": "La recherche de pouets par leur contenu n'est pas activée sur ce serveur Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
-  "status.admin_status": "Ouvrir ce statut dans l’interface de modération",
+  "status.admin_status": "Ouvrir ce pouet dans l’interface de modération",
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
   "status.cannot_reblog": "Ce pouet ne peut pas être partagé",
   "status.copy": "Copier le lien vers le pouet",
-  "status.delete": "Effacer",
+  "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Envoyer un message direct à @{name}",
   "status.embed": "Intégrer",
@@ -374,15 +374,15 @@
   "status.more": "Plus",
   "status.mute": "Masquer @{name}",
   "status.mute_conversation": "Masquer la conversation",
-  "status.open": "Déplier ce statut",
+  "status.open": "Voir les détails du pouet",
   "status.pin": "Épingler sur le profil",
   "status.pinned": "Pouet épinglé",
   "status.read_more": "En savoir plus",
   "status.reblog": "Partager",
   "status.reblog_private": "Partager à l’audience originale",
-  "status.reblogged_by": "{name} a partagé :",
+  "status.reblogged_by": "{name} a partagé",
   "status.reblogs.empty": "Personne n’a encore partagé ce pouet. Lorsque quelqu’un le fera, il apparaîtra ici.",
-  "status.redraft": "Effacer et ré-écrire",
+  "status.redraft": "Supprimer et ré-écrire",
   "status.remove_bookmark": "Retirer des marque-pages",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
@@ -393,7 +393,7 @@
   "status.show_less_all": "Tout replier",
   "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
-  "status.show_thread": "Lire le fil",
+  "status.show_thread": "Montrer le fil",
   "status.uncached_media_warning": "Indisponible",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Retirer du profil",
@@ -409,7 +409,7 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} restantes",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} restantes",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {personne} other {personnes}} discutent",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {personne discute} other {personnes discutent}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "upload_area.title": "Glissez et déposez pour envoyer",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 0e9c9d6d1..b69ec2b95 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 76657cdde..f26b39c21 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -128,7 +128,7 @@
   "embed.preview": "Así será mostrado:",
   "emoji_button.activity": "Actividade",
   "emoji_button.custom": "Personalizado",
-  "emoji_button.flags": "Bandeiras",
+  "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida e Bebida",
   "emoji_button.label": "Inserir emoticona",
   "emoji_button.nature": "Natureza",
@@ -150,33 +150,33 @@
   "empty_column.favourited_statuses": "Aínda non tes toots favoritos. Cando che goste algún, aparecerá aquí.",
   "empty_column.favourites": "A ninguén lle gostou este toot polo momento. Cando a alguén lle goste, aparecerá aquí.",
   "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
-  "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
+  "empty_column.hashtag": "Aínda non hai nada con esta etiqueta.",
   "empty_column.home": "A túa cronoloxía inicial está baleira! Visita {public} ou emprega a procura para atopar outras usuarias.",
   "empty_column.home.public_timeline": "a cronoloxía pública",
   "empty_column.list": "Aínda non hai nada en esta lista. Cando as usuarias incluídas na lista publiquen mensaxes, aparecerán aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
-  "empty_column.notifications": "Aínda non tes notificacións. Interactúa con outros para comezar unha conversa.",
+  "empty_column.notifications": "Aínda non tes notificacións. Interactúa con outras para comezar unha conversa.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
-  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se esto non axuda podes tamén empregar o Mastodon noutro navegador ou aplicación nativa.",
+  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se esto non axuda podes tamén empregar Mastodon noutro navegador ou aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar trazas (stacktrace) ó portapapeis",
-  "errors.unexpected_crash.report_issue": "Denunciar un problema",
+  "errors.unexpected_crash.report_issue": "Informar sobre un problema",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
-  "getting_started.developers": "Desenvolvedores",
+  "getting_started.developers": "Desenvolvedoras",
   "getting_started.directory": "Directorio local",
   "getting_started.documentation": "Documentación",
   "getting_started.heading": "Primeiros pasos",
   "getting_started.invite": "Convidar persoas",
-  "getting_started.open_source_notice": "O Mastodon é software de código aberto. Podes contribuír ou informar de fallos no GitHub en {github}.",
+  "getting_started.open_source_notice": "Mastodon é software de código aberto. Podes contribuír ou informar de fallos en GitHub en {github}.",
   "getting_started.security": "Seguranza",
   "getting_started.terms": "Termos do servizo",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
   "hashtag.column_settings.select.no_options_message": "Non se atoparon suxestións",
-  "hashtag.column_settings.select.placeholder": "Inserir cancelos…",
+  "hashtag.column_settings.select.placeholder": "Inserir etiquetas…",
   "hashtag.column_settings.tag_mode.all": "Todos estes",
   "hashtag.column_settings.tag_mode.any": "Calquera destes",
   "hashtag.column_settings.tag_mode.none": "Ningún destes",
@@ -192,7 +192,7 @@
   "introduction.federation.action": "Seguinte",
   "introduction.federation.federated.headline": "Federado",
   "introduction.federation.federated.text": "Publicacións públicas doutros servidores do fediverso aparecerán na cronoloxía federada.",
-  "introduction.federation.home.headline": "Páxina inicial",
+  "introduction.federation.home.headline": "Inicio",
   "introduction.federation.home.text": "Publicacións de persoas que ti segues aparecerán na cronoloxía do inicio. Podes seguir calquera persoa en calquera servidor!",
   "introduction.federation.local.headline": "Local",
   "introduction.federation.local.text": "Publicacións públicas de persoas no teu mesmo servidor aparecerán na cronoloxía local.",
@@ -205,7 +205,7 @@
   "introduction.interactions.reply.text": "Podes responder ós toots doutras persoas e ós teus propios, así ficarán encadeados nunha conversa.",
   "introduction.welcome.action": "Imos!",
   "introduction.welcome.headline": "Primeiros pasos",
-  "introduction.welcome.text": "Benvido ó fediverso! Nun intre poderás difundir mensaxes e falar coas túas amizades nun grande número de servidores. Mais este servidor, {domain}, é especial—hospeda o teu perfil, por iso lémbrate do seu nome.",
+  "introduction.welcome.text": "Benvida ó fediverso! Nun intre poderás difundir mensaxes e falar coas túas amizades nun grande número de servidores. Mais este servidor, {domain}, é especial—hospeda o teu perfil, por iso lémbra o seu nome.",
   "keyboard_shortcuts.back": "para voltar atrás",
   "keyboard_shortcuts.blocked": "abrir lista de usuarias bloqueadas",
   "keyboard_shortcuts.boost": "promover",
@@ -270,7 +270,7 @@
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Peticións de seguimento",
-  "navigation_bar.follows_and_followers": "Seguindo e seguidores",
+  "navigation_bar.follows_and_followers": "Seguindo e seguidoras",
   "navigation_bar.info": "Sobre este servidor",
   "navigation_bar.keyboard_shortcuts": "Atallos do teclado",
   "navigation_bar.lists": "Listaxes",
@@ -295,7 +295,7 @@
   "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.filter_bar.show": "Amosar",
-  "notifications.column_settings.follow": "Novos seguidores:",
+  "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
   "notifications.column_settings.poll": "Resultados da enquisa:",
@@ -312,7 +312,7 @@
   "notifications.group": "{count} notificacións",
   "poll.closed": "Pechado",
   "poll.refresh": "Actualizar",
-  "poll.total_people": "{count, plural,one {# persoa}other {# persoas}}",
+  "poll.total_people": "{count, plural,one {# persoa} other {# persoas}}",
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaches por esta opción",
@@ -321,14 +321,14 @@
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Só para as usuarias mencionadas",
   "privacy.direct.short": "Directo",
-  "privacy.private.long": "Só para os seguidores",
-  "privacy.private.short": "Só seguidores",
+  "privacy.private.long": "Só para os seguidoras",
+  "privacy.private.short": "Só para seguidoras",
   "privacy.public.long": "Publicar nas cronoloxías públicas",
   "privacy.public.short": "Público",
   "privacy.unlisted.long": "Non publicar nas cronoloxías públicas",
   "privacy.unlisted.short": "Non listado",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Estase a cargar…",
+  "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
@@ -365,7 +365,7 @@
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa a @{name}",
-  "status.embed": "Embeber nunha web",
+  "status.embed": "Incrustar",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
   "status.load_more": "Cargar máis",
@@ -411,7 +411,7 @@
   "time_remaining.seconds": "{number, plural, one {# segundo} other {# segundos}} restantes",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoa} other {persoas}} falando",
   "trends.trending_now": "Tendencias actuais",
-  "ui.beforeunload": "O borrador perderase se saes do Mastodon.",
+  "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
   "upload_area.title": "Arrastra e solta para subir",
   "upload_button.label": "Engadir multimedia ({formats})",
   "upload_error.limit": "Límite máximo do ficheiro a subir excedido.",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index d4659bc2e..ee9d701b0 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "लोड हो रहा है...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "नहीं मिला",
   "missing_indicator.sublabel": "यह संसाधन नहीं मिल सका।",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index b25369326..d2d851436 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -130,7 +130,7 @@
   "emoji_button.custom": "Egyéni",
   "emoji_button.flags": "Zászlók",
   "emoji_button.food": "Étel és Ital",
-  "emoji_button.label": "Emoji beszúrása",
+  "emoji_button.label": "Emodzsi beszúrása",
   "emoji_button.nature": "Természet",
   "emoji_button.not_found": "Nincsenek emodzsik!! (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "Tárgyak",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 6a0e825b0..b3f1df94c 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -40,10 +40,10 @@
   "account.unmute": "Ապալռեցնել @{name}֊ին",
   "account.unmute_notifications": "Միացնել ծանուցումները @{name}֊ից",
   "alert.rate_limited.message": "Փորձէք  որոշ ժամանակ անց՝ {retry_time, time, medium}։",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.title": "Գործողությունների հաճախությունը գերազանցում է թույլատրելին",
   "alert.unexpected.message": "Անսպասելի սխալ տեղի ունեցաւ։",
   "alert.unexpected.title": "Վա՜յ",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Հայտարարություններ",
   "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա հաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.body": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
   "compose_form.poll.option_placeholder": "Տարբերակ {number}",
   "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրությամբ",
+  "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրությամբ",
   "compose_form.publish": "Թթել",
   "compose_form.publish_loud": "Թթե՜լ",
   "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
@@ -143,29 +143,29 @@
   "empty_column.account_timeline": "Այստեղ թթեր չկա՛ն։",
   "empty_column.account_unavailable": "Անձնական էջը հասանելի չի",
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշւած թութ։ Երբ էջանշես, դրանք կերեւան այստեղ։",
   "empty_column.community": "Տեղական հոսքը դատա՛րկ է։ Հրապարակային մի բան գրիր շարժիչը խոդ տալու համար։",
   "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն այստեղ կերեւայ։",
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած թութ։ Երբ հաւանես, դրանք կերեւան այստեղ։",
   "empty_column.favourites": "Այս թութը ոչ մէկ դեռ չի հաւանել։ Հաւանողները կերեւան այստեղ, երբ նշեն թութը հաւանած։",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_requests": "Դու դեռ չունես որեւէ հետևելու հայտ։ Բոլոր նման հայտերը կհայտնվեն այստեղ։",
   "empty_column.hashtag": "Այս պիտակով դեռ ոչինչ չկա։",
   "empty_column.home": "Քո հիմնական հոսքը դատա՛րկ է։ Այցելի՛ր {public}ը կամ օգտվիր որոնումից՝ այլ մարդկանց հանդիպելու համար։",
   "empty_column.home.public_timeline": "հրապարակային հոսք",
   "empty_column.list": "Այս ցանկում դեռ ոչինչ չկա։ Երբ ցանկի անդամներից որեւէ մեկը նոր թութ գրի, այն կհայտնվի այստեղ։",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "Առայժմ ոչ ոքի չեք արգելափակել։",
+  "empty_column.lists": "Դուք դեռ չունեք ստեղծած ցանկ։ Ցանկ ստեղծելուն պես այն կհայտնվի այստեղ։",
+  "empty_column.mutes": "Առայժմ ոչ ոքի չեք լռեցրել։",
   "empty_column.notifications": "Ոչ մի ծանուցում դեռ չունես։ Բզիր մյուսներին՝ խոսակցությունը սկսելու համար։",
   "empty_column.public": "Այստեղ բան չկա՛։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգույցներից էակների՝ այն լցնելու համար։",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.explanation": "Մեր ծրագրակազմում վրիպակի կամ դիտարկչի անհամատեղելիության պատճառով այս էջը չի կարող լիարժեք պատկերվել։",
+  "error.unexpected_crash.next_steps": "Փորձիր թարմացնել էջը։ Եթե դա չօգնի ապա կարող ես օգտվել Մաստադոնից ուրիշ դիտարկիչով կամ հավելվածով։",
+  "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին",
   "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին",
   "follow_request.authorize": "Վավերացնել",
   "follow_request.reject": "Մերժել",
   "getting_started.developers": "Մշակողներ",
-  "getting_started.directory": "Պրոֆիլի տեղադրավայրը",
+  "getting_started.directory": "Օգտատերերի շտեմարան",
   "getting_started.documentation": "Փաստաթղթեր",
   "getting_started.heading": "Ինչպես սկսել",
   "getting_started.invite": "Հրավիրել մարդկանց",
@@ -175,8 +175,8 @@
   "hashtag.column_header.tag_mode.all": "և {additional}",
   "hashtag.column_header.tag_mode.any": "կամ {additional}",
   "hashtag.column_header.tag_mode.none": "առանց {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.select.no_options_message": "Առաջարկներ չկան",
+  "hashtag.column_settings.select.placeholder": "Ավելացրու հեշթեգեր…",
   "hashtag.column_settings.tag_mode.all": "Բոլորը",
   "hashtag.column_settings.tag_mode.any": "Ցանկացածը",
   "hashtag.column_settings.tag_mode.none": "Ոչ մեկը",
@@ -184,50 +184,50 @@
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "home.hide_announcements": "Թաքցնել հայտարարությունները",
+  "home.show_announcements": "Ցուցադրել հայտարարությունները",
+  "intervals.full.days": "{number, plural, one {# օր} other {# օր}}",
+  "intervals.full.hours": "{number, plural, one {# ժամ} other {# ժամ}}",
+  "intervals.full.minutes": "{number, plural, one {# րոպե} other {# րոպե}}",
   "introduction.federation.action": "Հաջորդ",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.federated.headline": "Դաշնային",
+  "introduction.federation.federated.text": "Դաշտնեզերքի հարևան հանգույցների հանրային գրառումները կհայտնվեն դաշնային հոսքում։",
   "introduction.federation.home.headline": "Հիմնական",
-  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.home.text": "Այն անձանց թթերը ում հետևում ես, կհայտնվի հիմնական հոսքում։ Դու կարող ես հետևել ցանկացած անձի ցանկացած հանգույցից։",
   "introduction.federation.local.headline": "Տեղային",
-  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.federation.local.text": "Տեղական հոսքում կարող ես տեսնել քո հանգույցի բոլոր հանրային գրառումները։",
   "introduction.interactions.action": "Finish toot-orial!",
   "introduction.interactions.favourite.headline": "Նախընտրելի",
-  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.favourite.text": "Փոխանցիր հեղինակին որ քեզ դուր է եկել իր թութը հավանելով այն։",
   "introduction.interactions.reblog.headline": "Տարածել",
-  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reblog.text": "Կիսիր այլ օգտատերերի թութերը քո հետևորդների հետ տարածելով դրանք քո անձնական էջում։",
   "introduction.interactions.reply.headline": "Պատասխանել",
-  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.interactions.reply.text": "Արձագանքիր ուրիշների և քո թթերին, դրանք կդարսվեն մեկ ընհանուր քննարկման շղթայով։",
   "introduction.welcome.action": "Գնացի՜նք։",
   "introduction.welcome.headline": "Առաջին քայլեր",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+  "introduction.welcome.text": "Դաշնեզերքը ողջունում է ձեզ։ Շուտով կկարողանաս ուղարկել նամակներ ու շփվել տարբեր հանգույցների ընկերներիդ հետ։ Բայց մտապահիր {domain} հանգույցը, այն յուրահատուկ է, այստեղ է պահվում քո հաշիվը։",
   "keyboard_shortcuts.back": "ետ նավարկելու համար",
   "keyboard_shortcuts.blocked": "արգելափակված օգտատերերի ցանկը բացելու համար",
   "keyboard_shortcuts.boost": "տարածելու համար",
   "keyboard_shortcuts.column": "սյուներից մեկի վրա սեւեռվելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրույթին սեւեռվելու համար",
   "keyboard_shortcuts.description": "Նկարագրություն",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "հասցեագրված գրվածքների հոսքը բացելու համար",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժվելու համար",
   "keyboard_shortcuts.enter": "թութը բացելու համար",
   "keyboard_shortcuts.favourite": "հավանելու համար",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.favourites": "էջանիշերի ցուցակը բացելու համար",
+  "keyboard_shortcuts.federated": "դաշնային հոսքին անցնելու համար",
   "keyboard_shortcuts.heading": "Ստեղնաշարի կարճատներ",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "անձնական հոսքին անցնելու համար",
   "keyboard_shortcuts.hotkey": "Հատուկ ստեղն",
   "keyboard_shortcuts.legend": "այս ձեռնարկը ցուցադրելու համար",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.local": "տեղական հոսքին անցնելու համար",
   "keyboard_shortcuts.mention": "հեղինակին նշելու համար",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.muted": "լռեցված օգտատերերի ցանկը բացելու համար",
+  "keyboard_shortcuts.my_profile": "սեփական էջին անցնելու համար",
+  "keyboard_shortcuts.notifications": "ծանուցումեների սյունակը բացելու համար",
+  "keyboard_shortcuts.open_media": "ցուցադրել մեդիան",
   "keyboard_shortcuts.pinned": "ամրացուած թթերի ցանկը բացելու համար",
   "keyboard_shortcuts.profile": "հեղինակի անձնական էջը բացելու համար",
   "keyboard_shortcuts.reply": "պատասխանելու համար",
@@ -252,7 +252,7 @@
   "lists.new.title_placeholder": "Նոր ցանկի վերնագիր",
   "lists.search": "Փնտրել քո հետեւած մարդկանց մեջ",
   "lists.subheading": "Քո ցանկերը",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "load_pending": "{count, plural, one {# նոր նյութ} other {# նոր նյութ}}",
   "loading_indicator.label": "Բեռնվում է…",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "missing_indicator.label": "Չգտնվեց",
@@ -283,7 +283,7 @@
   "navigation_bar.security": "Անվտանգություն",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} քեզ հետևելու հայց է ուղարկել",
   "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
   "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
@@ -296,7 +296,7 @@
   "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
   "notifications.column_settings.filter_bar.show": "Ցուցադրել",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
   "notifications.column_settings.poll": "Հարցման արդիւնքները՝",
   "notifications.column_settings.push": "Հրելու ծանուցումներ",
@@ -312,8 +312,8 @@
   "notifications.group": "{count} ծանուցում",
   "poll.closed": "Փակ",
   "poll.refresh": "Թարմացնել",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.total_people": "{count, plural, one {# հոգի} other {# հոգի}}",
+  "poll.total_votes": "{count, plural, one {# ձայն} other {# ձայն}}",
   "poll.vote": "Քուէարկել",
   "poll.voted": "Դու քուէարկել ես այս տարբերակի համար",
   "poll_button.add_poll": "Աւելացնել հարցում",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "նոր",
   "relative_time.minutes": "{number}ր",
   "relative_time.seconds": "{number}վ",
-  "relative_time.today": "today",
+  "relative_time.today": "Այսօր",
   "reply_indicator.cancel": "Չեղարկել",
   "report.forward": "Փոխանցել {target}֊ին",
   "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
@@ -361,10 +361,10 @@
   "status.bookmark": "Էջանիշ",
   "status.cancel_reblog_private": "Ապատարածել",
   "status.cannot_reblog": "Այս թութը չի կարող տարածվել",
-  "status.copy": "Copy link to status",
+  "status.copy": "Պատճենել գրառման հղումը",
   "status.delete": "Ջնջել",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
+  "status.detailed_status": "Շղթայի ընդլայնված դիտում",
+  "status.direct": "Նամակ գրել {name} -ին",
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filtered": "Զտված",
@@ -376,57 +376,57 @@
   "status.mute_conversation": "Լռեցնել խոսակցությունը",
   "status.open": "Ընդարձակել այս թութը",
   "status.pin": "Ամրացնել անձնական էջում",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "Ամրացված թութ",
   "status.read_more": "Կարդալ ավելին",
   "status.reblog": "Տարածել",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Տարածել սեփական լսարանին",
   "status.reblogged_by": "{name} տարածել է",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.reblogs.empty": "Այս թութը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ որևէ մեկը տարածի։",
+  "status.redraft": "Ջնջել եւ վերակազմել",
+  "status.remove_bookmark": "Հեռացնել էջանիշերից",
   "status.reply": "Պատասխանել",
   "status.replyAll": "Պատասխանել թելին",
   "status.report": "Բողոքել @{name}֊ից",
   "status.sensitive_warning": "Կասկածելի բովանդակություն",
   "status.share": "Կիսվել",
   "status.show_less": "Պակաս",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
   "status.show_more": "Ավելին",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
+  "status.show_thread": "Բացել շղթան",
   "status.uncached_media_warning": "Անհասանելի",
   "status.unmute_conversation": "Ապալռեցնել խոսակցությունը",
   "status.unpin": "Հանել անձնական էջից",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Անտեսել առաջարկը",
+  "suggestions.header": "Միգուցե քեզ հետաքրքրի…",
   "tabs_bar.federated_timeline": "Դաշնային",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.local_timeline": "Տեղական",
   "tabs_bar.notifications": "Ծանուցումներ",
   "tabs_bar.search": "Փնտրել",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.days": "{number, plural, one {մնաց # օր} other {մնաց # օր}}",
   "time_remaining.hours": "{number, plural, one {# ժամ} other {# ժամ}} անց",
   "time_remaining.minutes": "{number, plural, one {# րոպե} other {# րոպե}} անց",
-  "time_remaining.moments": "Moments remaining",
+  "time_remaining.moments": "Մնացել է մի քանի վարկյան",
   "time_remaining.seconds": "{number, plural, one {# վայրկյան} other {# վայրկյան}} անց",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {հոգի} other {հոգի}} խոսում է սրա մասին",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կկորի, եթե լքես Մաստոդոնը։",
   "upload_area.title": "Քաշիր ու նետիր՝ վերբեռնելու համար",
   "upload_button.label": "Ավելացնել մեդիա",
   "upload_error.limit": "Ֆայլի վերբեռնման սահմանաչափը գերազանցված է։",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_error.poll": "Հարցումների հետ ֆայլ կցել հնարավոր չէ։",
+  "upload_form.audio_description": "Նկարագրիր ձայնագրության բովանդակությունը լսողական խնդիրներով անձանց համար",
   "upload_form.description": "Նկարագրություն ավելացրու տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.undo": "Հետարկել",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Նկարագրիր տեսանյութը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
   "upload_modal.description_placeholder": "Ճկուն շագանակագույն աղվեսը ցատկում է ծույլ շան վրայով",
   "upload_modal.detect_text": "Հայտնբերել տեքստը նկարից",
   "upload_modal.edit_media": "Խմբագրել մեդիան",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.hint": "Սեղմեք և տեղաշարժեք նախատեսքի վրայի շրջանակը ընտրելու այն կետը որը միշտ տեսանելի կլինի մանրապատկերներում։",
   "upload_modal.preview_label": "Նախադիտում ({ratio})",
   "upload_progress.label": "Վերբեռնվում է…",
   "video.close": "Փակել  տեսագրությունը",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 94f81116c..c1b47f860 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -5,7 +5,7 @@
   "account.block": "Blocca @{name}",
   "account.block_domain": "Nascondi tutto da {domain}",
   "account.blocked": "Bloccato",
-  "account.cancel_follow_request": "Annulla richiesta di seguito",
+  "account.cancel_follow_request": "Annulla richiesta di seguire",
   "account.direct": "Invia messaggio privato a @{name}",
   "account.domain_blocked": "Dominio nascosto",
   "account.edit_profile": "Modifica profilo",
@@ -36,7 +36,7 @@
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Non nascondere {domain}",
   "account.unendorse": "Non mettere in evidenza sul profilo",
-  "account.unfollow": "Non seguire",
+  "account.unfollow": "Smetti di seguire",
   "account.unmute": "Non silenziare @{name}",
   "account.unmute_notifications": "Non silenziare più le notifiche da @{name}",
   "alert.rate_limited.message": "Riprova dopo {retry_time, time, medium}.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a0254679f..5fe096d39 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
   "account.block": "@{name}さんをブロック",
-  "account.block_domain": "{domain}全体を非表示",
+  "account.block_domain": "{domain}全体をブロック",
   "account.blocked": "ブロック済み",
   "account.cancel_follow_request": "フォローリクエストを取り消す",
   "account.direct": "@{name}さんにダイレクトメッセージ",
-  "account.domain_blocked": "ドメイン非表示中",
+  "account.domain_blocked": "ドメインブロック中",
   "account.edit_profile": "プロフィール編集",
   "account.endorse": "プロフィールで紹介する",
   "account.follow": "フォロー",
@@ -34,7 +34,7 @@
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
   "account.unblock": "@{name}さんのブロックを解除",
-  "account.unblock_domain": "{domain}の非表示を解除",
+  "account.unblock_domain": "{domain}のブロックを解除",
   "account.unendorse": "プロフィールから外す",
   "account.unfollow": "フォロー解除",
   "account.unmute": "@{name}さんのミュートを解除",
@@ -57,7 +57,7 @@
   "column.community": "ローカルタイムライン",
   "column.direct": "ダイレクトメッセージ",
   "column.directory": "ディレクトリ",
-  "column.domain_blocks": "非表示にしたドメイン",
+  "column.domain_blocks": "ブロックしたドメイン",
   "column.favourites": "お気に入り",
   "column.follow_requests": "フォローリクエスト",
   "column.home": "ホーム",
@@ -105,7 +105,7 @@
   "confirmations.delete.message": "本当に削除しますか？",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
-  "confirmations.domain_block.confirm": "ドメイン全体を非表示",
+  "confirmations.domain_block.confirm": "ドメイン全体をブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
@@ -148,7 +148,7 @@
   "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
   "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
-  "empty_column.domain_blocks": "非表示にしているドメインはありません。",
+  "empty_column.domain_blocks": "ブロックしているドメインはありません。",
   "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
   "empty_column.favourites": "まだ誰もお気に入り登録していません。お気に入り登録されるとここに表示されます。",
   "empty_column.follow_requests": "まだフォローリクエストを受けていません。フォローリクエストを受けるとここに表示されます。",
@@ -258,7 +258,7 @@
   "lists.subheading": "あなたのリスト",
   "load_pending": "{count} 件の新着",
   "loading_indicator.label": "読み込み中...",
-  "media_gallery.toggle_visible": "表示切り替え",
+  "media_gallery.toggle_visible": "メディアを隠す",
   "missing_indicator.label": "見つかりません",
   "missing_indicator.sublabel": "見つかりませんでした",
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
@@ -269,7 +269,7 @@
   "navigation_bar.compose": "トゥートの新規作成",
   "navigation_bar.direct": "ダイレクトメッセージ",
   "navigation_bar.discover": "見つける",
-  "navigation_bar.domain_blocks": "非表示にしたドメイン",
+  "navigation_bar.domain_blocks": "ブロックしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -329,13 +329,13 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "メンションしたユーザーだけに公開",
+  "privacy.direct.long": "送信した相手のみ閲覧可",
   "privacy.direct.short": "ダイレクト",
-  "privacy.private.long": "フォロワーだけに公開",
+  "privacy.private.long": "フォロワーのみ閲覧可",
   "privacy.private.short": "フォロワー限定",
-  "privacy.public.long": "公開TLに投稿する",
+  "privacy.public.long": "誰でも閲覧可、公開TLに表示",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "公開TLで表示しない",
+  "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
   "refresh": "更新",
   "qr_modal.description": "QRコードを読み取って簡単にプロフィールにアクセスしましょう。",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index e78b4cc4f..8ce4c2774 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,51 +1,51 @@
 {
-  "account.add_or_remove_from_list": "Rnu neγ kkes seg tebdarin",
+  "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
   "account.badges.bot": "Aṛubut",
   "account.badges.group": "Agraw",
   "account.block": "Seḥbes @{name}",
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
   "account.blocked": "Yettuseḥbes",
-  "account.cancel_follow_request": "Sefsex asuter n weḍfaṛ",
+  "account.cancel_follow_request": "Sefsex asuter n uḍfaṛ",
   "account.direct": "Izen usrid i @{name}",
-  "account.domain_blocked": "Taγult yeffren",
-  "account.edit_profile": "Ẓreg amaγnu",
-  "account.endorse": "Welleh fell-as deg umaγnu-inek",
+  "account.domain_blocked": "Taɣult yeffren",
+  "account.edit_profile": "Ẓreg amaɣnu",
+  "account.endorse": "Welleh fell-as deg umaɣnu-inek",
   "account.follow": "Ḍfeṛ",
   "account.followers": "Imeḍfaṛen",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
-  "account.follows": "Ig ṭafaṛ",
+  "account.follows": "I yeṭṭafaṛ",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.follows_you": "Yeṭṭafaṛ-ik",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.last_status": "Armud aneggaru",
   "account.link_verified_on": "Taγara n useγwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
-  "account.media": "Allal n teywalt",
+  "account.media": "Amidya",
   "account.mention": "Bder-d @{name}",
-  "account.moved_to": "{name} ibeddel γer:",
+  "account.moved_to": "{name} ibeddel ɣer:",
   "account.mute": "Sgugem @{name}",
-  "account.mute_notifications": "Susem ilγa sγur @{name}",
+  "account.mute_notifications": "Sgugem tilɣa sγur @{name}",
   "account.muted": "Yettwasgugem",
   "account.never_active": "Werǧin",
   "account.posts": "Tijewwaqin",
   "account.posts_with_replies": "Tijewwaqin akked tririyin",
-  "account.report": "Sewɛed @{name}",
-  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit iwakken ad yefsex usuter n weḍfar",
-  "account.share": "Bḍu amaγnu n @{name}",
+  "account.report": "Cetki ɣef @{name}",
+  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Sken-d inebḍa n @{name}",
   "account.unblock": "Serreḥ i @{name}",
-  "account.unblock_domain": "Kkes tuffra i {domain}",
-  "account.unendorse": "Ur ttwellih ara fell-as deg umaγnu-inek",
+  "account.unblock_domain": "Sken-d {domain}",
+  "account.unendorse": "Ur ttwellih ara fell-as deg umaɣnu-inek",
   "account.unfollow": "Ur ṭṭafaṛ ara",
-  "account.unmute": "Kkes asgugem γef @{name}",
-  "account.unmute_notifications": "Serreḥ ilγa sγur @{name}",
-  "alert.rate_limited.message": "Ma ulac aγilif ɛreḍ tikelt-nniḍen mbeɛd {retry_time, time, medium}.",
+  "account.unmute": "Kkes asgugem ɣef @{name}",
+  "account.unmute_notifications": "Serreḥ ilɣa sɣur @{name}",
+  "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
   "alert.rate_limited.title": "Aktum s talast",
-  "alert.unexpected.message": "Tella-d tuccḍa i γef ur nedmi ara.",
+  "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
   "alert.unexpected.title": "Ayhuh!",
-  "announcement.announcement": "Ulγu",
+  "announcement.announcement": "Ulɣu",
   "autosuggest_hashtag.per_week": "{count} i yimalas",
-  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ γef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
   "bundle_column_error.body": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
   "bundle_column_error.title": "Tuccḍa deg uẓeṭṭa",
@@ -56,22 +56,22 @@
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
   "column.direct": "Iznan usriden",
-  "column.directory": "Qelleb deg imaγnuten",
-  "column.domain_blocks": "Tiγula yettwaffren",
+  "column.directory": "Inig deg imaɣnuten",
+  "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Ismenyifen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
   "column.home": "Agejdan",
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
-  "column.notifications": "Tilγa",
+  "column.notifications": "Tilɣa",
   "column.pins": "Tijewwaqin yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
-  "column_back_button.label": "Tuγalin",
-  "column_header.hide_settings": "Ffer iγewwaṛen",
-  "column_header.moveLeft_settings": "Err ajgu γer tama tazelmaḍt",
-  "column_header.moveRight_settings": "Err ajgu γer tama tayfust",
+  "column_back_button.label": "Tuɣalin",
+  "column_header.hide_settings": "Ffer iɣewwaṛen",
+  "column_header.moveLeft_settings": "Err ajgu ɣer tama tazelmaḍt",
+  "column_header.moveRight_settings": "Err ajgu ɣer tama tayfust",
   "column_header.pin": "Senteḍ",
-  "column_header.show_settings": "Sken iγewwaṛen",
+  "column_header.show_settings": "Sken iɣewwaṛen",
   "column_header.unpin": "Kkes asenteḍ",
   "column_subheading.settings": "Iγewwaṛen",
   "community.column_settings.media_only": "Allal n teywalt kan",
@@ -102,7 +102,7 @@
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebγiḍ s tidet ad tekkseḍ tasuffeγt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
-  "confirmations.delete_list.message": "Tebγiḍ s tidet ad tekkseḍ tabdert-agi i lebda?",
+  "confirmations.delete_list.message": "Tebγiḍ s tidet ad tekkseḍ umuγ-agi i lebda?",
   "confirmations.domain_block.confirm": "Ffer taγult meṛṛa",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "Ffeγ",
@@ -137,7 +137,7 @@
   "emoji_button.people": "Medden",
   "emoji_button.recent": "Wid yettuseqdacen s waṭas",
   "emoji_button.search": "Nadi…",
-  "emoji_button.search_results": "Igmaḍ u unadi",
+  "emoji_button.search_results": "Igemmaḍ n unadi",
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
   "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
@@ -153,8 +153,8 @@
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaγ γer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neγ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.home.public_timeline": "tasuddemt tazayezt n yisallen",
-  "empty_column.list": "Ar tura ur yelli kra deg tebdert-a. Ad d-yettwasken da ticki iɛeggalen n tebdert-a suffγen-d kra.",
-  "empty_column.lists": "Ulac γur-k kra n tebdert yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.list": "Ar tura ur yelli kra deg umuγ-a. Ad d-yettwasken da ticki iɛeggalen n wumuγ-a suffγen-d kra.",
+  "empty_column.lists": "Ulac γur-k kra n wumuγ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
   "empty_column.mutes": "Ulac γur-k imseqdacen i yettwasgugmen.",
   "empty_column.notifications": "Ulac γur-k tilγa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neγ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
@@ -202,58 +202,58 @@
   "introduction.interactions.reblog.headline": "Bḍu tikelt-nniḍen",
   "introduction.interactions.reblog.text": "Tzemreḍ ad tebḍuḍ tijewwaqin n medden akk d yimeḍfaṛen-ik s beṭṭu-nsent tikelt-nniḍen.",
   "introduction.interactions.reply.headline": "Err",
-  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ γef tjewwakin-ik d tid n medden-nniḍen, d acu ara tent-id-iɛeqden ta deffir ta deg yiwen udiwenni.",
+  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ γef tjewwaqin-ik·im akked tid n medden-nniḍen, aya atent-id-icudd ta deffir ta deg yiwen udiwenni.",
   "introduction.welcome.action": "Bdu!",
   "introduction.welcome.headline": "Isurifen imenza",
   "introduction.welcome.text": "Anṣuf γer fediverse! Deg kra n yimiren, ad tizmireḍ ad tzzuzreḍ iznan neγ ad tmeslayeḍ i yemddukkal deg waṭas n yiqeddacen. Maca aqeddac-agi, {domain}, mačči am wiyaḍ - deg-s i yella umaγnu-ik, ihi cfu γef yisem-is.",
   "keyboard_shortcuts.back": "uγal ar deffir",
-  "keyboard_shortcuts.blocked": "akken ad teldiḍ tabdert n yimseqdacen yettwasḥebsen",
+  "keyboard_shortcuts.blocked": "akken ad teldiḍ umuγ n yimseqdacen yettwasḥebsen",
   "keyboard_shortcuts.boost": "i beṭṭu tikelt-nniḍen",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Aglam",
   "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
-  "keyboard_shortcuts.down": "i kennu γer wadda n tebdert",
+  "keyboard_shortcuts.down": "i kennu γer wadda n wumuγ",
   "keyboard_shortcuts.enter": "i tildin n tsuffeγt",
   "keyboard_shortcuts.favourite": "akken ad ternuḍ γer yismenyifen",
-  "keyboard_shortcuts.favourites": "i tildin n tebdert n yismenyifen",
+  "keyboard_shortcuts.favourites": "i tildin umuγ n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
   "keyboard_shortcuts.hotkey": "Inegzumen",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "akken ad tsekneḍ taneffust-agi",
   "keyboard_shortcuts.local": "i tildin n tsuddemt tadigant n yisallen",
   "keyboard_shortcuts.mention": "akken ad d-bedreḍ ameskar",
-  "keyboard_shortcuts.muted": "akken ad teldiḍ tabdert n yimseqdacen yettwasgugmen",
+  "keyboard_shortcuts.muted": "akken ad teldiḍ umuγ n yimseqdacen yettwasgugmen",
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaγnu-ik",
   "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n tilγa",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "i tildin n tebdert n tjewwaqin yettwasentḍen",
+  "keyboard_shortcuts.open_media": "i taɣwalin yeldin ",
+  "keyboard_shortcuts.pinned": "akken ad teldiḍ umuγ n tjewwiqin yettwasentḍen",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaγnu n umeskar",
   "keyboard_shortcuts.reply": "i tririt",
-  "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
+  "keyboard_shortcuts.requests": "akken ad d-teldiḍ umuγ n yisuturen n teḍfeṛt",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.start": "akken ad d-teldiḍ ajgu n \"bdu\"",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "i teskent/tuffra n yimidyaten",
   "keyboard_shortcuts.toot": "i wakken attebdud tajewwaqt tamaynut",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "i tulin γer ufella n tebdert",
+  "keyboard_shortcuts.up": "i tulin γer d asawen n wumuγ",
   "lightbox.close": "Mdel",
   "lightbox.next": "Γer zdat",
   "lightbox.previous": "Γer deffir",
   "lightbox.view_context": "Ẓer amnaḍ",
-  "lists.account.add": "Rnu γer tabdart",
-  "lists.account.remove": "Kkes seg tebdart",
-  "lists.delete": "Kkes tabdert",
-  "lists.edit": "Ẓreg tabdert",
+  "lists.account.add": "Rnu γer wumuγ",
+  "lists.account.remove": "Kkes seg umuγ",
+  "lists.delete": "Kkes umuγ",
+  "lists.edit": "Ẓreg umuγ",
   "lists.edit.submit": "Beddel azwel",
-  "lists.new.create": "Rnu tabdart",
-  "lists.new.title_placeholder": "Azwel n tebdert tamaynut",
+  "lists.new.create": "Rnu umuγ",
+  "lists.new.title_placeholder": "Azwel amaynut n wumuγ",
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
-  "lists.subheading": "Tibdarin-ik·im",
+  "lists.subheading": "Umuγen-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
-  "loading_indicator.label": "Yessalay-ed…",
+  "loading_indicator.label": "Yessalay-d…",
   "media_gallery.toggle_visible": "Sken / Ffer",
   "missing_indicator.label": "Ulac-it",
   "missing_indicator.sublabel": "Ur nufi ara aγbalu-a",
@@ -271,9 +271,9 @@
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
-  "navigation_bar.info": "Γef uqeddac-a",
+  "navigation_bar.info": "Ɣef uqeddac-agi",
   "navigation_bar.keyboard_shortcuts": "Inegzumen n unasiw",
-  "navigation_bar.lists": "Tibdarin",
+  "navigation_bar.lists": "Umuγen",
   "navigation_bar.logout": "Ffeγ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.personal": "Udmawan",
@@ -326,15 +326,15 @@
   "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
   "privacy.public.short": "Azayez",
   "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
-  "privacy.unlisted.short": "War tabdert",
+  "privacy.unlisted.short": "War umuγ",
   "refresh": "Smiren",
-  "regeneration_indicator.label": "Yessalay-ed…",
+  "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
   "relative_time.days": "{number}u",
-  "relative_time.hours": "{number}a",
+  "relative_time.hours": "{number}isr",
   "relative_time.just_now": "tura",
-  "relative_time.minutes": "{number}t",
-  "relative_time.seconds": "{number}t",
+  "relative_time.minutes": "{number}tis",
+  "relative_time.seconds": "{number}tas",
   "relative_time.today": "assa",
   "reply_indicator.cancel": "Sefsex",
   "report.forward": "Bren-it γeṛ {target}",
@@ -391,13 +391,13 @@
   "status.share": "Bḍu",
   "status.show_less": "Sken-d drus",
   "status.show_less_all": "Semẓi akk tisuffγin",
-  "status.show_more": "Sken-ed ugar",
+  "status.show_more": "Sken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
-  "status.show_thread": "Sken-ed lxiḍ",
+  "status.show_thread": "Sken-d lxiḍ",
   "status.uncached_media_warning": "Ulac-it",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
   "status.unpin": "Kkes asenteḍ seg umaγnu",
-  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.dismiss": "Sefsex asumer",
   "suggestions.header": "Ahat ad tcelgeḍ deg…",
   "tabs_bar.federated_timeline": "Amatu",
   "tabs_bar.home": "Agejdan",
@@ -408,10 +408,10 @@
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
   "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}}",
+  "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {n umdan} other {n yemdanen}} i yettmeslayen",
   "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeγ-ed deg Maṣṭudun.",
+  "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "upload_area.title": "Zuḥeb rnu sers i tasalyt",
   "upload_button.label": "Rnu Taγwalt ({formats})",
   "upload_error.limit": "File upload limit exceeded.",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 5385de456..eafb7ede7 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 6d6bf2ea2..cdcce62ff 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -53,7 +53,7 @@
   "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
   "column.blocks": "차단 중인 사용자",
-  "column.bookmarks": "갈무리",
+  "column.bookmarks": "보관함",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.directory": "프로필 둘러보기",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "여긴 툿이 없어요!",
   "empty_column.account_unavailable": "프로필 사용 불가",
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
-  "empty_column.bookmarked_statuses": "아직 갈무리한 툿이 없습니다. 툿을 갈무리하면 여기에 나타납니다.",
+  "empty_column.bookmarked_statuses": "아직 보관한 툿이 없습니다. 툿을 보관하면 여기에 나타납니다.",
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
   "empty_column.domain_blocks": "아직 숨겨진 도메인이 없습니다.",
@@ -260,7 +260,7 @@
   "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
   "navigation_bar.apps": "모바일 앱",
   "navigation_bar.blocks": "차단한 사용자",
-  "navigation_bar.bookmarks": "갈무리",
+  "navigation_bar.bookmarks": "보관함",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 툿 작성",
   "navigation_bar.direct": "다이렉트 메시지",
@@ -358,7 +358,7 @@
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
   "status.block": "@{name} 차단",
-  "status.bookmark": "갈무리",
+  "status.bookmark": "보관",
   "status.cancel_reblog_private": "부스트 취소",
   "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
   "status.copy": "게시물 링크 복사",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name}님이 부스트 했습니다",
   "status.reblogs.empty": "아직 아무도 이 툿을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
-  "status.remove_bookmark": "갈무리 삭제",
+  "status.remove_bookmark": "보관한 툿 삭제",
   "status.reply": "답장",
   "status.replyAll": "전원에게 답장",
   "status.report": "신고",
@@ -398,7 +398,7 @@
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
   "suggestions.dismiss": "추천 지우기",
-  "suggestions.header": "이것에 관심이 있을 것 같습니다…",
+  "suggestions.header": "여기에 관심이 있을 것 같습니다…",
   "tabs_bar.federated_timeline": "연합",
   "tabs_bar.home": "홈",
   "tabs_bar.local_timeline": "로컬",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 5385de456..eafb7ede7 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 1b5b7cf5e..82ec3b8e8 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 4a1f736cf..ee8b13ace 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 58bb9b723..b3a06d6ed 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 8c0fed9b0..be5d9a396 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 0d23e0d2c..19f3ca257 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 5048a3a49..6589c2b1d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -2,11 +2,11 @@
   "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groep",
-  "account.block": "Blokkeer @{name}",
-  "account.block_domain": "Verberg alles van {domain}",
+  "account.block": "@{name} blokkeren",
+  "account.block_domain": "Alles van {domain} verbergen",
   "account.blocked": "Geblokkeerd",
   "account.cancel_follow_request": "Volgverzoek annuleren",
-  "account.direct": "Direct bericht @{name}",
+  "account.direct": "@{name} een direct bericht sturen",
   "account.domain_blocked": "Domein verborgen",
   "account.edit_profile": "Profiel bewerken",
   "account.endorse": "Op profiel weergeven",
@@ -21,19 +21,19 @@
   "account.link_verified_on": "Eigendom van deze link is gecontroleerd op {date}",
   "account.locked_info": "De privacystatus van dit account is op besloten gezet. De eigenaar bepaalt handmatig wie hen kan volgen.",
   "account.media": "Media",
-  "account.mention": "Vermeld @{name}",
+  "account.mention": "@{name} vermelden",
   "account.moved_to": "{name} is verhuisd naar:",
-  "account.mute": "Negeer @{name}",
-  "account.mute_notifications": "Negeer meldingen van @{name}",
+  "account.mute": "@{name} negeren",
+  "account.mute_notifications": "Meldingen van @{name} negeren",
   "account.muted": "Genegeerd",
   "account.never_active": "Nooit",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots en reacties",
-  "account.report": "Rapporteer @{name}",
+  "account.report": "@{name} rapporteren",
   "account.requested": "Wacht op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon boosts van @{name}",
-  "account.unblock": "Deblokkeer @{name}",
+  "account.unblock": "@{name} deblokkeren",
   "account.unblock_domain": "{domain} niet langer verbergen",
   "account.unendorse": "Niet op profiel weergeven",
   "account.unfollow": "Ontvolgen",
@@ -254,7 +254,7 @@
   "lists.subheading": "Jouw lijsten",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
   "loading_indicator.label": "Laden…",
-  "media_gallery.toggle_visible": "Media wel/niet tonen",
+  "media_gallery.toggle_visible": "Media verbergen",
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
@@ -323,9 +323,9 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Alleen aan volgers tonen",
   "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Op openbare tijdlijnen tonen",
+  "privacy.public.long": "Voor iedereen zichtbaar en op openbare tijdlijnen tonen",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
+  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
@@ -357,22 +357,22 @@
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_status": "Deze toot in de moderatie-omgeving openen",
-  "status.block": "Blokkeer @{name}",
+  "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.copy": "Link naar toot kopiëren",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",
-  "status.direct": "Direct bericht @{name}",
+  "status.direct": "@{name} een direct bericht sturen",
   "status.embed": "Insluiten",
   "status.favourite": "Favoriet",
   "status.filtered": "Gefilterd",
   "status.load_more": "Meer laden",
   "status.media_hidden": "Media verborgen",
-  "status.mention": "Vermeld @{name}",
+  "status.mention": "@{name} vermelden",
   "status.more": "Meer",
-  "status.mute": "Negeer @{name}",
+  "status.mute": "@{name} negeren",
   "status.mute_conversation": "Negeer gesprek",
   "status.open": "Uitgebreide toot tonen",
   "status.pin": "Aan profielpagina vastmaken",
@@ -386,7 +386,7 @@
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.reply": "Reageren",
   "status.replyAll": "Reageer op iedereen",
-  "status.report": "Rapporteer @{name}",
+  "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
   "status.show_less": "Minder tonen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 9dd48767d..39fe5158e 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "Begrensa rate",
   "alert.unexpected.message": "Eit uventa problem oppstod.",
   "alert.unexpected.title": "Oi sann!",
-  "announcement.announcement": "Kunngjøring",
+  "announcement.announcement": "Kunngjering",
   "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.body": "Noko gjekk gale mens denne komponenten vart lasta ned.",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "Varigskap for røysting",
   "compose_form.poll.option_placeholder": "Val {number}",
   "compose_form.poll.remove_option": "Ta vekk dette valet",
-  "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
-  "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.switch_to_multiple": "Endre avstemninga til å tillate fleirval",
+  "compose_form.poll.switch_to_single": "Endra avstemninga til tillate berre eitt val",
   "compose_form.publish": "Tut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "Merk medium som sensitivt",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
-  "home.hide_announcements": "Skjul kunngjøring",
-  "home.show_announcements": "Vis kunngjøring",
+  "home.hide_announcements": "Skjul kunngjeringar",
+  "home.show_announcements": "Vis kunngjeringar",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
   "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutt}}",
@@ -237,7 +237,7 @@
   "keyboard_shortcuts.toggle_hidden": "for å visa/gøyma tekst bak innhaldsvarsel",
   "keyboard_shortcuts.toggle_sensitivity": "for å visa/gøyma media",
   "keyboard_shortcuts.toot": "for å laga ein heilt ny tut",
-  "keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet",
+  "keyboard_shortcuts.unfocus": "for å fokusere vekk skrive-/søkefeltet",
   "keyboard_shortcuts.up": "for å flytta seg opp på lista",
   "lightbox.close": "Lukk att",
   "lightbox.next": "Neste",
@@ -416,11 +416,11 @@
   "upload_button.label": "Legg til medium ({formats})",
   "upload_error.limit": "Du har gått over opplastingsgrensa.",
   "upload_error.poll": "Filopplasting ikkje tillate med meiningsmålingar.",
-  "upload_form.audio_description": "Beskriv det for folk med hørselstap",
+  "upload_form.audio_description": "Grei ut for folk med nedsett høyrsel",
   "upload_form.description": "Skildr for synshemja",
   "upload_form.edit": "Rediger",
   "upload_form.undo": "Slett",
-  "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
+  "upload_form.video_description": "Greit ut for folk med nedsett høyrsel eller syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
   "upload_modal.description_placeholder": "Ein rask brun rev hoppar over den late hunden",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 024bbb9df..a019f39ee 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -65,7 +65,7 @@
   "column.mutes": "Usuários silenciados",
   "column.notifications": "Notificações",
   "column.pins": "Toots fixados",
-  "column.public": "Linha global",
+  "column.public": "Global",
   "column_back_button.label": "Voltar",
   "column_header.hide_settings": "Ocultar configurações",
   "column_header.moveLeft_settings": "Mover coluna para a esquerda",
@@ -92,7 +92,7 @@
   "compose_form.sensitive.hide": "Marcar mídia como sensível",
   "compose_form.sensitive.marked": "Mídia está marcada como sensível",
   "compose_form.sensitive.unmarked": "Mídia não está marcada como sensível",
-  "compose_form.spoiler.marked": "O texto está oculto por um aviso de conteúdo",
+  "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
   "confirmation_modal.cancel": "Cancelar",
@@ -100,7 +100,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
   "confirmations.delete.confirm": "Excluir",
-  "confirmations.delete.message": "Excluir este toot?",
+  "confirmations.delete.message": "Você tem certeza de que deseja excluir este toot?",
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.domain_block.confirm": "Bloquear domínio",
@@ -113,9 +113,9 @@
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que deseja apagar o toot e usá-lo como rascunho? Boosts e favoritos serão perdidos e as respostas ao toot original ficarão desconectadas.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder agora vai sobrescrever o toot que você está compondo. Deseja continuar?",
+  "confirmations.reply.message": "Responder agora sobrescreverá o toot que você está compondo. Deseja continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Deixar de seguir {name}?",
+  "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Nada aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Nada aqui.",
-  "empty_column.bookmarked_statuses": "Sem toots salvos. Quando você salvar alguns, eles aparecerão aqui.",
+  "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
   "empty_column.community": "A linha do tempo local está vazia. Poste algo publicamente para começar!",
   "empty_column.direct": "Nada aqui. Quando você enviar ou receber toots diretos, eles aparecerão aqui.",
   "empty_column.domain_blocks": "Nada aqui.",
@@ -185,7 +185,7 @@
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar anúncios",
-  "home.show_announcements": "Exibir anúncios",
+  "home.show_announcements": "Mostrar anúncios",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -198,7 +198,7 @@
   "introduction.federation.local.text": "Toots públicos de pessoas na mesma instância que você aparecerão na linha local.",
   "introduction.interactions.action": "Terminar o tutorial!",
   "introduction.interactions.favourite.headline": "Favoritos",
-  "introduction.interactions.favourite.text": "Ao favoritar, você salva o toot para mais tarde ou sinaliza ao autor que você gostou do toot.",
+  "introduction.interactions.favourite.text": "Ao favoritar, você sinaliza ao autor que você gostou do toot.",
   "introduction.interactions.reblog.headline": "Boost",
   "introduction.interactions.reblog.text": "Ao dar boost, você compartilha toots de outras pessoas para seus seguidores.",
   "introduction.interactions.reply.headline": "Responder",
@@ -289,14 +289,14 @@
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no seu toot",
   "notifications.clear": "Limpar notificações",
-  "notifications.clear_confirmation": "Você tem certeza de que quer limpar todas as suas notificações?",
+  "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
   "notifications.column_settings.filter_bar.show": "Mostrar",
   "notifications.column_settings.follow": "Seguidores:",
-  "notifications.column_settings.follow_request": "Novos seguidores pendentes:",
+  "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Enviar notificações",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 34acbfc9a..b8902d65e 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -17,9 +17,9 @@
   "account.follows.empty": "Este utilizador ainda não segue alguém.",
   "account.follows_you": "É teu seguidor",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
-  "account.last_status": "Última actividade",
+  "account.last_status": "Última atividade",
   "account.link_verified_on": "A posse deste link foi verificada em {date}",
-  "account.locked_info": "O estatuto de privacidade desta conta é fechado. O dono revê manualmente que a pode seguir.",
+  "account.locked_info": "O estatuto de privacidade desta conta é fechado. O dono revê manualmente quem a pode seguir.",
   "account.media": "Média",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} mudou a sua conta para:",
@@ -53,7 +53,7 @@
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
   "column.blocks": "Utilizadores Bloqueados",
-  "column.bookmarks": "Favoritos",
+  "column.bookmarks": "Marcadores",
   "column.community": "Cronologia local",
   "column.direct": "Mensagens directas",
   "column.directory": "Procurar perfis",
@@ -74,7 +74,7 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_subheading.settings": "Configurações",
-  "community.column_settings.media_only": "Somente multimédia",
+  "community.column_settings.media_only": "Somente média",
   "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
   "compose_form.direct_message_warning_learn_more": "Conhecer mais",
   "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
@@ -89,7 +89,7 @@
   "compose_form.poll.switch_to_single": "Alterar a votação para permitir uma única escolha",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marcar multimédia como sensível",
+  "compose_form.sensitive.hide": "Marcar média como sensível",
   "compose_form.sensitive.marked": "Média marcada como sensível",
   "compose_form.sensitive.unmarked": "Média não está marcada como sensível",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
@@ -124,7 +124,7 @@
   "directory.local": "Apenas de {domain}",
   "directory.new_arrivals": "Recém chegados",
   "directory.recently_active": "Com actividade recente",
-  "embed.instructions": "Publica esta publicação no teu site copiando o código abaixo.",
+  "embed.instructions": "Incorpora esta publicação no teu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
   "emoji_button.custom": "Personalizar",
@@ -143,7 +143,7 @@
   "empty_column.account_timeline": "Sem toots por aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
-  "empty_column.bookmarked_statuses": "Ainda não assinalou toots como favoritos. Quando o fizer, eles aparecerão aqui.",
+  "empty_column.bookmarked_statuses": "Ainda não adicionou nenhum toot aos Itens salvos. Quando adicionar, eles serão exibidos aqui.",
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
   "empty_column.direct": "Ainda não tens qualquer mensagem directa. Quando enviares ou receberes alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
@@ -214,7 +214,7 @@
   "keyboard_shortcuts.description": "Descrição",
   "keyboard_shortcuts.direct": "para abrir a coluna das mensagens directas",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
-  "keyboard_shortcuts.enter": "para expandir um estado",
+  "keyboard_shortcuts.enter": "para expandir uma publicação",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
   "keyboard_shortcuts.favourites": "para abrir a lista dos favoritos",
   "keyboard_shortcuts.federated": "para abrir a cronologia federada",
@@ -254,13 +254,13 @@
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
   "loading_indicator.label": "A carregar...",
-  "media_gallery.toggle_visible": "Mostrar/ocultar",
+  "media_gallery.toggle_visible": "Alternar visibilidade",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Este recurso não foi encontrado",
   "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
   "navigation_bar.apps": "Aplicações móveis",
   "navigation_bar.blocks": "Utilizadores bloqueados",
-  "navigation_bar.bookmarks": "Favoritos",
+  "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronologia local",
   "navigation_bar.compose": "Escrever novo toot",
   "navigation_bar.direct": "Mensagens directas",
@@ -281,13 +281,13 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.security": "Segurança",
-  "notification.favourite": "{name} adicionou o teu estado aos favoritos",
+  "notification.favourite": "{name} adicionou a tua publicação aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.mention": "{name} mencionou-te",
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em participaste chegou ao fim",
-  "notification.reblog": "{name} fez boost ao teu o teu estado",
+  "notification.reblog": "{name} partilhou a tua publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
   "notifications.column_settings.alert": "Notificações no computador",
@@ -318,7 +318,7 @@
   "poll.voted": "Você votou nesta resposta",
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover votação",
-  "privacy.change": "Ajustar a privacidade da mensagem",
+  "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
   "privacy.direct.short": "Directo",
   "privacy.private.long": "Apenas para os seguidores",
@@ -347,7 +347,7 @@
   "search_popout.search_format": "Formato avançado de pesquisa",
   "search_popout.tips.full_text": "Texto simples devolve publicações que tu escreveste, marcaste como favorita, partilhaste ou em que foste mencionado, tal como nomes de utilizador correspondentes, alcunhas e hashtags.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "estado",
+  "search_popout.tips.status": "publicação",
   "search_popout.tips.text": "O texto simples retorna a correspondência de nomes, utilizadores e hashtags",
   "search_popout.tips.user": "utilizador",
   "search_results.accounts": "Pessoas",
@@ -358,7 +358,7 @@
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
   "status.block": "Bloquear @{name}",
-  "status.bookmark": "Favorito",
+  "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Remover boost",
   "status.cannot_reblog": "Não é possível fazer boost a esta publicação",
   "status.copy": "Copiar o link para a publicação",
@@ -383,7 +383,7 @@
   "status.reblogged_by": "{name} fez boost",
   "status.reblogs.empty": "Ainda ninguém fez boost a este toot. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
-  "status.remove_bookmark": "Remover favorito",
+  "status.remove_bookmark": "Remover dos itens salvos",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
@@ -394,7 +394,7 @@
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
   "status.show_thread": "Mostrar conversa",
-  "status.uncached_media_warning": "Não diponível",
+  "status.uncached_media_warning": "Não disponível",
   "status.unmute_conversation": "Deixar de silenciar esta conversa",
   "status.unpin": "Não fixar no perfil",
   "suggestions.dismiss": "Dispensar a sugestão",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index f805215c1..ac88661bb 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -41,7 +41,7 @@
   "account.unmute_notifications": "Показывать уведомления от @{name}",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Вы выполняете действие слишком часто",
-  "alert.unexpected.message": "Что-то пошло не так.",
+  "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Ой!",
   "announcement.announcement": "Объявление",
   "autosuggest_hashtag.per_week": "{count} / неделю",
@@ -155,12 +155,12 @@
   "empty_column.home.public_timeline": "публичные ленты",
   "empty_column.list": "В этом списке пока ничего нет.",
   "empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
-  "empty_column.mutes": "Вы никого не игнорируете и всех внимательно выслушиваете.",
+  "empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
   "empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
   "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
   "error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
   "error.unexpected_crash.next_steps": "Попробуйте обновить страницу. Если проблема не исчезает, используйте Mastodon из-под другого браузера или приложения.",
-  "errors.unexpected_crash.copy_stacktrace": "Копировать стектрейс в буфер обмена",
+  "errors.unexpected_crash.copy_stacktrace": "Скопировать диагностическую информацию",
   "errors.unexpected_crash.report_issue": "Сообщить о проблеме",
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
@@ -197,12 +197,12 @@
   "introduction.federation.local.headline": "Локальная лента",
   "introduction.federation.local.text": "Публичные посты от людей с того же сервера, что и вы, будут отображены в локальной ленте.",
   "introduction.interactions.action": "Завершить обучение",
-  "introduction.interactions.favourite.headline": "Отметки «нравится»",
+  "introduction.interactions.favourite.headline": "Помечайте избранное",
   "introduction.interactions.favourite.text": "Дайте автору знать, что пост вам понравился и вернитесь к нему позже, добавив его в избранное.",
-  "introduction.interactions.reblog.headline": "Продвижения",
-  "introduction.interactions.reblog.text": "Вы можете делиться постами других людей, продвигая их в своей учётной записи.",
-  "introduction.interactions.reply.headline": "Ответы",
-  "introduction.interactions.reply.text": "Вы можете отвечать свои и чужие посты, образуя цепочки сообщений (обсуждения).",
+  "introduction.interactions.reblog.headline": "Продвигайте",
+  "introduction.interactions.reblog.text": "Делитесь постами других людей со своими подписчиками, продвигая их в своём профиле.",
+  "introduction.interactions.reply.headline": "Отвечайте",
+  "introduction.interactions.reply.text": "Отвечайте на свои или чужие посты, образуя цепочки сообщений — обсуждения.",
   "introduction.welcome.action": "Поехали!",
   "introduction.welcome.headline": "Первые шаги",
   "introduction.welcome.text": "Добро пожаловать в Федиверс! Уже через мгновение вы сможете отправлять сообщения и общаться со своими друзьями с любых узлов. Но этот узел — {domain} — особенный: на нём располагается ваш профиль, так что не забудьте его название.",
@@ -366,7 +366,7 @@
   "status.detailed_status": "Подробный просмотр обсуждения",
   "status.direct": "Написать @{name}",
   "status.embed": "Встроить на свой сайт",
-  "status.favourite": "Нравится",
+  "status.favourite": "В избранное",
   "status.filtered": "Отфильтровано",
   "status.load_more": "Загрузить остальное",
   "status.media_hidden": "Файл скрыт",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ad4407e9d..819496911 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -10,12 +10,12 @@
   "account.domain_blocked": "Doména ukrytá",
   "account.edit_profile": "Uprav profil",
   "account.endorse": "Zobrazuj na profile",
-  "account.follow": "Následuj",
+  "account.follow": "Nasleduj",
   "account.followers": "Sledujúci",
-  "account.followers.empty": "Tohto užívateľa ešte nikto nenásleduje.",
-  "account.follows": "Následuje",
-  "account.follows.empty": "Tento užívateľ ešte nikoho nenásleduje.",
-  "account.follows_you": "Následuje ťa",
+  "account.followers.empty": "Tohto používateľa ešte nikto nenásleduje.",
+  "account.follows": "Nasleduje",
+  "account.follows.empty": "Tento používateľ ešte nikoho nenasleduje.",
+  "account.follows_you": "Nasleduje ťa",
   "account.hide_reblogs": "Skry vyzdvihnutia od @{name}",
   "account.last_status": "Naposledy aktívny",
   "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
@@ -193,7 +193,7 @@
   "introduction.federation.federated.headline": "Federovaná",
   "introduction.federation.federated.text": "Verejné príspevky z ostatných serverov vo fediverse budú zobrazené vo federovanej časovej osi.",
   "introduction.federation.home.headline": "Domovská",
-  "introduction.federation.home.text": "Príspevky od ľudí ktorých následuješ sa zobrazia na tvojej domovskej nástenke. Môžeš následovať hocikoho na ktoromkoľvek serveri!",
+  "introduction.federation.home.text": "Príspevky od ľudí ktorých nasleduješ sa zobrazia na tvojej domovskej nástenke. Môžeš nasledovať hocikoho na ktoromkoľvek serveri!",
   "introduction.federation.local.headline": "Miestna",
   "introduction.federation.local.text": "Verejné príspevky od ľudí v rámci toho istého serveru na akom si aj ty, budú zobrazované na miestnej časovej osi.",
   "introduction.interactions.action": "Ukonči návod!",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index fbe48bf2e..b50cc611c 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -1,11 +1,11 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Додај или Одстрани са листа",
   "account.badges.bot": "Бот",
-  "account.badges.group": "Group",
+  "account.badges.group": "Група",
   "account.block": "Блокирај @{name}",
   "account.block_domain": "Сакриј све са домена {domain}",
   "account.blocked": "Блокиран",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Поништи захтеве за праћење",
   "account.direct": "Директна порука @{name}",
   "account.domain_blocked": "Домен сакривен",
   "account.edit_profile": "Измени профил",
@@ -17,16 +17,16 @@
   "account.follows.empty": "Корисник тренутно не прати никога.",
   "account.follows_you": "Прати Вас",
   "account.hide_reblogs": "Сакриј подршке које даје корисника @{name}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.last_status": "Последњи пут активан/на",
+  "account.link_verified_on": "Власништво над овом везом је проверено {date}",
+  "account.locked_info": "Статус приватности овог налога је подешен на закључано. Власник ручно прегледа ко га може пратити.",
   "account.media": "Медији",
   "account.mention": "Помени корисника @{name}",
   "account.moved_to": "{name} се померио на:",
   "account.mute": "Ућуткај корисника @{name}",
   "account.mute_notifications": "Искључи обавештења од корисника @{name}",
   "account.muted": "Ућуткан",
-  "account.never_active": "Never",
+  "account.never_active": "Никада",
   "account.posts": "Трубе",
   "account.posts_with_replies": "Трубе и одговори",
   "account.report": "Пријави @{name}",
@@ -39,12 +39,12 @@
   "account.unfollow": "Отпрати",
   "account.unmute": "Уклони ућуткавање кориснику @{name}",
   "account.unmute_notifications": "Укључи назад обавештења од корисника @{name}",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
+  "alert.rate_limited.message": "Молимо покушајте поново после {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ограничена брзина",
   "alert.unexpected.message": "Појавила се неочекивана грешка.",
   "alert.unexpected.title": "Упс!",
-  "announcement.announcement": "Announcement",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "announcement.announcement": "Најава",
+  "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.body": "Нешто је пошло по злу приликом учитавања ове компоненте.",
   "bundle_column_error.retry": "Покушајте поново",
@@ -53,10 +53,10 @@
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
   "column.blocks": "Блокирани корисници",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
-  "column.directory": "Browse profiles",
+  "column.directory": "Претражиј профиле",
   "column.domain_blocks": "Скривени домени",
   "column.favourites": "Омиљене",
   "column.follow_requests": "Захтеви за праћење",
@@ -81,22 +81,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "Шта Вам је на уму?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.add_option": "Додајте избор",
+  "compose_form.poll.duration": "Трајање анкете",
+  "compose_form.poll.option_placeholder": "Избор {number}",
+  "compose_form.poll.remove_option": "Одстрани овај избор",
+  "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
+  "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
   "compose_form.publish": "Труби",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.hide": "Означи мултимедију као осетљиву",
   "compose_form.sensitive.marked": "Медији су означени као осетљиви",
   "compose_form.sensitive.unmarked": "Медији су означени као не-осетљиви",
   "compose_form.spoiler.marked": "Текст је сакривен иза упозорења",
   "compose_form.spoiler.unmarked": "Текст није сакривен",
   "compose_form.spoiler_placeholder": "Овде упишите упозорење",
   "confirmation_modal.cancel": "Поништи",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
   "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
   "confirmations.delete.confirm": "Обриши",
@@ -105,25 +105,25 @@
   "confirmations.delete_list.message": "Да ли сте сигурни да желите да бесповратно обришете ову листу?",
   "confirmations.domain_block.confirm": "Сакриј цео домен",
   "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, неколико добро промишљених блокирања или ућуткавања су довољна и препоручљива.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.confirm": "Одјави се",
+  "confirmations.logout.message": "Да ли се сигурни да желите да се одјавите?",
   "confirmations.mute.confirm": "Ућуткај",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "Ово ће сакрити објаве од њих и објаве које их помињу, али ће им и даље дозволити да виде ваше постове и да вас запрате.",
   "confirmations.mute.message": "Да ли стварно желите да ућуткате корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете овај статус и да га преправите? Сва стављања у омиљене трубе, као и подршке ће бити изгубљене, а одговори на оригинални пост ће бити поништени.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.confirm": "Одговори",
+  "confirmations.reply.message": "Одговарањем ћете обрисати поруку коју састављате. Јесте ли сигурни да желите да наставите?",
   "confirmations.unfollow.confirm": "Отпрати",
   "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "conversation.delete": "Обриши преписку",
+  "conversation.mark_as_read": "Означи као прочитано",
+  "conversation.open": "Прикажи преписку",
+  "conversation.with": "Са {names}",
+  "directory.federated": "Са знаних здружених инстанци",
+  "directory.local": "Само са {domain}",
+  "directory.new_arrivals": "Новопридошли",
+  "directory.recently_active": "Недавно активни",
   "embed.instructions": "Угради овај статус на Ваш веб сајт копирањем кода испод.",
   "embed.preview": "Овако ће да изгледа:",
   "emoji_button.activity": "Активност",
@@ -140,10 +140,10 @@
   "emoji_button.search_results": "Резултати претраге",
   "emoji_button.symbols": "Симболи",
   "emoji_button.travel": "Путовања и места",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.account_timeline": "Овде нема труба!",
+  "empty_column.account_unavailable": "Профил недоступан",
   "empty_column.blocks": "Још увек немате блокираних корисника.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Још увек немате обележене трубе. Када их обележите, појавиће се овде.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
   "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.",
   "empty_column.domain_blocks": "Још увек нема сакривених домена.",
@@ -158,41 +158,41 @@
   "empty_column.mutes": "Још увек немате ућутканих корисника.",
   "empty_column.notifications": "Тренутно немате обавештења. Дружите се мало да започнете разговор.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно, или нађите кориснике са других инстанци које ћете запратити да попуните ову празнину",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
+  "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
+  "error.unexpected_crash.next_steps": "Покушајте да освежите страницу. Ако то не помогне, можда ћете и даље моћи да користите Мастодон путем другог прегледача или матичне апликације.",
+  "errors.unexpected_crash.copy_stacktrace": "Копирај \"stacktrace\" у клипборд",
+  "errors.unexpected_crash.report_issue": "Пријави проблем",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "getting_started.developers": "Програмери",
-  "getting_started.directory": "Profile directory",
+  "getting_started.directory": "Профил фасцикле",
   "getting_started.documentation": "Документација",
   "getting_started.heading": "Да почнете",
   "getting_started.invite": "Позовите људе",
   "getting_started.open_source_notice": "Мастoдон је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко ГитХаба на {github}.",
   "getting_started.security": "Безбедност",
   "getting_started.terms": "Услови коришћења",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "и {additional}",
+  "hashtag.column_header.tag_mode.any": "или {additional}",
+  "hashtag.column_header.tag_mode.none": "без {additional}",
+  "hashtag.column_settings.select.no_options_message": "Нису пронађени предлози",
+  "hashtag.column_settings.select.placeholder": "Унеси хештег…",
+  "hashtag.column_settings.tag_mode.all": "Све оve",
+  "hashtag.column_settings.tag_mode.any": "Било које од ових",
+  "hashtag.column_settings.tag_mode.none": "Ништа од ових",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи и подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "introduction.federation.action": "Next",
-  "introduction.federation.federated.headline": "Federated",
-  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
-  "introduction.federation.home.headline": "Home",
+  "home.hide_announcements": "Сакриј најаве",
+  "home.show_announcements": "Пријажи најаве",
+  "intervals.full.days": "{number, plural, one {# дан} other {# дана}}",
+  "intervals.full.hours": "{number, plural, one {# сат} other {# сати}}",
+  "intervals.full.minutes": "{number, plural, one {# минут} other {# минута}}",
+  "introduction.federation.action": "Даље",
+  "introduction.federation.federated.headline": "Федерисано",
+  "introduction.federation.federated.text": "Јавне објаве са осталих сервера из здружених инстанци ће се појавити у федерисаној временској линији.",
+  "introduction.federation.home.headline": "Почетна",
   "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
   "introduction.federation.local.headline": "Local",
   "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
@@ -355,13 +355,13 @@
   "search_results.statuses": "Трубе",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_account": "Отвори модераторски интерфејс за @{name}",
+  "status.admin_status": "Отвори овај статус у модераторском интерфејсу",
   "status.block": "Блокирај @{name}",
-  "status.bookmark": "Bookmark",
+  "status.bookmark": "Обележи",
   "status.cancel_reblog_private": "Уклони подршку",
   "status.cannot_reblog": "Овај статус не може да се подржи",
-  "status.copy": "Copy link to status",
+  "status.copy": "Копирај везу на статус",
   "status.delete": "Обриши",
   "status.detailed_status": "Детаљни преглед разговора",
   "status.direct": "Директна порука @{name}",
@@ -377,13 +377,13 @@
   "status.open": "Прошири овај статус",
   "status.pin": "Закачи на профил",
   "status.pinned": "Закачена труба",
-  "status.read_more": "Read more",
+  "status.read_more": "Прочитајте више",
   "status.reblog": "Подржи",
   "status.reblog_private": "Подржи да види првобитна публика",
   "status.reblogged_by": "{name} подржао/ла",
   "status.reblogs.empty": "Још увек нико није подржао ову трубу. Када буде подржана, појавиће се овде.",
   "status.redraft": "Избриши и преправи",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "Уклони обележивач",
   "status.reply": "Одговори",
   "status.replyAll": "Одговори на дискусију",
   "status.report": "Пријави корисника @{name}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 29b8b023e..763dae5ef 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Dölj notiser",
+  "home.show_announcements": "Visa notiser",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# timme} other {# timmar}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuter}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "nu",
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
-  "relative_time.today": "today",
+  "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
   "report.forward": "Vidarebefordra till {target}",
   "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 71de4beaf..479d0ab31 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -3,11 +3,11 @@
   "account.badges.bot": "บอต",
   "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
-  "account.block_domain": "ซ่อนทุกอย่างจาก {domain}",
+  "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.blocked": "ปิดกั้นอยู่",
   "account.cancel_follow_request": "ยกเลิกคำขอติดตาม",
   "account.direct": "ส่งข้อความโดยตรงถึง @{name}",
-  "account.domain_blocked": "ซ่อนโดเมนอยู่",
+  "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
   "account.edit_profile": "แก้ไขโปรไฟล์",
   "account.endorse": "แสดงให้เห็นในโปรไฟล์",
   "account.follow": "ติดตาม",
@@ -34,7 +34,7 @@
   "account.share": "แบ่งปันโปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
   "account.unblock": "เลิกปิดกั้น @{name}",
-  "account.unblock_domain": "เลิกซ่อน {domain}",
+  "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
   "account.unendorse": "ไม่แสดงให้เห็นในโปรไฟล์",
   "account.unfollow": "เลิกติดตาม",
   "account.unmute": "เลิกปิดเสียง @{name}",
@@ -54,10 +54,10 @@
   "bundle_modal_error.retry": "ลองอีกครั้ง",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "ที่คั่นหน้า",
-  "column.community": "เส้นเวลาในเว็บ",
+  "column.community": "เส้นเวลาในเซิร์ฟเวอร์",
   "column.direct": "ข้อความโดยตรง",
   "column.directory": "เรียกดูโปรไฟล์",
-  "column.domain_blocks": "โดเมนที่ซ่อนอยู่",
+  "column.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "column.favourites": "รายการโปรด",
   "column.follow_requests": "คำขอติดตาม",
   "column.home": "หน้าแรก",
@@ -103,7 +103,7 @@
   "confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบสถานะนี้?",
   "confirmations.delete_list.confirm": "ลบ",
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
-  "confirmations.domain_block.confirm": "ซ่อนทั้งโดเมน",
+  "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
   "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการปิดเสียงแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
@@ -144,9 +144,9 @@
   "empty_column.account_unavailable": "ไม่มีโปรไฟล์",
   "empty_column.blocks": "คุณยังไม่ได้ปิดกั้นผู้ใช้ใด ๆ",
   "empty_column.bookmarked_statuses": "คุณยังไม่มีโพสต์ที่เพิ่มที่คั่นหน้าไว้ใด ๆ เมื่อคุณเพิ่มที่คั่นหน้าโพสต์ โพสต์จะปรากฏที่นี่",
-  "empty_column.community": "เส้นเวลาในเว็บว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
+  "empty_column.community": "เส้นเวลาในเซิร์ฟเวอร์ว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
   "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
-  "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ซ่อนอยู่",
+  "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ปิดกั้นอยู่",
   "empty_column.favourited_statuses": "คุณยังไม่มีโพสต์ที่ชื่นชอบใด ๆ เมื่อคุณชื่นชอบโพสต์ โพสต์จะปรากฏที่นี่",
   "empty_column.favourites": "ยังไม่มีใครชื่นชอบโพสต์นี้ เมื่อใครสักคนชื่นชอบ เขาจะปรากฏที่นี่",
   "empty_column.follow_requests": "คุณยังไม่มีคำขอติดตามใด ๆ เมื่อคุณได้รับคำขอ คำขอจะปรากฏที่นี่",
@@ -194,8 +194,8 @@
   "introduction.federation.federated.text": "โพสต์สาธารณะจากเซิร์ฟเวอร์อื่น ๆ ของเฟดิเวิร์สจะปรากฏในเส้นเวลาที่ติดต่อกับภายนอก",
   "introduction.federation.home.headline": "หน้าแรก",
   "introduction.federation.home.text": "โพสต์จากผู้คนที่คุณติดตามจะปรากฏในฟีดหน้าแรกของคุณ คุณสามารถติดตามใครก็ตามในเซิร์ฟเวอร์ใดก็ตาม!",
-  "introduction.federation.local.headline": "ในเว็บ",
-  "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเว็บ",
+  "introduction.federation.local.headline": "ในเซิร์ฟเวอร์",
+  "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเซิร์ฟเวอร์",
   "introduction.interactions.action": "เสร็จสิ้นบทช่วยสอน!",
   "introduction.interactions.favourite.headline": "ชื่นชอบ",
   "introduction.interactions.favourite.text": "คุณสามารถบันทึกโพสต์ไว้ในภายหลังและแจ้งให้ผู้สร้างทราบว่าคุณชอบโพสต์โดยการชื่นชอบโพสต์",
@@ -222,7 +222,7 @@
   "keyboard_shortcuts.home": "เพื่อเปิดเส้นเวลาหน้าแรก",
   "keyboard_shortcuts.hotkey": "ปุ่มลัด",
   "keyboard_shortcuts.legend": "เพื่อแสดงคำอธิบายนี้",
-  "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเว็บ",
+  "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเซิร์ฟเวอร์",
   "keyboard_shortcuts.mention": "เพื่อกล่าวถึงผู้สร้าง",
   "keyboard_shortcuts.muted": "เพื่อเปิดรายการผู้ใช้ที่ปิดเสียงอยู่",
   "keyboard_shortcuts.my_profile": "เพื่อเปิดโปรไฟล์ของคุณ",
@@ -254,18 +254,18 @@
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด...",
-  "media_gallery.toggle_visible": "เปิด/ปิดการมองเห็น",
+  "media_gallery.toggle_visible": "ซ่อนสื่อ",
   "missing_indicator.label": "ไม่พบ",
   "missing_indicator.sublabel": "ไม่พบทรัพยากรนี้",
   "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
   "navigation_bar.apps": "แอปมือถือ",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
-  "navigation_bar.community_timeline": "เส้นเวลาในเว็บ",
+  "navigation_bar.community_timeline": "เส้นเวลาในเซิร์ฟเวอร์",
   "navigation_bar.compose": "เขียนโพสต์ใหม่",
   "navigation_bar.direct": "ข้อความโดยตรง",
   "navigation_bar.discover": "ค้นพบ",
-  "navigation_bar.domain_blocks": "โดเมนที่ซ่อนอยู่",
+  "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ปิดเสียงอยู่",
@@ -319,13 +319,13 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของสถานะ",
-  "privacy.direct.long": "โพสต์ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
+  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
   "privacy.direct.short": "โดยตรง",
-  "privacy.private.long": "โพสต์ไปยังผู้ติดตามเท่านั้น",
+  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
   "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "โพสต์ไปยังเส้นเวลาสาธารณะ",
+  "privacy.public.long": "ปรากฏแก่ทุกคน แสดงในเส้นเวลาสาธารณะ",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ไม่โพสต์ไปยังเส้นเวลาสาธารณะ",
+  "privacy.unlisted.long": "ปรากฏแก่ทุกคน แต่ไม่อยู่ในเส้นเวลาสาธารณะ",
   "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
@@ -401,7 +401,7 @@
   "suggestions.header": "คุณอาจสนใจ…",
   "tabs_bar.federated_timeline": "ที่ติดต่อกับภายนอก",
   "tabs_bar.home": "หน้าแรก",
-  "tabs_bar.local_timeline": "ในเว็บ",
+  "tabs_bar.local_timeline": "ในเซิร์ฟเวอร์",
   "tabs_bar.notifications": "การแจ้งเตือน",
   "tabs_bar.search": "ค้นหา",
   "time_remaining.days": "เหลืออีก {number, plural, other {# วัน}}",
@@ -409,7 +409,7 @@
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",
   "time_remaining.moments": "ช่วงเวลาที่เหลือ",
   "time_remaining.seconds": "เหลืออีก {number, plural, other {# วินาที}}",
-  "trends.count_by_accounts": "{count} {rawCount, plural, other {คน}}กำลังคุย",
+  "trends.count_by_accounts": "{count} {rawCount, plural, other {คน}}กำลังพูดคุย",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
   "upload_area.title": "ลากแล้วปล่อยเพื่ออัปโหลด",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 664eebfbf..d625a88bf 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -254,7 +254,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 41ecfe1f2..57658706a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -158,7 +158,7 @@
   "empty_column.mutes": "你没有隐藏任何用户。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
-  "error.unexpected_crash.explanation": "此页面无法正确现实，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
+  "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
   "error.unexpected_crash.next_steps": "刷新一下页面试试。如果没用，您可以换个浏览器或者用本地应用。",
   "errors.unexpected_crash.copy_stacktrace": "把堆栈跟踪信息复制到剪贴板",
   "errors.unexpected_crash.report_issue": "报告问题",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 12f154a2c..a321e5a66 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機械人",
-  "account.badges.group": "Group",
+  "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的一切文章",
   "account.blocked": "封鎖",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生不可預期的錯誤。",
   "alert.unexpected.title": "噢！",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "公告",
   "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，",
   "bundle_column_error.body": "加載本組件出錯。",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.option_placeholder": "第 {number} 個選擇",
   "compose_form.poll.remove_option": "移除此選擇",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
+  "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.publish": "發文",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "隱藏公告",
+  "home.show_announcements": "顯示公告",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number}分鐘",
   "relative_time.seconds": "{number}秒",
-  "relative_time.today": "today",
+  "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳戶屬於其他服務站。要向該服務站發送匿名的舉報訊息嗎？",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 56c4de066..112d5cb2f 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,7 +1,7 @@
 {
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機器人",
-  "account.badges.group": "Group",
+  "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的所有內容",
   "account.blocked": "已封鎖",
@@ -43,7 +43,7 @@
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生了非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "公告",
   "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.body": "載入此元件時發生錯誤。",
@@ -85,8 +85,8 @@
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.option_placeholder": "第 {number} 個選擇",
   "compose_form.poll.remove_option": "移除此選擇",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
+  "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.publish": "嘟出去",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
@@ -184,8 +184,8 @@
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "隱藏公告",
+  "home.show_announcements": "顯示公告",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -335,7 +335,7 @@
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number} 分",
   "relative_time.seconds": "{number} 秒",
-  "relative_time.today": "today",
+  "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳戶屬於其他站點。要像該站點發送匿名的檢舉訊息嗎?",
diff --git a/app/javascript/mastodon/middleware/errors.js b/app/javascript/mastodon/middleware/errors.js
index 3cebb42e0..0a65fd321 100644
--- a/app/javascript/mastodon/middleware/errors.js
+++ b/app/javascript/mastodon/middleware/errors.js
@@ -8,7 +8,7 @@ export default function errorsMiddleware() {
       const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
 
       if (action.type.match(isFail)) {
-        dispatch(showAlertForError(action.error));
+        dispatch(showAlertForError(action.error, action.skipNotFound));
       }
     }
 
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index c6653fe4c..e6e6d2ae1 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -261,7 +261,6 @@ export default function compose(state = initialState, action) {
     });
   case COMPOSE_SPOILERNESS_CHANGE:
     return state.withMutations(map => {
-      map.set('spoiler_text', '');
       map.set('spoiler', !state.get('spoiler'));
       map.set('idempotencyKey', uuid());
 
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 60e901e39..ed1ba0272 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -72,11 +72,11 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
 
       mutable.update(usePendingItems ? 'pendingItems' : 'items', list => {
         const lastIndex = 1 + list.findLastIndex(
-          item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id'))
+          item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id')),
         );
 
         const firstIndex = 1 + list.take(lastIndex).findLastIndex(
-          item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0
+          item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0,
         );
 
         return list.take(firstIndex).concat(items, list.skip(lastIndex));
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 0d7222e10..63b76773d 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -54,7 +54,7 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
 
         return oldIds.take(firstIndex + 1).concat(
           isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds,
-          oldIds.skip(lastIndex)
+          oldIds.skip(lastIndex),
         );
       });
     }
@@ -166,7 +166,7 @@ export default function timelines(state = initialState, action) {
     return state.update(
       action.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items)
+      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
     );
   default:
     return state;
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 6a48f3b3f..673268c5a 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -117,7 +117,7 @@ export const makeGetStatus = () => {
         map.set('account', accountBase);
         map.set('filtered', filtered);
       });
-    }
+    },
   );
 };
 
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 1ab0dc0fa..958e5fc12 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -117,7 +117,7 @@ const handlePush = (event) => {
         badge: '/badge.png',
         data: { access_token, preferred_locale, url: '/web/notifications' },
       });
-    })
+    }),
   );
 };
 
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index 7e7472841..e18af842f 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -10,6 +10,6 @@ export default function configureStore() {
     thunk,
     loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
     errorsMiddleware(),
-    soundsMiddleware()
+    soundsMiddleware(),
   ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f));
 };
diff --git a/app/javascript/mastodon/utils/log_out.js b/app/javascript/mastodon/utils/log_out.js
index b43417f4b..3a4cc8ecb 100644
--- a/app/javascript/mastodon/utils/log_out.js
+++ b/app/javascript/mastodon/utils/log_out.js
@@ -1,4 +1,4 @@
-import Rails from 'rails-ujs';
+import Rails from '@rails/ujs';
 
 export const logOut = () => {
   const form = document.createElement('form');
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index b318cadc6..51f92de8a 100644
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -1,4 +1,4 @@
-import { delegate } from 'rails-ujs';
+import { delegate } from '@rails/ujs';
 import ready from '../mastodon/ready';
 
 const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
@@ -30,6 +30,10 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
   });
 });
 
+delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
+  target.form.submit();
+});
+
 const onDomainBlockSeverityChange = (target) => {
   const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
   const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 2fb9cb29d..85789c8aa 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -25,7 +25,7 @@ window.addEventListener('message', e => {
 function main() {
   const IntlMessageFormat = require('intl-messageformat').default;
   const { timeAgoString } = require('../mastodon/components/relative_timestamp');
-  const { delegate } = require('rails-ujs');
+  const { delegate } = require('@rails/ujs');
   const emojify = require('../mastodon/features/emoji/emoji').default;
   const { getLocale } = require('../mastodon/locales');
   const { messages } = getLocale();
@@ -118,6 +118,28 @@ function main() {
 
     delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
     delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
+
+    delegate(document, '.status__content__spoiler-link', 'click', function() {
+      const contentEl = this.parentNode.parentNode.querySelector('.e-content');
+
+      if (contentEl.style.display === 'block') {
+        contentEl.style.display = 'none';
+        this.parentNode.style.marginBottom = 0;
+        this.textContent = (new IntlMessageFormat(messages['status.show_more'] || 'Show more', locale)).format();
+      } else {
+        contentEl.style.display = 'block';
+        this.parentNode.style.marginBottom = null;
+        this.textContent = (new IntlMessageFormat(messages['status.show_less'] || 'Show less', locale)).format();
+      }
+
+      return false;
+    });
+
+    [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
+      const contentEl = spoilerLink.parentNode.parentNode.querySelector('.e-content');
+      const message = (contentEl.style.display === 'block') ? (messages['status.show_less'] || 'Show less') : (messages['status.show_more'] || 'Show more');
+      spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
+    });
   });
 
   delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
@@ -128,20 +150,6 @@ function main() {
     return false;
   });
 
-  delegate(document, '.status__content__spoiler-link', 'click', function() {
-    const contentEl = this.parentNode.parentNode.querySelector('.e-content');
-
-    if (contentEl.style.display === 'block') {
-      contentEl.style.display = 'none';
-      this.parentNode.style.marginBottom = 0;
-    } else {
-      contentEl.style.display = 'block';
-      this.parentNode.style.marginBottom = null;
-    }
-
-    return false;
-  });
-
   delegate(document, '.modal-button', 'click', e => {
     e.preventDefault();
 
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 05e52966b..7a846bcc6 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -142,7 +142,7 @@ html {
 }
 
 .compose-form__autosuggest-wrapper,
-.poll__text input[type="text"],
+.poll__option input[type="text"],
 .compose-form .spoiler-input__input,
 .compose-form__poll-wrapper select,
 .search__input,
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index b0307fb71..cee44f436 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -418,6 +418,11 @@ body,
       }
     }
 
+    &--with-select strong {
+      display: block;
+      margin-bottom: 10px;
+    }
+
     a {
       display: inline-block;
       color: $darker-text-color;
@@ -551,19 +556,22 @@ body,
 }
 
 .log-entry {
-  margin-bottom: 20px;
   line-height: 20px;
+  padding: 15px 0;
+  background: $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 4%);
+
+  &:last-child {
+    border-bottom: 0;
+  }
 
   &__header {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    padding: 10px;
-    background: $ui-base-color;
     color: $darker-text-color;
-    border-radius: 4px 4px 0 0;
     font-size: 14px;
-    position: relative;
+    padding: 0 10px;
   }
 
   &__avatar {
@@ -590,44 +598,6 @@ body,
     color: $dark-text-color;
   }
 
-  &__extras {
-    background: lighten($ui-base-color, 6%);
-    border-radius: 0 0 4px 4px;
-    padding: 10px;
-    color: $darker-text-color;
-    font-family: $font-monospace, monospace;
-    font-size: 12px;
-    word-wrap: break-word;
-    min-height: 20px;
-  }
-
-  &__icon {
-    font-size: 28px;
-    margin-right: 10px;
-    color: $dark-text-color;
-  }
-
-  &__icon__overlay {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-
-    &.positive {
-      background: $success-green;
-    }
-
-    &.negative {
-      background: lighten($error-red, 12%);
-    }
-
-    &.neutral {
-      background: $ui-highlight-color;
-    }
-  }
-
   a,
   .username,
   .target {
@@ -635,18 +605,6 @@ body,
     text-decoration: none;
     font-weight: 500;
   }
-
-  .diff-old {
-    color: lighten($error-red, 12%);
-  }
-
-  .diff-neutral {
-    color: $secondary-text-color;
-  }
-
-  .diff-new {
-    color: $success-green;
-  }
 }
 
 a.name-tag,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a51781a36..82ca04fff 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -388,8 +388,8 @@
 
   .emoji-picker-dropdown {
     position: absolute;
-    top: 5px;
-    right: 5px;
+    top: 0;
+    right: 0;
   }
 
   .compose-form__autosuggest-wrapper {
@@ -889,6 +889,7 @@
 
 .announcements__item__content {
   word-wrap: break-word;
+  overflow-y: auto;
 
   .emojione {
     width: 20px;
@@ -1046,13 +1047,11 @@
     }
 
     .display-name {
+      color: $light-text-color;
+
       strong {
         color: $inverted-text-color;
       }
-
-      span {
-        color: $light-text-color;
-      }
     }
 
     .status__content {
@@ -1351,7 +1350,6 @@
     border-radius: 50%;
     overflow: hidden;
     position: relative;
-    cursor: default;
 
     & > div {
       float: left;
@@ -3805,7 +3803,8 @@ a.status-card.compact:hover {
 }
 
 .empty-column-indicator,
-.error-column {
+.error-column,
+.follow_requests-unlocked_explanation {
   color: $dark-text-color;
   background: $ui-base-color;
   text-align: center;
@@ -3836,6 +3835,11 @@ a.status-card.compact:hover {
   }
 }
 
+.follow_requests-unlocked_explanation {
+  background: darken($ui-base-color, 4%);
+  contain: initial;
+}
+
 .error-column {
   flex-direction: column;
 }
@@ -4063,10 +4067,7 @@ a.status-card.compact:hover {
 
 .emoji-button {
   display: block;
-  font-size: 24px;
-  line-height: 24px;
-  margin-left: 2px;
-  width: 24px;
+  padding: 5px 5px 2px 2px;
   outline: 0;
   cursor: pointer;
 
@@ -4082,7 +4083,6 @@ a.status-card.compact:hover {
     margin: 0;
     width: 22px;
     height: 22px;
-    margin-top: 2px;
   }
 
   &:hover,
@@ -5061,12 +5061,6 @@ a.status-card.compact:hover {
 }
 
 .media-gallery__gifv {
-  &.autoplay {
-    .media-gallery__gifv__label {
-      display: none;
-    }
-  }
-
   &:hover {
     .media-gallery__gifv__label {
       opacity: 1;
@@ -6583,6 +6577,7 @@ noscript {
     padding: 10px;
     padding-top: 12px;
     position: relative;
+    cursor: pointer;
   }
 
   &__unread {
@@ -6686,17 +6681,21 @@ noscript {
     box-sizing: border-box;
     width: 100%;
     padding: 15px;
-    padding-right: 15px + 18px;
     position: relative;
     font-size: 15px;
     line-height: 20px;
     word-wrap: break-word;
     font-weight: 400;
+    max-height: 50vh;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     &__range {
       display: block;
       font-weight: 500;
       margin-bottom: 10px;
+      padding-right: 18px;
     }
 
     &__unread {
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index d7d850a1e..1ecc8434d 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -8,20 +8,18 @@
   }
 
   &__chart {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    display: inline-block;
     border-radius: 4px;
-    background: darken($ui-primary-color, 14%);
+    display: block;
+    background: darken($ui-primary-color, 5%);
+    height: 5px;
+    min-width: 1%;
 
     &.leading {
       background: $ui-highlight-color;
     }
   }
 
-  &__text {
+  &__option {
     position: relative;
     display: flex;
     padding: 6px 0;
@@ -29,6 +27,13 @@
     cursor: default;
     overflow: hidden;
 
+    &__text {
+      display: inline-block;
+      word-wrap: break-word;
+      overflow-wrap: break-word;
+      max-width: calc(100% - 45px - 25px);
+    }
+
     input[type=radio],
     input[type=checkbox] {
       display: none;
@@ -95,8 +100,8 @@
     &:active,
     &:focus,
     &:hover {
+      border-color: lighten($valid-value-color, 15%);
       border-width: 4px;
-      background: none;
     }
 
     &::-moz-focus-inner {
@@ -112,19 +117,18 @@
 
   &__number {
     display: inline-block;
-    width: 52px;
+    width: 45px;
     font-weight: 700;
-    padding: 0 10px;
-    padding-left: 8px;
-    text-align: right;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 52px;
+    flex: 0 0 45px;
   }
 
-  &__vote__mark {
-    float: left;
-    line-height: 18px;
+  &__voted {
+    padding: 0 5px;
+    display: inline-block;
+
+    &__mark {
+      font-size: 18px;
+    }
   }
 
   &__footer {
@@ -199,7 +203,7 @@
     display: flex;
     align-items: center;
 
-    .poll__text {
+    .poll__option {
       flex: 0 0 auto;
       width: calc(100% - (23px + 6px));
       margin-right: 6px;
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index ed680d762..1523f86d4 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -15,6 +15,8 @@ class ActivityPub::TagManager
   def url_for(target)
     return target.url if target.respond_to?(:local?) && !target.local?
 
+    return unless target.respond_to?(:object_type)
+
     case target.object_type
     when :person
       target.instance_actor? ? about_more_url(instance_actor: true) : short_account_url(target)
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 35a3773d2..afdbd70f2 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -7,6 +7,10 @@ class EntityCache
 
   MAX_EXPIRATION = 7.days.freeze
 
+  def status(url)
+    Rails.cache.fetch(to_key(:status, url), expires_in: MAX_EXPIRATION) { FetchRemoteStatusService.new.call(url) }
+  end
+
   def mention(username, domain)
     Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:id, :username, :domain, :url).find_remote(username, domain) }
   end
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 01346bfe5..3362576b0 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -8,6 +8,7 @@ module Mastodon
   class LengthValidationError < ValidationError; end
   class DimensionsValidationError < ValidationError; end
   class RaceConditionError < Error; end
+  class RateLimitExceededError < Error; end
 
   class UnexpectedResponseError < Error
     def initialize(response = nil)
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
index 302072bcc..05a06726d 100644
--- a/app/lib/language_detector.rb
+++ b/app/lib/language_detector.rb
@@ -52,8 +52,10 @@ class LanguageDetector
 
   def detect_language_code(text)
     return if unreliable_input?(text)
+
     result = @identifier.find_language(text)
-    iso6391(result.language.to_s).to_sym if result.reliable?
+
+    iso6391(result.language.to_s).to_sym if result&.reliable?
   end
 
   def iso6391(bcp47)
diff --git a/app/lib/rate_limiter.rb b/app/lib/rate_limiter.rb
new file mode 100644
index 000000000..0e2c9a894
--- /dev/null
+++ b/app/lib/rate_limiter.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+class RateLimiter
+  include Redisable
+
+  FAMILIES = {
+    follows: {
+      limit: 400,
+      period: 24.hours.freeze,
+    }.freeze,
+
+    statuses: {
+      limit: 300,
+      period: 3.hours.freeze,
+    }.freeze,
+
+    reports: {
+      limit: 400,
+      period: 24.hours.freeze,
+    }.freeze,
+  }.freeze
+
+  def initialize(by, options = {})
+    @by     = by
+    @family = options[:family]
+    @limit  = FAMILIES[@family][:limit]
+    @period = FAMILIES[@family][:period].to_i
+  end
+
+  def record!
+    count = redis.get(key)
+
+    if count.nil?
+      redis.set(key, 0)
+      redis.expire(key, (@period - (last_epoch_time % @period) + 1).to_i)
+    end
+
+    raise Mastodon::RateLimitExceededError if count.present? && count.to_i >= @limit
+
+    redis.incr(key)
+  end
+
+  def rollback!
+    redis.decr(key)
+  end
+
+  def to_headers(now = Time.now.utc)
+    {
+      'X-RateLimit-Limit' => @limit.to_s,
+      'X-RateLimit-Remaining' => (@limit - (redis.get(key) || 0).to_i).to_s,
+      'X-RateLimit-Reset' => (now + (@period - now.to_i % @period)).iso8601(6),
+    }
+  end
+
+  private
+
+  def key
+    @key ||= "rate_limit:#{@by.id}:#{@family}:#{(last_epoch_time / @period).to_i}"
+  end
+
+  def last_epoch_time
+    @last_epoch_time ||= Time.now.to_i
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 0eb719d65..6aceb809c 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -46,6 +46,7 @@
 #  silenced_at             :datetime
 #  suspended_at            :datetime
 #  trust_level             :integer
+#  hide_collections        :boolean
 #
 
 class Account < ApplicationRecord
@@ -102,6 +103,7 @@ class Account < ApplicationRecord
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).left_outer_joins(:account_stat) }
   scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
   scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc, accounts.id desc')) }
+  scope :by_recent_sign_in, -> { order(Arel.sql('(case when users.current_sign_in_at is null then 1 else 0 end) asc, users.current_sign_in_at desc, accounts.id desc')) }
   scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
@@ -322,6 +324,14 @@ class Account < ApplicationRecord
     save!
   end
 
+  def hides_followers?
+    hide_collections? || user_hides_network?
+  end
+
+  def hides_following?
+    hide_collections? || user_hides_network?
+  end
+
   def object_type
     :person
   end
@@ -478,7 +488,16 @@ class Account < ApplicationRecord
     def from_text(text)
       return [] if text.blank?
 
-      text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map { |(username, domain)| EntityCache.instance.mention(username, domain) }
+      text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map do |(username, domain)|
+        domain = begin
+          if TagManager.instance.local_domain?(domain)
+            nil
+          else
+            TagManager.instance.normalize_domain(domain)
+          end
+        end
+        EntityCache.instance.mention(username, domain)
+      end.compact
     end
 
     private
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index c7bf07787..7b6012e0f 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -14,6 +14,7 @@ class AccountFilter
     email
     ip
     staff
+    order
   ).freeze
 
   attr_reader :params
@@ -24,7 +25,7 @@ class AccountFilter
   end
 
   def results
-    scope = Account.recent.includes(:user)
+    scope = Account.includes(:user).reorder(nil)
 
     params.each do |key, value|
       scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
@@ -38,6 +39,7 @@ class AccountFilter
   def set_defaults!
     params['local']  = '1' if params['remote'].blank?
     params['active'] = '1' if params['suspended'].blank? && params['silenced'].blank? && params['pending'].blank?
+    params['order']  = 'recent' if params['order'].blank?
   end
 
   def scope_for(key, value)
@@ -51,9 +53,9 @@ class AccountFilter
     when 'active'
       Account.without_suspended
     when 'pending'
-      accounts_with_users.merge User.pending
+      accounts_with_users.merge(User.pending)
     when 'disabled'
-      accounts_with_users.merge User.disabled
+      accounts_with_users.merge(User.disabled)
     when 'silenced'
       Account.silenced
     when 'suspended'
@@ -63,16 +65,31 @@ class AccountFilter
     when 'display_name'
       Account.matches_display_name(value)
     when 'email'
-      accounts_with_users.merge User.matches_email(value)
+      accounts_with_users.merge(User.matches_email(value))
     when 'ip'
       valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value)) : Account.none
     when 'staff'
-      accounts_with_users.merge User.staff
+      accounts_with_users.merge(User.staff)
+    when 'order'
+      order_scope(value)
     else
       raise "Unknown filter: #{key}"
     end
   end
 
+  def order_scope(value)
+    case value
+    when 'active'
+      params['remote'] ? Account.joins(:account_stat).by_recent_status : Account.joins(:user).by_recent_sign_in
+    when 'recent'
+      Account.recent
+    when 'alphabetic'
+      Account.alphabetic
+    else
+      raise "Unknown order: #{value}"
+    end
+  end
+
   def accounts_with_users
     Account.joins(:user)
   end
diff --git a/app/models/account_warning_preset.rb b/app/models/account_warning_preset.rb
index ba8ceabb3..c20f683cf 100644
--- a/app/models/account_warning_preset.rb
+++ b/app/models/account_warning_preset.rb
@@ -8,8 +8,11 @@
 #  text       :text             default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  title      :string           default(""), not null
 #
 
 class AccountWarningPreset < ApplicationRecord
   validates :text, presence: true
+
+  scope :alphabetic, -> { order(title: :asc, text: :asc) }
 end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index e9da003a3..b30a82369 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -62,8 +62,6 @@ class Admin::AccountAction
 
   def process_action!
     case type
-    when 'none'
-      handle_resolve!
     when 'disable'
       handle_disable!
     when 'silence'
@@ -105,16 +103,6 @@ class Admin::AccountAction
     end
   end
 
-  def handle_resolve!
-    if with_report? && report.account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
-      # This is an automated report and it is being dismissed, so it's
-      # a false positive, in which case update the account's trust level
-      # to prevent further spam checks
-
-      target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
-    end
-  end
-
   def handle_disable!
     authorize(target_account.user, :disable?)
     log_action(:disable, target_account.user)
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
new file mode 100644
index 000000000..0ba7e1609
--- /dev/null
+++ b/app/models/admin/action_log_filter.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+class Admin::ActionLogFilter
+  KEYS = %i(
+    action_type
+    account_id
+    target_account_id
+  ).freeze
+
+  ACTION_TYPE_MAP = {
+    assigned_to_self_report: { target_type: 'Report', action: 'assigned_to_self' }.freeze,
+    change_email_user: { target_type: 'User', action: 'change_email' }.freeze,
+    confirm_user: { target_type: 'User', action: 'confirm' }.freeze,
+    create_account_warning: { target_type: 'AccountWarning', action: 'create' }.freeze,
+    create_announcement: { target_type: 'Announcement', action: 'create' }.freeze,
+    create_custom_emoji: { target_type: 'CustomEmoji', action: 'create' }.freeze,
+    create_domain_allow: { target_type: 'DomainAllow', action: 'create' }.freeze,
+    create_domain_block: { target_type: 'DomainBlock', action: 'create' }.freeze,
+    create_email_domain_block: { target_type: 'EmailDomainBlock', action: 'create' }.freeze,
+    demote_user: { target_type: 'User', action: 'demote' }.freeze,
+    destroy_announcement: { target_type: 'Announcement', action: 'destroy' }.freeze,
+    destroy_custom_emoji: { target_type: 'CustomEmoji', action: 'destroy' }.freeze,
+    destroy_domain_allow: { target_type: 'DomainAllow', action: 'destroy' }.freeze,
+    destroy_domain_block: { target_type: 'DomainBlock', action: 'destroy' }.freeze,
+    destroy_email_domain_block: { target_type: 'EmailDomainBlock', action: 'destroy' }.freeze,
+    destroy_status: { target_type: 'Status', action: 'destroy' }.freeze,
+    disable_2fa_user: { target_type: 'User', action: 'disable' }.freeze,
+    disable_custom_emoji: { target_type: 'CustomEmoji', action: 'disable' }.freeze,
+    disable_user: { target_type: 'User', action: 'disable' }.freeze,
+    enable_custom_emoji: { target_type: 'CustomEmoji', action: 'enable' }.freeze,
+    enable_user: { target_type: 'User', action: 'enable' }.freeze,
+    memorialize_account: { target_type: 'Account', action: 'memorialize' }.freeze,
+    promote_user: { target_type: 'User', action: 'promote' }.freeze,
+    remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze,
+    reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
+    reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze,
+    resolve_report: { target_type: 'Report', action: 'resolve' }.freeze,
+    silence_account: { target_type: 'Account', action: 'silence' }.freeze,
+    suspend_account: { target_type: 'Account', action: 'suspend' }.freeze,
+    unassigned_report: { target_type: 'Report', action: 'unassigned' }.freeze,
+    unsilence_account: { target_type: 'Account', action: 'unsilence' }.freeze,
+    unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
+    update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
+    update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
+    update_status: { target_type: 'Status', action: 'update' }.freeze,
+  }.freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Admin::ActionLog.includes(:target)
+
+    params.each do |key, value|
+      next if key.to_s == 'page'
+
+      scope.merge!(scope_for(key.to_s, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key
+    when 'action_type'
+      Admin::ActionLog.where(ACTION_TYPE_MAP[value.to_sym])
+    when 'account_id'
+      Admin::ActionLog.where(account_id: value)
+    when 'target_account_id'
+      account = Account.find(value)
+      Admin::ActionLog.where(target: [account, account.user].compact)
+    else
+      raise "Unknown filter: #{key}"
+    end
+  end
+end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index d99502f44..a4e427b49 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -14,6 +14,7 @@
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  published_at :datetime
+#  status_ids   :bigint           is an Array
 #
 
 class Announcement < ApplicationRecord
@@ -48,6 +49,16 @@ class Announcement < ApplicationRecord
     @mentions ||= Account.from_text(text)
   end
 
+  def statuses
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.where(id: status_ids, visibility: [:public, :unlisted])
+      end
+    end
+  end
+
   def tags
     @tags ||= Tag.find_or_create_by_names(Extractor.extract_hashtags(text))
   end
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 14bcf7bb1..32fcb5397 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -87,10 +87,10 @@ module AccountInteractions
     has_many :announcement_mutes, dependent: :destroy
   end
 
-  def follow!(other_account, reblogs: nil, uri: nil)
+  def follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
     reblogs = true if reblogs.nil?
 
-    rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri)
+    rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
                               .find_or_create_by!(target_account: other_account)
 
     rel.update!(show_reblogs: reblogs)
@@ -99,6 +99,18 @@ module AccountInteractions
     rel
   end
 
+  def request_follow!(other_account, reblogs: nil, uri: nil, rate_limit: false)
+    reblogs = true if reblogs.nil?
+
+    rel = follow_requests.create_with(show_reblogs: reblogs, uri: uri, rate_limit: rate_limit)
+                         .find_or_create_by!(target_account: other_account)
+
+    rel.update!(show_reblogs: reblogs)
+    remove_potential_friendship(other_account)
+
+    rel
+  end
+
   def block!(other_account, uri: nil)
     remove_potential_friendship(other_account)
     block_relationships.create_with(uri: uri)
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 43ff8ac12..18b872c1e 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -74,7 +74,7 @@ module Attachmentable
     self.class.attachment_definitions.each_key do |attachment_name|
       attachment = send(attachment_name)
 
-      next if attachment.blank? || attachment.queued_for_write[:original].blank?
+      next if attachment.blank? || attachment.queued_for_write[:original].blank? || attachment.options[:preserve_files]
 
       attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name))
     end
diff --git a/app/models/concerns/rate_limitable.rb b/app/models/concerns/rate_limitable.rb
new file mode 100644
index 000000000..ad1b5e44e
--- /dev/null
+++ b/app/models/concerns/rate_limitable.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RateLimitable
+  extend ActiveSupport::Concern
+
+  def rate_limit=(value)
+    @rate_limit = value
+  end
+
+  def rate_limit?
+    @rate_limit
+  end
+
+  def rate_limiter(by, options = {})
+    return @rate_limiter if defined?(@rate_limiter)
+
+    @rate_limiter = RateLimiter.new(by, options)
+  end
+
+  class_methods do
+    def rate_limit(options = {})
+      after_create do
+        by = public_send(options[:by])
+
+        if rate_limit? && by&.local?
+          rate_limiter(by, options).record!
+          @rate_limit_recorded = true
+        end
+      end
+
+      after_rollback do
+        rate_limiter(public_send(options[:by]), options).rollback! if @rate_limit_recorded
+      end
+    end
+  end
+end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index bc70dea25..f50fa46ba 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -7,13 +7,27 @@
 #  domain     :string           default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  parent_id  :bigint(8)
 #
 
 class EmailDomainBlock < ApplicationRecord
   include DomainNormalizable
 
+  belongs_to :parent, class_name: 'EmailDomainBlock', optional: true
+  has_many :children, class_name: 'EmailDomainBlock', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+
   validates :domain, presence: true, uniqueness: true, domain: true
 
+  def with_dns_records=(val)
+    @with_dns_records = ActiveModel::Type::Boolean.new.cast(val)
+  end
+
+  def with_dns_records?
+    @with_dns_records
+  end
+
+  alias with_dns_records with_dns_records?
+
   def self.block?(email)
     _, domain = email.split('@', 2)
 
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 87fa11425..f3e48a2ed 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -15,6 +15,9 @@
 class Follow < ApplicationRecord
   include Paginable
   include RelationshipCacheable
+  include RateLimitable
+
+  rate_limit by: :account, family: :follows
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 96ac7eaa5..3325e264c 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -15,6 +15,9 @@
 class FollowRequest < ApplicationRecord
   include Paginable
   include RelationshipCacheable
+  include RateLimitable
+
+  rate_limit by: :account, family: :follows
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 42364641f..f45e2c9f7 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -19,12 +19,14 @@
 #  description         :text
 #  scheduled_status_id :bigint(8)
 #  blurhash            :string
+#  processing          :integer
 #
 
 class MediaAttachment < ApplicationRecord
   self.inheritance_column = nil
 
   enum type: [:image, :gifv, :video, :unknown, :audio]
+  enum processing: [:queued, :in_progress, :complete, :failed], _prefix: true
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
@@ -55,47 +57,6 @@ class MediaAttachment < ApplicationRecord
     },
   }.freeze
 
-  VIDEO_STYLES = {
-    small: {
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          vf: 'scale=\'min(400\, iw):min(400\, ih)\':force_original_aspect_ratio=decrease',
-        },
-      },
-      format: 'png',
-      time: 0,
-      file_geometry_parser: FastGeometryParser,
-      blurhash: BLURHASH_OPTIONS,
-    },
-
-    original: {
-      keep_same_format: true,
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          'map_metadata' => '-1',
-          'c:v' => 'copy',
-          'c:a' => 'copy',
-        },
-      },
-    },
-  }.freeze
-
-  AUDIO_STYLES = {
-    original: {
-      format: 'mp3',
-      content_type: 'audio/mpeg',
-      convert_options: {
-        output: {
-          'loglevel' => 'fatal',
-          'map_metadata' => '-1',
-          'q:a' => 2,
-        },
-      },
-    },
-  }.freeze
-
   VIDEO_FORMAT = {
     format: 'mp4',
     content_type: 'video/mp4',
@@ -116,6 +77,54 @@ class MediaAttachment < ApplicationRecord
     },
   }.freeze
 
+  VIDEO_PASSTHROUGH_OPTIONS = {
+    video_codecs: ['h264'],
+    audio_codecs: ['aac', nil],
+    colorspaces: ['yuv420p'],
+    options: {
+      format: 'mp4',
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          'map_metadata' => '-1',
+          'c:v' => 'copy',
+          'c:a' => 'copy',
+        },
+      },
+    },
+  }.freeze
+
+  VIDEO_STYLES = {
+    small: {
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          vf: 'scale=\'min(400\, iw):min(400\, ih)\':force_original_aspect_ratio=decrease',
+        },
+      },
+      format: 'png',
+      time: 0,
+      file_geometry_parser: FastGeometryParser,
+      blurhash: BLURHASH_OPTIONS,
+    },
+
+    original: VIDEO_FORMAT.merge(passthrough_options: VIDEO_PASSTHROUGH_OPTIONS),
+  }.freeze
+
+  AUDIO_STYLES = {
+    original: {
+      format: 'mp3',
+      content_type: 'audio/mpeg',
+      convert_options: {
+        output: {
+          'loglevel' => 'fatal',
+          'map_metadata' => '-1',
+          'q:a' => 2,
+        },
+      },
+    },
+  }.freeze
+
   VIDEO_CONVERTED_STYLES = {
     small: VIDEO_STYLES[:small],
     original: VIDEO_FORMAT,
@@ -124,6 +133,9 @@ class MediaAttachment < ApplicationRecord
   IMAGE_LIMIT = 10.megabytes
   VIDEO_LIMIT = 40.megabytes
 
+  MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
+  MAX_VIDEO_FRAME_RATE   = 60
+
   belongs_to :account,          inverse_of: :media_attachments, optional: true
   belongs_to :status,           inverse_of: :media_attachments, optional: true
   belongs_to :scheduled_status, inverse_of: :media_attachments, optional: true
@@ -156,6 +168,10 @@ class MediaAttachment < ApplicationRecord
     remote_url.blank?
   end
 
+  def not_processed?
+    processing.present? && !processing_complete?
+  end
+
   def needs_redownload?
     file.blank? && remote_url.present?
   end
@@ -168,18 +184,6 @@ class MediaAttachment < ApplicationRecord
     audio? || video?
   end
 
-  def variant?(other_file_name)
-    return true if file_file_name == other_file_name
-
-    formats = file.styles.values.map(&:format).compact
-
-    return false if formats.empty?
-
-    extension = File.extname(other_file_name)
-
-    formats.include?(extension.delete('.')) && File.basename(other_file_name, extension) == File.basename(file_file_name, File.extname(file_file_name))
-  end
-
   def to_param
     shortcode
   end
@@ -202,12 +206,21 @@ class MediaAttachment < ApplicationRecord
     "#{x},#{y}"
   end
 
+  attr_writer :delay_processing
+
+  def delay_processing?
+    @delay_processing
+  end
+
+  after_commit :enqueue_processing, on: :create
   after_commit :reset_parent_cache, on: :update
 
   before_create :prepare_description, unless: :local?
   before_create :set_shortcode
+  before_create :set_processing
 
   before_post_process :set_type_and_extension
+  before_post_process :check_video_dimensions
 
   before_save :set_meta
 
@@ -276,6 +289,21 @@ class MediaAttachment < ApplicationRecord
     end
   end
 
+  def set_processing
+    self.processing = delay_processing? ? :queued : :complete
+  end
+
+  def check_video_dimensions
+    return unless (video? || gifv?) && file.queued_for_write[:original].present?
+
+    movie = FFMPEG::Movie.new(file.queued_for_write[:original].path)
+
+    return unless movie.valid?
+
+    raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT
+    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE
+  end
+
   def set_meta
     meta = populate_meta
 
@@ -321,9 +349,11 @@ class MediaAttachment < ApplicationRecord
     }.compact
   end
 
-  def reset_parent_cache
-    return if status_id.nil?
+  def enqueue_processing
+    PostProcessMediaWorker.perform_async(id) if delay_processing?
+  end
 
-    Rails.cache.delete("statuses/#{status_id}")
+  def reset_parent_cache
+    Rails.cache.delete("statuses/#{status_id}") if status_id.present?
   end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
index fb2e040ee..f31bcfd2e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -18,6 +18,9 @@
 
 class Report < ApplicationRecord
   include Paginable
+  include RateLimitable
+
+  rate_limit by: :account, family: :reports
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
@@ -59,6 +62,14 @@ class Report < ApplicationRecord
   end
 
   def resolve!(acting_account)
+    if account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
+      # This is an automated report and it is being dismissed, so it's
+      # a false positive, in which case update the account's trust level
+      # to prevent further spam checks
+
+      target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
+    end
+
     RemovalWorker.push_bulk(Status.with_discarded.discarded.where(id: status_ids).pluck(:id)) { |status_id| [status_id, { immediate: true }] }
     update!(action_taken: true, action_taken_by_account_id: acting_account.id)
   end
diff --git a/app/models/status.rb b/app/models/status.rb
index 1e630196b..fef4e2596 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -32,6 +32,9 @@ class Status < ApplicationRecord
   include Paginable
   include Cacheable
   include StatusThreadingConcern
+  include RateLimitable
+
+  rate_limit by: :account, family: :statuses
 
   self.discard_column = :deleted_at
 
@@ -139,10 +142,12 @@ class Status < ApplicationRecord
       ids += mentions.where(account: Account.local).pluck(:account_id)
       ids += favourites.where(account: Account.local).pluck(:account_id)
       ids += reblogs.where(account: Account.local).pluck(:account_id)
+      ids += bookmarks.where(account: Account.local).pluck(:account_id)
     else
       ids += preloaded.mentions[id] || []
       ids += preloaded.favourites[id] || []
       ids += preloaded.reblogs[id] || []
+      ids += preloaded.bookmarks[id] || []
     end
 
     ids.uniq
@@ -366,6 +371,21 @@ class Status < ApplicationRecord
       end
     end
 
+    def from_text(text)
+      return [] if text.blank?
+
+      text.scan(FetchLinkCardService::URL_PATTERN).map(&:first).uniq.map do |url|
+        status = begin
+          if TagManager.instance.local_url?(url)
+            ActivityPub::TagManager.instance.uri_to_resource(url, Status)
+          else
+            EntityCache.instance.status(url)
+          end
+        end
+        status&.distributable? ? status : nil
+      end.compact
+    end
+
     private
 
     def timeline_scope(local_only = false)
diff --git a/app/policies/settings_policy.rb b/app/policies/settings_policy.rb
index 2dcb79f51..874f97bab 100644
--- a/app/policies/settings_policy.rb
+++ b/app/policies/settings_policy.rb
@@ -8,4 +8,8 @@ class SettingsPolicy < ApplicationPolicy
   def show?
     admin?
   end
+
+  def destroy?
+    admin?
+  end
 end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index f27feb669..9343b97d2 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -7,6 +7,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   attribute :read, if: :current_user?
 
   has_many :mentions
+  has_many :statuses
   has_many :tags, serializer: REST::StatusSerializer::TagSerializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
   has_many :reactions, serializer: REST::ReactionSerializer
@@ -46,4 +47,16 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
       object.pretty_acct
     end
   end
+
+  class StatusSerializer < ActiveModel::Serializer
+    attributes :id, :url
+
+    def id
+      object.id.to_s
+    end
+
+    def url
+      ActivityPub::TagManager.instance.url_for(object)
+    end
+  end
 end
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index 1b3498ea4..cc10e3001 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -12,7 +12,9 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   end
 
   def url
-    if object.needs_redownload?
+    if object.not_processed?
+      nil
+    elsif object.needs_redownload?
       media_proxy_url(object.id, :original)
     else
       full_asset_url(object.file.url(:original))
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index d217dabb3..493813aab 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -171,7 +171,7 @@ class AccountSearchService < BaseService
   end
 
   def username_complete?
-    query.include?('@') && "@#{query}" =~ Account::MENTION_RE
+    query.include?('@') && "@#{query}" =~ /\A#{Account::MENTION_RE}\Z/
   end
 
   def likely_acct?
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index d5ede0388..7b4c53d50 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -94,6 +94,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.statuses_count    = outbox_total_items    if outbox_total_items.present?
     @account.following_count   = following_total_items if following_total_items.present?
     @account.followers_count   = followers_total_items if followers_total_items.present?
+    @account.hide_collections  = following_private? || followers_private?
     @account.moved_to_account  = @json['movedTo'].present? ? moved_account : nil
   end
 
@@ -166,26 +167,36 @@ class ActivityPub::ProcessAccountService < BaseService
   end
 
   def outbox_total_items
-    collection_total_items('outbox')
+    collection_info('outbox').first
   end
 
   def following_total_items
-    collection_total_items('following')
+    collection_info('following').first
   end
 
   def followers_total_items
-    collection_total_items('followers')
+    collection_info('followers').first
   end
 
-  def collection_total_items(type)
-    return if @json[type].blank?
+  def following_private?
+    !collection_info('following').last
+  end
+
+  def followers_private?
+    !collection_info('followers').last
+  end
+
+  def collection_info(type)
+    return [nil, nil] if @json[type].blank?
     return @collections[type] if @collections.key?(type)
 
     collection = fetch_resource_without_id_validation(@json[type])
 
-    @collections[type] = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
+    total_items = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil
+    has_first_page = collection.is_a?(Hash) && collection['first'].present?
+    @collections[type] = [total_items, has_first_page]
   rescue HTTP::Error, OpenSSL::SSL::SSLError
-    @collections[type] = nil
+    @collections[type] = [nil, nil]
   end
 
   def moved_account
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index abe7766d4..880cdde92 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -5,6 +5,8 @@ class FetchResourceService < BaseService
 
   ACCEPT_HEADER = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", text/html;q=0.1'
 
+  attr_reader :response_code
+
   def call(url)
     return if url.blank?
 
@@ -27,6 +29,7 @@ class FetchResourceService < BaseService
   end
 
   def process_response(response, terminal = false)
+    @response_code = response.code
     return nil if response.code != 200
 
     if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 4d19002c4..311ae7fa6 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -7,54 +7,68 @@ class FollowService < BaseService
   # Follow a remote user, notify remote user about the follow
   # @param [Account] source_account From which to follow
   # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
-  # @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
-  def call(source_account, target_account, reblogs: nil, bypass_locked: false)
-    reblogs = true if reblogs.nil?
-    target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
+  # @param [Hash] options
+  # @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
+  # @option [Boolean] :bypass_locked
+  # @option [Boolean] :with_rate_limit
+  def call(source_account, target_account, options = {})
+    @source_account = source_account
+    @target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
+    @options        = { reblogs: true, bypass_locked: false, with_rate_limit: false }.merge(options)
 
-    raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
-    raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || (!target_account.local? && target_account.ostatus?) || source_account.domain_blocking?(target_account.domain)
+    raise ActiveRecord::RecordNotFound if following_not_possible?
+    raise Mastodon::NotPermittedError  if following_not_allowed?
 
-    if source_account.following?(target_account)
-      # We're already following this account, but we'll call follow! again to
-      # make sure the reblogs status is set correctly.
-      return source_account.follow!(target_account, reblogs: reblogs)
-    elsif source_account.requested?(target_account)
-      # This isn't managed by a method in AccountInteractions, so we modify it
-      # ourselves if necessary.
-      req = source_account.follow_requests.find_by(target_account: target_account)
-      req.update!(show_reblogs: reblogs)
-      return req
+    if @source_account.following?(@target_account)
+      return change_follow_options!
+    elsif @source_account.requested?(@target_account)
+      return change_follow_request_options!
     end
 
     ActivityTracker.increment('activity:interactions')
 
-    if (target_account.locked? && !bypass_locked) || source_account.silenced? || target_account.activitypub?
-      request_follow(source_account, target_account, reblogs: reblogs)
-    elsif target_account.local?
-      direct_follow(source_account, target_account, reblogs: reblogs)
+    if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub?
+      request_follow!
+    elsif @target_account.local?
+      direct_follow!
     end
   end
 
   private
 
-  def request_follow(source_account, target_account, reblogs: true)
-    follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs)
+  def following_not_possible?
+    @target_account.nil? || @target_account.id == @source_account.id || @target_account.suspended?
+  end
 
-    if target_account.local?
-      LocalNotificationWorker.perform_async(target_account.id, follow_request.id, follow_request.class.name)
-    elsif target_account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), source_account.id, target_account.inbox_url)
+  def following_not_allowed?
+    @target_account.blocking?(@source_account) || @source_account.blocking?(@target_account) || @target_account.moved? || (!@target_account.local? && @target_account.ostatus?) || @source_account.domain_blocking?(@target_account.domain)
+  end
+
+  def change_follow_options!
+    @source_account.follow!(@target_account, reblogs: @options[:reblogs])
+  end
+
+  def change_follow_request_options!
+    @source_account.request_follow!(@target_account, reblogs: @options[:reblogs])
+  end
+
+  def request_follow!
+    follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
+
+    if @target_account.local?
+      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name)
+    elsif @target_account.activitypub?
+      ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
     end
 
     follow_request
   end
 
-  def direct_follow(source_account, target_account, reblogs: true)
-    follow = source_account.follow!(target_account, reblogs: reblogs)
+  def direct_follow!
+    follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], rate_limit: @options[:with_rate_limit])
 
-    LocalNotificationWorker.perform_async(target_account.id, follow.id, follow.class.name)
-    MergeWorker.perform_async(target_account.id, source_account.id)
+    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name)
+    MergeWorker.perform_async(@target_account.id, @source_account.id)
 
     follow
   end
diff --git a/app/services/import_service.rb b/app/services/import_service.rb
index 4ee431ea3..c0d741d57 100644
--- a/app/services/import_service.rb
+++ b/app/services/import_service.rb
@@ -64,7 +64,8 @@ class ImportService < BaseService
   end
 
   def import_relationships!(action, undo_action, overwrite_scope, limit, extra_fields = {})
-    items = @data.take(limit).map { |row| [row['Account address']&.strip, Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
+    local_domain_suffix = "@#{Rails.configuration.x.local_domain}"
+    items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), Hash[extra_fields.map { |key, header| [key, row[header]&.strip] }]] }.reject { |(id, _)| id.blank? }
 
     if @import.overwrite?
       presence_hash = items.each_with_object({}) { |(id, extra), mapping| mapping[id] = [true, extra] }
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index a0a650d62..0a383d6a3 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -19,6 +19,7 @@ class PostStatusService < BaseService
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @option [Doorkeeper::Application] :application
   # @option [String] :idempotency Optional idempotency key
+  # @option [Boolean] :with_rate_limit
   # @return [Status]
   def call(account, options = {})
     @account     = account
@@ -47,9 +48,10 @@ class PostStatusService < BaseService
   private
 
   def preprocess_attributes!
+    @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
-    @visibility   = :unlisted if @visibility == :public && @account.silenced?
+    @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
   rescue ArgumentError
@@ -100,6 +102,7 @@ class PostStatusService < BaseService
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
   end
 
   def language_from_option(str)
@@ -155,11 +158,12 @@ class PostStatusService < BaseService
       media_attachments: @media || [],
       thread: @in_reply_to,
       poll_attributes: poll_attributes,
-      sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
+      sensitive: @sensitive,
       spoiler_text: @options[:spoiler_text] || '',
       visibility: @visibility,
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
+      rate_limit: @options[:with_rate_limit],
     }.compact
   end
 
@@ -179,10 +183,11 @@ class PostStatusService < BaseService
 
   def scheduled_options
     @options.tap do |options_hash|
-      options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
-      options_hash[:application_id] = options_hash.delete(:application)&.id
-      options_hash[:scheduled_at]   = nil
-      options_hash[:idempotency]    = nil
+      options_hash[:in_reply_to_id]  = options_hash.delete(:thread)&.id
+      options_hash[:application_id]  = options_hash.delete(:application)&.id
+      options_hash[:scheduled_at]    = nil
+      options_hash[:idempotency]     = nil
+      options_hash[:with_rate_limit] = false
     end
   end
 end
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 3bb460fca..4b5ae9492 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -8,6 +8,8 @@ class ReblogService < BaseService
   # @param [Account] account Account to reblog from
   # @param [Status] reblogged_status Status to be reblogged
   # @param [Hash] options
+  # @option [String]  :visibility
+  # @option [Boolean] :with_rate_limit
   # @return [Status]
   def call(account, reblogged_status, options = {})
     reblogged_status = reblogged_status.reblog if reblogged_status.reblog?
@@ -18,9 +20,15 @@ class ReblogService < BaseService
 
     return reblog unless reblog.nil?
 
-    visibility = options[:visibility] || account.user&.setting_default_privacy
-    visibility = reblogged_status.visibility if reblogged_status.hidden?
-    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility)
+    visibility = begin
+      if reblogged_status.hidden?
+        reblogged_status.visibility
+      else
+        options[:visibility] || account.user&.setting_default_privacy
+      end
+    end
+
+    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility, rate_limit: options[:with_rate_limit])
 
     DistributionWorker.perform_async(reblog.id)
     ActivityPub::DistributionWorker.perform_async(reblog.id)
@@ -45,7 +53,9 @@ class ReblogService < BaseService
 
   def bump_potential_friendship(account, reblog)
     ActivityTracker.increment('activity:interactions')
+
     return if account.following?(reblog.reblog.account_id)
+
     PotentialFriendshipTracker.record(account.id, reblog.reblog.account_id, :reblog)
   end
 
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index 1a2b0d60c..78080d878 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -12,7 +12,7 @@ class ResolveURLService < BaseService
       process_local_url
     elsif !fetched_resource.nil?
       process_url
-    elsif @on_behalf_of.present?
+    else
       process_url_from_db
     end
   end
@@ -30,6 +30,8 @@ class ResolveURLService < BaseService
   end
 
   def process_url_from_db
+    return unless @on_behalf_of.present? && [401, 403, 404].include?(fetch_resource_service.response_code)
+
     # It may happen that the resource is a private toot, and thus not fetchable,
     # but we can return the toot if we already know about it.
     status = Status.find_by(uri: @url) || Status.find_by(url: @url)
@@ -40,7 +42,11 @@ class ResolveURLService < BaseService
   end
 
   def fetched_resource
-    @fetched_resource ||= FetchResourceService.new.call(@url)
+    @fetched_resource ||= fetch_resource_service.call(@url)
+  end
+
+  def fetch_resource_service
+    @_fetch_resource_service ||= FetchResourceService.new
   end
 
   def resource_url
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 090fd409b..830de4de3 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -10,10 +10,10 @@ class SearchService < BaseService
     @resolve = options[:resolve] || false
 
     default_results.tap do |results|
-      next if @query.blank?
+      next if @query.blank? || @limit.zero?
 
       if url_query?
-        results.merge!(url_resource_results) unless url_resource.nil? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
+        results.merge!(url_resource_results) unless url_resource.nil? || @offset.positive? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
       elsif @query.present?
         results[:accounts] = perform_accounts_search! if account_searchable?
         results[:statuses] = perform_statuses_search! if full_text_searchable?
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb
index 9d7321cad..a32727796 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_validator.rb
@@ -2,7 +2,7 @@
 
 class PollValidator < ActiveModel::Validator
   MAX_OPTIONS      = 4
-  MAX_OPTION_CHARS = 25
+  MAX_OPTION_CHARS = 50
   MAX_EXPIRATION   = 1.month.freeze
   MIN_EXPIRATION   = 5.minutes.freeze
 
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 20fbeef33..aa88b1448 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -21,7 +21,7 @@
 
     - unless @warning_presets.empty?
       .fields-group
-        = f.input :warning_preset_id, collection: @warning_presets, label_method: :text, wrapper: :with_block_label
+        = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
 
     .fields-group
       = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index b057d3e42..44b10af6e 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -11,6 +11,8 @@
   %td
     - if account.user_current_sign_in_at
       %time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
+    - elsif account.last_status_at.present?
+      %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at
     - else
       \-
   %td
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 3a85324c9..7592161c9 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -19,6 +19,12 @@
     %ul
       %li= filter_link_to t('admin.accounts.moderation.all'), staff: nil
       %li= filter_link_to t('admin.accounts.roles.staff'), staff: '1'
+  .filter-subset
+    %strong= t 'generic.order_by'
+    %ul
+      %li= filter_link_to t('relationships.most_recent'), order: nil
+      %li= filter_link_to t('admin.accounts.username'), order: 'alphabetic'
+      %li= filter_link_to t('relationships.last_active'), order: 'active'
 
 = form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
   .fields-group
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index a30b78db2..965fd6fb6 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -53,7 +53,7 @@
       .dashboard__counters__num= number_with_delimiter @account.targeted_reports.count
       .dashboard__counters__label= t '.targeted_reports'
   %div
-    %div
+    = link_to admin_action_logs_path(target_account_id: @account.id) do
       .dashboard__counters__text
         - if @account.local? && @account.user.nil?
           %span.neutral= t('admin.accounts.deleted')
@@ -96,10 +96,17 @@
               = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user)
 
           %tr
-            %th= t('admin.accounts.email')
-            %td= @account.user_email
+            %th{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= t('admin.accounts.email')
+            %td{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= @account.user_email
             %td= table_link_to 'edit', t('admin.accounts.change_email.label'), admin_account_change_email_path(@account.id) if can?(:change_email, @account.user)
 
+          %tr
+            %td= table_link_to 'search', t('admin.accounts.search_same_email_domain'), admin_accounts_path(email: "%@#{@account.user_email.split('@').last}")
+
+          - if can?(:create, :email_domain_block)
+            %tr
+              %td= table_link_to 'ban', t('admin.accounts.add_email_domain_block'), new_admin_email_domain_block_path(_domain: @account.user_email.split('@').last)
+
           - if @account.user_unconfirmed_email.present?
             %tr
               %th= t('admin.accounts.unconfirmed_email')
@@ -204,7 +211,7 @@
         = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account)
 
       - unless @account.local?
-        - if DomainBlock.where(domain: @account.domain).exists?
+        - if DomainBlock.rule_for(@account.domain)
           = link_to t('admin.domain_blocks.view'), admin_instance_path(@account.domain), class: 'button'
         - else
           = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive'
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml
index a545e189e..59905f341 100644
--- a/app/views/admin/action_logs/_action_log.html.haml
+++ b/app/views/admin/action_logs/_action_log.html.haml
@@ -7,9 +7,3 @@
         = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe
       .log-entry__timestamp
         %time.formatted{ datetime: action_log.created_at.iso8601 }
-    .spacer
-    .log-entry__icon
-      = fa_icon icon_for_log(action_log)
-      .log-entry__icon__overlay{ class: class_for_log_icon(action_log) }
-  .log-entry__extras
-    = log_extra_attributes relevant_log_changes(action_log)
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index a4d3871a9..99f756762 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -1,6 +1,28 @@
 - content_for :page_title do
   = t('admin.action_logs.title')
 
-= render @action_logs
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
+= form_tag admin_action_logs_url, method: 'GET', class: 'simple_form' do
+  = hidden_field_tag :target_account_id, params[:target_account_id] if params[:target_account_id].present?
+
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.action_logs.filter_by_user')
+      .input.select.optional
+        = select_tag :account_id, options_from_collection_for_select(Account.joins(:user).merge(User.staff), :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
+
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.action_logs.filter_by_action')
+      .input.select.optional
+        = select_tag :action_type, options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key]}, params[:action_type]), prompt: I18n.t('admin.accounts.moderation.all')
+
+- if @action_logs.empty?
+  %div.muted-hint.center-text
+    = t 'admin.action_logs.empty'
+- else
+  .announcements-list
+    = render @action_logs
 
 = paginate @action_logs
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
index bf66c9001..41ab8c171 100644
--- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
+++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
@@ -3,3 +3,13 @@
     %samp= email_domain_block.domain
   %td
     = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(email_domain_block), method: :delete
+
+- email_domain_block.children.each do |child_email_domain_block|
+  %tr
+    %td
+      %samp= child_email_domain_block.domain
+      %span.muted-hint
+        = surround '(', ')' do
+          = t('admin.email_domain_blocks.from_html', domain: content_tag(:samp, email_domain_block.domain))
+    %td
+      = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(child_email_domain_block), method: :delete
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index f372fa512..4a346f240 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -5,7 +5,10 @@
   = render 'shared/error_messages', object: @email_domain_block
 
   .fields-group
-    = f.input :domain, wrapper: :with_label, label: t('admin.email_domain_blocks.domain')
+    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain')
+
+  .fields-group
+    = f.input :with_dns_records, as: :boolean, wrapper: :with_label
 
   .actions
     = f.button :button, t('.create'), type: :submit
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index d7b493051..f37775aa9 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -4,7 +4,10 @@
 - content_for :page_title do
   = t('admin.settings.title')
 
-= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
+  - content_for :heading_actions do
+    = button_tag t('generic.save_changes'), class: 'button', form: 'edit_admin'
+
+= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch, id: 'edit_admin' } do |f|
   = render 'shared/error_messages', object: @admin_settings
 
   .fields-group
@@ -30,13 +33,13 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: t('admin.settings.thumbnail.desc_html')
+      = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: site_upload_delete_hint(t('admin.settings.thumbnail.desc_html'), :thumbnail)
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: t('admin.settings.hero.desc_html')
+      = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: site_upload_delete_hint(t('admin.settings.hero.desc_html'), :hero)
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: t('admin.settings.mascot.desc_html')
+      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: site_upload_delete_hint(t('admin.settings.mascot.desc_html'), :mascot)
 
   %hr.spacer/
 
diff --git a/app/views/admin/warning_presets/_warning_preset.html.haml b/app/views/admin/warning_presets/_warning_preset.html.haml
new file mode 100644
index 000000000..a58199c80
--- /dev/null
+++ b/app/views/admin/warning_presets/_warning_preset.html.haml
@@ -0,0 +1,10 @@
+.announcements-list__item
+  = link_to edit_admin_warning_preset_path(warning_preset), class: 'announcements-list__item__title' do
+    = warning_preset.title.presence || truncate(warning_preset.text)
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      = truncate(warning_preset.text)
+
+    %div
+      = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
index 9522746cd..b5c5107ef 100644
--- a/app/views/admin/warning_presets/edit.html.haml
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -4,6 +4,9 @@
 = simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
   = render 'shared/error_messages', object: @warning_preset
 
+  .fields-group
+    = f.input :title, wrapper: :with_block_label
+
   .fields-group
     = f.input :text, wrapper: :with_block_label
 
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
index 45913ef73..dbc23fa30 100644
--- a/app/views/admin/warning_presets/index.html.haml
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -5,6 +5,9 @@
   = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
     = render 'shared/error_messages', object: @warning_preset
 
+    .fields-group
+      = f.input :title, wrapper: :with_block_label
+
     .fields-group
       = f.input :text, wrapper: :with_block_label
 
@@ -13,18 +16,9 @@
 
   %hr.spacer/
 
-- unless @warning_presets.empty?
-  .table-wrapper
-    %table.table
-      %thead
-        %tr
-          %th= t('simple_form.labels.account_warning_preset.text')
-          %th
-      %tbody
-        - @warning_presets.each do |preset|
-          %tr
-            %td
-              = Formatter.instance.linkify(preset.text)
-            %td
-              = table_link_to 'pencil', t('admin.warning_presets.edit'), edit_admin_warning_preset_path(preset)
-              = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+- if @warning_presets.empty?
+  %div.muted-hint.center-text
+    = t 'admin.warning_presets.empty'
+- else
+  .announcements-list
+    = render partial: 'warning_preset', collection: @warning_presets
diff --git a/app/views/errors/429.html.haml b/app/views/errors/429.html.haml
new file mode 100644
index 000000000..2df4f4175
--- /dev/null
+++ b/app/views/errors/429.html.haml
@@ -0,0 +1,5 @@
+- content_for :page_title do
+  = t('errors.429')
+
+- content_for :content do
+  = t('errors.429')
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index d2b05513e..acddf7884 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.appearance')
 
-= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
+
+= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
       = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index a496be21b..d7cc1ed5d 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.notifications')
 
-= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
+
+= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
   = render 'shared/error_messages', object: current_user
 
   %h4= t 'notifications.email_events'
@@ -32,6 +35,3 @@
       = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label
-
-  .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index db7d806bc..539a70056 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.preferences')
 
-= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
   = render 'shared/error_messages', object: current_user
 
   .fields-group
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 6929f54f3..c55ab7b90 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -1,7 +1,10 @@
 - content_for :page_title do
   = t('settings.edit_profile')
 
-= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_profile'
+
+= simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
   = render 'shared/error_messages', object: @account
 
   .fields-row
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
index d1aba6ef9..c17476657 100644
--- a/app/views/statuses/_poll.html.haml
+++ b/app/views/statuses/_poll.html.haml
@@ -8,16 +8,16 @@
       %li
         - if show_results
           - percent = total_votes_count > 0 ? 100 * option.votes_count / total_votes_count : 0
-          %span.poll__chart{ style: "width: #{percent}%" }
-
-          %label.poll__text><
+          %label.poll__option><
             %span.poll__number><
               - if own_votes.include?(index)
-                %i.poll__vote__mark.fa.fa-check
+                %i.poll__voted__mark.fa.fa-check
               = percent.round
             = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+
+            %span.poll__chart{ style: "width: #{percent}%" }
         - else
-          %label.poll__text><
+          %label.poll__option><
             %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
             = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
   .poll__footer
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb
index 1e87fa4bf..25dee4ee2 100644
--- a/app/workers/activitypub/distribute_poll_update_worker.rb
+++ b/app/workers/activitypub/distribute_poll_update_worker.rb
@@ -4,7 +4,7 @@ class ActivityPub::DistributePollUpdateWorker
   include Sidekiq::Worker
   include Payloadable
 
-  sidekiq_options queue: 'push', unique: :until_executed, retry: 0
+  sidekiq_options queue: 'push', lock: :until_executed, retry: 0
 
   def perform(status_id)
     @status  = Status.find(status_id)
diff --git a/app/workers/activitypub/synchronize_featured_collection_worker.rb b/app/workers/activitypub/synchronize_featured_collection_worker.rb
index 7b16d3426..7a0898e89 100644
--- a/app/workers/activitypub/synchronize_featured_collection_worker.rb
+++ b/app/workers/activitypub/synchronize_featured_collection_worker.rb
@@ -3,7 +3,7 @@
 class ActivityPub::SynchronizeFeaturedCollectionWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', unique: :until_executed
+  sidekiq_options queue: 'pull', lock: :until_executed
 
   def perform(account_id)
     ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id))
diff --git a/app/workers/after_remote_follow_request_worker.rb b/app/workers/after_remote_follow_request_worker.rb
deleted file mode 100644
index ce9c65834..000000000
--- a/app/workers/after_remote_follow_request_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AfterRemoteFollowRequestWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull', retry: 5
-
-  def perform(follow_request_id); end
-end
diff --git a/app/workers/after_remote_follow_worker.rb b/app/workers/after_remote_follow_worker.rb
deleted file mode 100644
index d9719f2bf..000000000
--- a/app/workers/after_remote_follow_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AfterRemoteFollowWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull', retry: 5
-
-  def perform(follow_id); end
-end
diff --git a/app/workers/backup_worker.rb b/app/workers/backup_worker.rb
index e4c609d70..7b0b52844 100644
--- a/app/workers/backup_worker.rb
+++ b/app/workers/backup_worker.rb
@@ -9,8 +9,12 @@ class BackupWorker
     backup_id = msg['args'].first
 
     ActiveRecord::Base.connection_pool.with_connection do
-      backup = Backup.find(backup_id)
-      backup&.destroy
+      begin
+        backup = Backup.find(backup_id)
+        backup.destroy
+      rescue ActiveRecord::RecordNotFound
+        true
+      end
     end
   end
 
diff --git a/app/workers/notification_worker.rb b/app/workers/notification_worker.rb
deleted file mode 100644
index 1c0f001cf..000000000
--- a/app/workers/notification_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class NotificationWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 5
-
-  def perform(xml, source_account_id, target_account_id); end
-end
diff --git a/app/workers/poll_expiration_notify_worker.rb b/app/workers/poll_expiration_notify_worker.rb
index e08f0c249..64b4cbd7e 100644
--- a/app/workers/poll_expiration_notify_worker.rb
+++ b/app/workers/poll_expiration_notify_worker.rb
@@ -3,7 +3,7 @@
 class PollExpirationNotifyWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(poll_id)
     poll = Poll.find(poll_id)
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb
new file mode 100644
index 000000000..d3ebda194
--- /dev/null
+++ b/app/workers/post_process_media_worker.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class PostProcessMediaWorker
+  include Sidekiq::Worker
+
+  sidekiq_options retry: 1, dead: false
+
+  sidekiq_retries_exhausted do |msg|
+    media_attachment_id = msg['args'].first
+
+    ActiveRecord::Base.connection_pool.with_connection do
+      begin
+        media_attachment = MediaAttachment.find(media_attachment_id)
+        media_attachment.processing = :failed
+        media_attachment.save
+      rescue ActiveRecord::RecordNotFound
+        true
+      end
+    end
+
+    Sidekiq.logger.error("Processing media attachment #{media_attachment_id} failed with #{msg['error_message']}")
+  end
+
+  def perform(media_attachment_id)
+    media_attachment = MediaAttachment.find(media_attachment_id)
+    media_attachment.processing = :in_progress
+    media_attachment.save
+    media_attachment.file.reprocess_original!
+    media_attachment.processing = :complete
+    media_attachment.save
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb
deleted file mode 100644
index cf3bd8397..000000000
--- a/app/workers/processing_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ProcessingWorker
-  include Sidekiq::Worker
-
-  sidekiq_options backtrace: true
-
-  def perform(account_id, body); end
-end
diff --git a/app/workers/publish_scheduled_announcement_worker.rb b/app/workers/publish_scheduled_announcement_worker.rb
index efca39d3d..1392efed0 100644
--- a/app/workers/publish_scheduled_announcement_worker.rb
+++ b/app/workers/publish_scheduled_announcement_worker.rb
@@ -5,15 +5,24 @@ class PublishScheduledAnnouncementWorker
   include Redisable
 
   def perform(announcement_id)
-    announcement = Announcement.find(announcement_id)
+    @announcement = Announcement.find(announcement_id)
 
-    announcement.publish! unless announcement.published?
+    refresh_status_ids!
 
-    payload = InlineRenderer.render(announcement, nil, :announcement)
+    @announcement.publish! unless @announcement.published?
+
+    payload = InlineRenderer.render(@announcement, nil, :announcement)
     payload = Oj.dump(event: :announcement, payload: payload)
 
     FeedManager.instance.with_active_accounts do |account|
       redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
     end
   end
+
+  private
+
+  def refresh_status_ids!
+    @announcement.status_ids = Status.from_text(@announcement.text).map(&:id)
+    @announcement.save
+  end
 end
diff --git a/app/workers/publish_scheduled_status_worker.rb b/app/workers/publish_scheduled_status_worker.rb
index 850610c4e..ce42f7be7 100644
--- a/app/workers/publish_scheduled_status_worker.rb
+++ b/app/workers/publish_scheduled_status_worker.rb
@@ -3,7 +3,7 @@
 class PublishScheduledStatusWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(scheduled_status_id)
     scheduled_status = ScheduledStatus.find(scheduled_status_id)
diff --git a/app/workers/pubsubhubbub/confirmation_worker.rb b/app/workers/pubsubhubbub/confirmation_worker.rb
deleted file mode 100644
index 783a8c95f..000000000
--- a/app/workers/pubsubhubbub/confirmation_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::ConfirmationWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: false
-
-  def perform(subscription_id, mode, secret = nil, lease_seconds = nil); end
-end
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
deleted file mode 100644
index 1260060bd..000000000
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::DeliveryWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 3, dead: false
-
-  def perform(subscription_id, payload); end
-end
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
deleted file mode 100644
index 75bac5d6f..000000000
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::DistributionWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push'
-
-  def perform(stream_entry_ids); end
-end
diff --git a/app/workers/pubsubhubbub/raw_distribution_worker.rb b/app/workers/pubsubhubbub/raw_distribution_worker.rb
deleted file mode 100644
index ece9c80ac..000000000
--- a/app/workers/pubsubhubbub/raw_distribution_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::RawDistributionWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push'
-
-  def perform(xml, source_account_id); end
-end
diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb
deleted file mode 100644
index b861b5e67..000000000
--- a/app/workers/pubsubhubbub/subscribe_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::SubscribeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: 10, unique: :until_executed, dead: false
-
-  def perform(account_id); end
-end
diff --git a/app/workers/pubsubhubbub/unsubscribe_worker.rb b/app/workers/pubsubhubbub/unsubscribe_worker.rb
deleted file mode 100644
index 0c1c263f6..000000000
--- a/app/workers/pubsubhubbub/unsubscribe_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Pubsubhubbub::UnsubscribeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'push', retry: false, unique: :until_executed, dead: false
-
-  def perform(account_id); end
-end
diff --git a/app/workers/regeneration_worker.rb b/app/workers/regeneration_worker.rb
index 5c6a040bd..5c13c894f 100644
--- a/app/workers/regeneration_worker.rb
+++ b/app/workers/regeneration_worker.rb
@@ -3,7 +3,7 @@
 class RegenerationWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
+  sidekiq_options lock: :until_executed
 
   def perform(account_id, _ = :home)
     account = Account.find(account_id)
diff --git a/app/workers/remote_profile_update_worker.rb b/app/workers/remote_profile_update_worker.rb
deleted file mode 100644
index 01e8daf8f..000000000
--- a/app/workers/remote_profile_update_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class RemoteProfileUpdateWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull'
-
-  def perform(account_id, body, resubscribe); end
-end
diff --git a/app/workers/resolve_account_worker.rb b/app/workers/resolve_account_worker.rb
index cd7c4d7dd..2b5be6d1b 100644
--- a/app/workers/resolve_account_worker.rb
+++ b/app/workers/resolve_account_worker.rb
@@ -3,7 +3,7 @@
 class ResolveAccountWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', unique: :until_executed
+  sidekiq_options queue: 'pull', lock: :until_executed
 
   def perform(uri)
     ResolveAccountService.new.call(uri)
diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb
deleted file mode 100644
index 10200b06c..000000000
--- a/app/workers/salmon_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class SalmonWorker
-  include Sidekiq::Worker
-
-  sidekiq_options backtrace: true
-
-  def perform(account_id, body); end
-end
diff --git a/app/workers/scheduler/backup_cleanup_scheduler.rb b/app/workers/scheduler/backup_cleanup_scheduler.rb
index d43660699..d69ca2556 100644
--- a/app/workers/scheduler/backup_cleanup_scheduler.rb
+++ b/app/workers/scheduler/backup_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::BackupCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     old_backups.reorder(nil).find_each(&:destroy!)
diff --git a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
index e5e5f6bc4..94788a85b 100644
--- a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
+++ b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::DoorkeeperCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
diff --git a/app/workers/scheduler/email_scheduler.rb b/app/workers/scheduler/email_scheduler.rb
index 1eeeee412..9a7355524 100644
--- a/app/workers/scheduler/email_scheduler.rb
+++ b/app/workers/scheduler/email_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::EmailScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   FREQUENCY      = 7.days.freeze
   SIGN_IN_OFFSET = 1.day.freeze
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb
index bf5e20757..458fe6193 100644
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@@ -4,7 +4,7 @@ class Scheduler::FeedCleanupScheduler
   include Sidekiq::Worker
   include Redisable
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     clean_home_feeds!
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 4f44078d8..6d38b52a2 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -5,7 +5,7 @@ class Scheduler::IpCleanupScheduler
 
   RETENTION_PERIOD = 1.year
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     time_ago = RETENTION_PERIOD.ago
diff --git a/app/workers/scheduler/media_cleanup_scheduler.rb b/app/workers/scheduler/media_cleanup_scheduler.rb
index fb01aa70c..671ebf6e0 100644
--- a/app/workers/scheduler/media_cleanup_scheduler.rb
+++ b/app/workers/scheduler/media_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::MediaCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     unattached_media.find_each(&:destroy)
diff --git a/app/workers/scheduler/pghero_scheduler.rb b/app/workers/scheduler/pghero_scheduler.rb
index 4453bf2cd..cf5570048 100644
--- a/app/workers/scheduler/pghero_scheduler.rb
+++ b/app/workers/scheduler/pghero_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::PgheroScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     PgHero.capture_space_stats
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index 9cfe949de..25df3c07d 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::ScheduledStatusesScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     publish_scheduled_statuses!
diff --git a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb b/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
deleted file mode 100644
index 75fe681a9..000000000
--- a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::SubscriptionsCleanupScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options unique: :until_executed, retry: 0
-
-  def perform; end
-end
diff --git a/app/workers/scheduler/subscriptions_scheduler.rb b/app/workers/scheduler/subscriptions_scheduler.rb
deleted file mode 100644
index 6903cadc7..000000000
--- a/app/workers/scheduler/subscriptions_scheduler.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::SubscriptionsScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options unique: :until_executed, retry: 0
-
-  def perform; end
-end
diff --git a/app/workers/scheduler/trending_tags_scheduler.rb b/app/workers/scheduler/trending_tags_scheduler.rb
index 77f0d5747..e9891424e 100644
--- a/app/workers/scheduler/trending_tags_scheduler.rb
+++ b/app/workers/scheduler/trending_tags_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::TrendingTagsScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     TrendingTags.update! if Setting.trends
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 881b911be..6113edde1 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed, retry: 0
+  sidekiq_options lock: :until_executed, retry: 0
 
   def perform
     User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
diff --git a/app/workers/verify_account_links_worker.rb b/app/workers/verify_account_links_worker.rb
index 901498583..8114d59be 100644
--- a/app/workers/verify_account_links_worker.rb
+++ b/app/workers/verify_account_links_worker.rb
@@ -3,7 +3,7 @@
 class VerifyAccountLinksWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', retry: false, unique: :until_executed
+  sidekiq_options queue: 'pull', retry: false, lock: :until_executed
 
   def perform(account_id)
     account = Account.find(account_id)
diff --git a/config/application.rb b/config/application.rb
index 1baa166ce..4c34efa15 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -7,6 +7,8 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 
 require_relative '../app/lib/exceptions'
+require_relative '../lib/paperclip/url_generator_extensions'
+require_relative '../lib/paperclip/attachment_extensions'
 require_relative '../lib/paperclip/lazy_thumbnail'
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/video_transcoder'
diff --git a/config/deploy.rb b/config/deploy.rb
index 4dc36c65c..79550baed 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lock '3.11.2'
+lock '3.12.1'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index af7d16aaf..654e2e8cd 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -32,10 +32,12 @@ Rails.application.config.content_security_policy do |p|
 
     p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
     p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
+    p.child_src   :self, :blob, assets_host
     p.worker_src  :self, :blob, assets_host
   else
     p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
     p.script_src  :self, assets_host
+    p.child_src   :self, :blob, assets_host
     p.worker_src  :self, :blob, assets_host
   end
 end
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index aa1517256..4fec4320c 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -2,6 +2,6 @@
 
 Kaminari.configure do |config|
   config.default_per_page = 40
-  config.window = 1
+  config.window = 2
   config.outer_window = 1
 end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 3cd7ea3a6..09458c540 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -42,6 +42,7 @@ class Rack::Attack
     /auth/sign_in
     /auth
     /auth/password
+    /auth/confirmation
   ).freeze
 
   PROTECTED_PATHS_REGEX = Regexp.union(PROTECTED_PATHS.map { |path| /\A#{Regexp.escape(path)}/ })
@@ -70,7 +71,6 @@ class Rack::Attack
     req.remote_ip if req.post? && req.path == '/api/v1/accounts'
   end
 
-  # Throttle paging, as it is mainly used for public pages and AP collections
   throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
     req.authenticated_user_id if req.paging_request?
   end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 7f8a40d7b..f2733562f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -13,10 +13,15 @@ Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
     chain.add SidekiqErrorHandler
   end
+
+  config.death_handlers << lambda do |job, _ex|
+    digest = job['lock_digest']
+    SidekiqUniqueJobs::Digests.delete_by_digest(digest) if digest
+  end
 end
 
 Sidekiq.configure_client do |config|
   config.redis = redis_params
 end
 
-Sidekiq::Logging.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
+Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
index 77fc4f2a1..a7eab580c 100644
--- a/config/locales/activerecord.br.yml
+++ b/config/locales/activerecord.br.yml
@@ -10,4 +10,8 @@ br:
         account:
           attributes:
             username:
-              invalid: nemet lizherennoù, niverennoù ha isbarrennigoù
+              invalid: nemet lizherennoù, niverennoù hag isbarrennigoù
+        status:
+          attributes:
+            reblog:
+              taken: eus ar statud a zo dija
diff --git a/config/locales/activerecord.hy.yml b/config/locales/activerecord.hy.yml
index c40654016..0da0b3d5e 100644
--- a/config/locales/activerecord.hy.yml
+++ b/config/locales/activerecord.hy.yml
@@ -1 +1,17 @@
+---
 hy:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Վերջնաժամկետ
+        options: Տարբերակներ
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: միայն տառեր, թվեր և ընդգիծկներ
+        status:
+          attributes:
+            reblog:
+              taken: թութը գոյություն ունի
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 21007347c..24e2760da 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -3,6 +3,7 @@ kab:
   activerecord:
     attributes:
       poll:
+        expires_at: Azemz n tagara
         options: Tifranin
     errors:
       models:
@@ -10,3 +11,7 @@ kab:
           attributes:
             username:
               invalid: isekkilen, uṭṭunen d yijerriden n wadda kan
+        status:
+          attributes:
+            reblog:
+              taken: n iddaden yellan yakan
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml
index 2ebf9586c..c968e55aa 100644
--- a/config/locales/activerecord.zh-HK.yml
+++ b/config/locales/activerecord.zh-HK.yml
@@ -1,6 +1,10 @@
 ---
 zh-HK:
   activerecord:
+    attributes:
+      poll:
+        expires_at: 截止時間
+        options: 選擇
     errors:
       models:
         account:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f5a6f067d..c73115e2a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2,7 +2,7 @@
 ar:
   about:
     about_hashtag_html: هذه تبويقات متاحة للجمهور تحتوي على الكلمات الدلالية <strong>#%{hashtag}</strong>. يمكنك التفاعل معها إن كان لديك حساب في أي مكان على الفديفرس.
-    about_mastodon_html: ماستدون شبكة اجتماعية مبنية على أسُس بروتوكولات برمجيات الويب الحرة و مفتوحة المصدر. و هو لامركزي تمامًا كالبريد الإلكتروني.
+    about_mastodon_html: 'شبكة التواصل الإجتماعية المستقبَليّة: مِن دون إعلانات ، غير خاضعة لرقابة الشركات ، تصميم أخلاقي ولامركزية! بياناتكم مِلك لكم مع ماستدون!'
     about_this: عن مثيل الخادوم هذا
     active_count_after: نشط
     active_footnote: مستخدم نشيط شهريا (MAU)
@@ -39,8 +39,9 @@ ar:
     unavailable_content: محتوى غير متوفر
     unavailable_content_description:
       domain: الخادم
-      reason: 'السبب:'
+      reason: السبب
       silenced: 'سيتم إخفاء المنشورات القادمة من هذه الخوادم في الخيوط الزمنية والمحادثات العامة، ولن يتم إنشاء أي إخطارات من جراء تفاعلات مستخدميها، ما لم تُتَابعهم:'
+    unavailable_content_html: يسمح لك ماستدون عموماً بعرض محتوى المستخدمين القادم من أي خادم آخر في الفديفرس والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم بالذات.
     user_count_after:
       few: مستخدمين
       many: مستخدمين
@@ -53,6 +54,7 @@ ar:
   accounts:
     choices_html: 'توصيات %{name}:'
     endorsements_hint: يمكنك التوصية بالأشخاص الذين تتابعهم من واجهة الويب، وسيظهرون هنا.
+    featured_tags_hint: يمكنك عرض وسوم محددة سيتم عرضها هنا.
     follow: اتبع
     followers:
       few: متابِعون
@@ -202,6 +204,34 @@ ar:
       web: الويب
       whitelisted: في القائمة البيضاء
     action_logs:
+      action_types:
+        assigned_to_self_report: أسند التقرير
+        change_email_user: تغيير عنوان البريد الإلكتروني الخاص بالمستخدم
+        confirm_user: تأكيد المستخدم
+        create_account_warning: إنشاء تحذير
+        create_announcement: إنشاء إعلان
+        create_custom_emoji: إنشاء إيموجي مخصص
+        destroy_announcement: احذف الإعلان
+        destroy_custom_emoji: احذف الإيموجي المخصص
+        disable_2fa_user: تعطيل 2FA
+        disable_custom_emoji: تعطيل الإيموجي المخصص
+        disable_user: تعطيل المستخدم
+        enable_custom_emoji: تفعيل الإيموجي المخصص
+        enable_user: تفعيل المستخدم
+        memorialize_account: جعل الحساب تذكاريا
+        promote_user: ترقية المستخدم
+        remove_avatar_user: احذف الصورة الرمزية
+        reopen_report: إعادة فتح التقرير
+        reset_password_user: إعادة تعيين كلمة المرور
+        resolve_report: حل الشكوى
+        silence_account: كتم الحساب
+        suspend_account: تعليق الحساب
+        unassigned_report: إلغاء إسناد الشكوى
+        unsilence_account: إلغاء كتم الحساب
+        unsuspend_account: إلغاء تعليق الحساب
+        update_announcement: تحديث الإعلان
+        update_custom_emoji: تحديث الإيموجي المخصص
+        update_status: تحديث الحالة
       actions:
         assigned_to_self_report: قام %{name} بتعيين التقرير %{target} لأنفسهم
         change_email_user: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
@@ -239,6 +269,9 @@ ar:
         update_custom_emoji: "%{name} قام بتحديث الإيموجي %{target}"
         update_status: لقد قام %{name} بتحديث منشور %{target}
       deleted_status: "(منشور محذوف)"
+      empty: لم يتم العثور على سجلات.
+      filter_by_action: تصفية بحسب الإجراء
+      filter_by_user: تصفية حسب المستخدم
       title: سِجلّ التفتيش و المعاينة
     announcements:
       destroyed_msg: تم حذف الإعلان بنجاح!
@@ -364,6 +397,7 @@ ar:
       destroyed_msg: تم حذف نطاق البريد الإلكتروني من اللائحة السوداء بنجاح
       domain: النطاق
       empty: ليس هناك أية نطاقات للبريد الإلكتروني مُدرَجة في القائمة السوداء.
+      from_html: مِن %{domain}
       new:
         create: إضافة نطاق
         title: إضافة نطاق بريد جديد إلى اللائحة السوداء
@@ -421,10 +455,26 @@ ar:
       created_msg: تم إنشاء ملاحظة الشكوى بنجاح!
       destroyed_msg: تم حذف ملاحظة الشكوى بنجاح!
     reports:
+      account:
+        notes:
+          few: "%{count} ملاحظات"
+          many: "%{count} ملاحظات"
+          one: "%{count} ملاحظة"
+          other: "%{count} ملاحظات"
+          two: "%{count} ملاحظتَيْن"
+          zero: "%{count} ملاحظات"
+        reports:
+          few: "%{count} تقارير"
+          many: "%{count} تقارير"
+          one: "%{count} تقرير واحد"
+          other: "%{count} تقارير"
+          two: "%{count} تقريرَيْن"
+          zero: "%{count} تقارير"
       action_taken_by: تم اتخاذ الإجراء مِن طرف
       are_you_sure: هل أنت متأكد ؟
       assign_to_self: عين لي
       assigned: تعين رئيس
+      by_target_domain: نطاق الحساب المبلّغ عنه
       comment:
         none: لا شيء
       created_at: ذكرت
@@ -466,11 +516,16 @@ ar:
         all: للجميع
         disabled: لا أحد
         title: اظهر خاصية حجب النطاقات
+        users: للمستخدمين المتصلين محليا
       domain_blocks_rationale:
         title: اظهر السبب
+      enable_bootstrap_timeline_accounts:
+        title: تمكين الاشتراكات الافتراضية للمستخدمين الجدد
       hero:
         desc_html: معروض على الصفحة الأولى. لا يقل عن 600 × 100 بكسل. عند عدم التعيين ، تعود الصورة إلى النسخة المصغرة على سبيل المثال
         title: الصورة الرأسية
+      mascot:
+        title: صورة الماسكوت
       peers_api_enabled:
         desc_html: أسماء النطاقات التي التقى بها مثيل الخادوم على البيئة الموحَّدة فديفرس
         title: نشر عدد مثيلات الخوادم التي تم مصادفتها
@@ -527,6 +582,9 @@ ar:
         title: السماح للوسوم بالظهور على المتداوَلة بدون مراجعة مسبقة
       trends:
         title: الوسوم المتداولة
+    site_uploads:
+      delete: احذف الملف الذي تم تحميله
+      destroyed_msg: تم حذف التحميل مِن الموقع بنجاح!
     statuses:
       back_to_account: العودة إلى صفحة الحساب
       batch:
@@ -562,7 +620,6 @@ ar:
     warning_presets:
       add_new: إضافة واحد جديد
       delete: حذف
-      edit: تعديل
       edit_preset: تعديل نموذج التحذير
       title: إدارة نماذج التحذير
   admin_mailer:
@@ -578,6 +635,7 @@ ar:
     remove: إلغاء ربط الكنية
   appearance:
     advanced_web_interface: واجهة الويب المتقدمة
+    advanced_web_interface_hint: 'إذا كنت ترغب في استخدام عرض شاشتك بأكمله، فواجهة الويب المتقدمة تسمح لك بضبط العديد من الأعمدة المختلفة لرؤية أكبر قدر من المعلومات التي ترغب فيها في آن واحد: الخيط الرئيسي والإخطارات والخيط الزمني الفدرالي وأي عدد من القوائم والوسوم.'
     animations_and_accessibility: الإتاحة والحركة
     confirmation_dialogs: نوافذ التأكيد
     discovery: استكشاف
@@ -642,6 +700,7 @@ ar:
     trouble_logging_in: هل صادفتكم مشكلة في الولوج؟
   authorize_follow:
     already_following: أنت تتابع بالفعل هذا الحساب
+    already_requested: لقد قُمتَ بإرسال طلب متابَعة إلى هذا الحساب مِن قَبل
     error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد
     follow: اتبع
     follow_request: 'لقد قمت بإرسال طلب متابعة إلى:'
@@ -684,6 +743,7 @@ ar:
       data_removal: سوف تُحذَف منشوراتك والبيانات الأخرى نهائيا
       email_change_html: بإمكانك <a href="%{path}">تغيير عنوان بريدك الإلكتروني</a> دون أن يُحذف حسابك
       email_contact_html: إن لم تتلقّ أي شيء ، يمكنك مراسلة <a href="mailto:%{email}">%{email}</a> لطلب المساعدة
+      email_reconfirmation_html: إن لم تتلقّ الرسالة الإلكترونية للتأكيد ، بإمكانك <a href="%{path}">إعادة طلبها ثانيةً</a>
       irreversible: لن يكون بإمكانك استرجاع أو إعادة تنشيط حسابك
       more_details_html: للمزيد مِن التفاصيل ، يرجى الإطلاع على <a href="%{terms_path}">سياسة الخصوصية</a>.
       username_available: سيصبح اسم مستخدمك متوفرا ثانية
@@ -825,7 +885,7 @@ ar:
       images_and_video: ليس بالإمكان إرفاق فيديو في منشور يحتوي مسبقا على صور
       too_many: لا يمكن إرفاق أكثر من 4 ملفات
   migrations:
-    acct: username@domain للحساب الجديد
+    acct: انتقل إلى
     cancel: ألغِ التوجيه
     cancelled_msg: تم إلغاء التوجيه بنجاح.
     errors:
@@ -1089,6 +1149,8 @@ ar:
     pinned: تبويق مثبّت
     reblogged: رقّاه
     sensitive_content: محتوى حساس
+  tags:
+    does_not_match_previous_name: لا يطابق الإسم السابق
   terms:
     title: شروط الخدمة وسياسة الخصوصية على %{instance}
   themes:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d7e0faf41..1d6c11f13 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -209,6 +209,7 @@ ast:
     trouble_logging_in: "¿Problemes col aniciu de sesión?"
   authorize_follow:
     already_following: Yá tas siguiendo a esta cuenta
+    already_requested: Yá unviesti una solicitú de siguimientu a esa cuenta
     error: Desafortunadamente, hebo un fallu guetando la cuenta remota
     follow_request: 'Unviesti una solicitú de siguimientu a:'
     post_follow:
@@ -354,7 +355,7 @@ ast:
     errors:
       already_voted: Yá votesti nesta encuesta
       expired: La encuesta yá finó
-      invalid_choice: El la opción de votu escoyida nun esiste
+      invalid_choice: La opción de votu escoyida nun esiste
   preferences:
     public_timelines: Llinies temporales públiques
   relationships:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 07149f51f..4142d439f 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -54,7 +54,7 @@ bg:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 7dd49ff96..ad613f721 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -201,7 +201,7 @@ bn:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 7d15639ee..5da24d25c 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -3,8 +3,140 @@ br:
   about:
     about_this: Diàr-benn
     active_count_after: oberiant
+    api: API
     apps: Arloadoù pellgomz
     apps_platforms: Ober get Mastodoñ àr iOS, Android ha savennoù arall
+    contact: Darempred
+    discover_users: Dizoleiñ implijer·ien·ezed
+    learn_more: Gouzout hiroc'h
+    privacy_policy: Reolennoù prevezded
+    source_code: Boneg tarzh
+    terms: Divizoù gwerzhañ hollek
+    unavailable_content_description:
+      domain: Dafariad
+  accounts:
+    media: Media
+    posts_tab_heading: Toudoù
+    posts_with_replies: Toudoù ha respontoù
+    roles:
+      admin: Merour
+      bot: Robot
+      group: Strollad
+      moderator: Mod
+    unavailable: Profil dihegerz
+    unfollow: Diheuliañ
+  admin:
+    account_moderation_notes:
+      delete: Dilemel
+    accounts:
+      change_email:
+        current_email: Postel bremanel
+        label: Kemm ar postel
+        new_email: Postel nevez
+        submit: Kemm ar postel
+      enable: Gweredekaat
+      enabled: Gweredekaet
+      followers: Heulier·ezed·ien
+      header: Talbenn
+      ip: IP
+      location:
+        local: Lec'hel
+        remote: A-bell
+      moderation:
+        active: Oberiant
+        silenced: Mudet
+        suspended: Astalet
+      perform_full_suspension: Astalañ
+      protocol: Komenad
+      public: Publik
+      reject: Nac'hañ
+      reject_all: Nac'hañ pep hini
+      remove_header: Dilemel an talbenn
+      reset: Adderaouekaat
+      reset_password: Adderaouekaat ar ger-tremen
+      roles:
+        admin: Merour
+        moderator: Habaskaer·ez
+        user: Implijer·ez
+    action_logs:
+      deleted_status: "(statud dilemet)"
+    announcements:
+      new:
+        create: Sevel ur gemenn
+        title: Kemenn nevez
+      title: Kemennoù
+    custom_emojis:
+      delete: Dilemel
+      disable: Diweredekaat
+      disabled: Diweredekaet
+      emoji: Fromlun
+      enable: Gweredekaat
+      enabled: Gweredekaet
+    dashboard:
+      config: Kefluniadur
+      software: Meziant
+      trends: Luskadoù
+    domain_blocks:
+      domain: Domani
+      new:
+        create: Sevel ur stanker
+        severity:
+          noop: Hini ebet
+          silence: Mudañ
+          suspend: Astalañ
+      severity:
+        silence: mudet
+        suspend: astalet
+      show:
+        undo: Dizober
+    email_domain_blocks:
+      add_new: Ouzhpenniñ unan nevez
+      delete: Dilemel
+      domain: Domani
+      from_html: eus %{domain}
+      new:
+        create: Ouzhpenniñ un domani
+    instances:
+      by_domain: Domani
+      moderation:
+        all: Pep tra
+    settings:
+      domain_blocks:
+        all: D'an holl dud
+      site_title: Anv ar servijer
+      title: Arventennoù al lec'hienn
+  auth:
+    change_password: Ger-tremen
+    delete_account: Dilemel ar gont
+    login: Mont tre
+    logout: Digennaskañ
+    providers:
+      saml: SAML
+    reset_password: Adderaouekaat ar ger-tremen
+    security: Diogelroez
+    setup:
+      title: Kefluniañ
+  authorize_follow:
+    title: Heuliañ %{acct}
+  challenge:
+    confirm: Kenderc' hel
+    invalid_password: Ger-tremen diwiriek
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}e"
+      about_x_months: "%{count}miz"
+      about_x_years: "%{count}b"
+      almost_x_years: "%{count}b"
+      less_than_x_minutes: "%{count}m"
+      over_x_years: "%{count}b"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}miz"
+      x_seconds: "%{count}eil"
+  deletes:
+    proceed: Dilemel ar gont
+  directories:
+    directory: Roll ar profiloù
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -12,14 +144,93 @@ br:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
+  featured_tags:
+    add_new: Ouzhpenniñ unan nevez
+  filters:
+    contexts:
+      account: Profiloù
+      notifications: Kemennoù
+    index:
+      delete: Dilemel
+  footer:
+    developers: Diorroerien
+    more: Muioc'h…
+  generic:
+    all: Pep tra
+    copy: Eilañ
+    delete: Dilemel
+    order_by: Urzhiañ dre
   invites:
     expires_in:
       '1800': 30 minutes
       '21600': 6 hours
       '3600': 1 hour
-      '43200': 12 hours
-      '604800': 1 week
-      '86400': 1 day
+      '43200': 12 eur
+      '604800': 1 sizhun
+      '86400': 1 deiz
+    expires_in_prompt: Birviken
+    title: Pediñ tud
+  notification_mailer:
+    follow:
+      title: Heulier nevez
+    mention:
+      action: Respont
+  relationships:
+    followers: Heulier·ezed·ien
+  sessions:
+    browser: Merdeer
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      windows: Windows
+  statuses:
+    show_more: Diskouez muioc'h
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      public: Publik
+  stream_entries:
+    pinned: Toud spilhennet
+  themes:
+    default: Mastodoñ (Teñval)
+    mastodon-light: Mastodoñ (Sklaer)
+  time:
+    formats:
+      default: "%He%M, %d %b %Y"
+      month: "%b %Y"
+  two_factor_authentication:
+    disable: Diweredekaat
+    enable: Gweredekaat
+    setup: Kefluniañ
+  user_mailer:
+    warning:
+      title:
+        none: Diwall
+    welcome:
+      edit_profile_action: Kefluniañ ar profil
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1c30b6b7a..f056bb943 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -92,6 +92,7 @@ ca:
       delete: Suprimeix
       destroyed_msg: Nota de moderació destruïda amb èxit!
     accounts:
+      add_email_domain_block: Afegir el domini de correu a la llista negra
       approve: Aprova
       approve_all: Aprova'ls tots
       are_you_sure: N'estàs segur?
@@ -172,6 +173,7 @@ ca:
         staff: Personal
         user: Usuari
       search: Cerca
+      search_same_email_domain: Altres usuaris amb el mateix domini de correu
       search_same_ip: Altres usuaris amb la mateixa IP
       shared_inbox_url: URL de la safata d'entrada compartida
       show:
@@ -193,6 +195,42 @@ ca:
       web: Web
       whitelisted: Llista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assigna l'informe
+        change_email_user: Canvia l'adreça electrònica per l'usuari
+        confirm_user: Confirma l'usuari
+        create_account_warning: Crea un avís
+        create_announcement: Crea un anunci
+        create_custom_emoji: Crea un emoji personalitzat
+        create_domain_allow: Crea un domini permès
+        create_domain_block: Crea un bloqueig de domini
+        create_email_domain_block: Crea un bloqueig de domini d'adreça de correu
+        demote_user: Degrada l'usuari
+        destroy_announcement: Esborra l'anunci
+        destroy_custom_emoji: Esborra l'emoji personalitzat
+        destroy_domain_allow: Esborra el domini permès
+        destroy_domain_block: Esborra el bloqueig de domini
+        destroy_email_domain_block: Esborra el bloqueig de domini de l'adreça de correu
+        destroy_status: Esborra el tut
+        disable_2fa_user: Desactiva 2FA
+        disable_custom_emoji: Desactiva l'emoji personalitzat
+        disable_user: Deshabilita l'usuari
+        enable_custom_emoji: Activa l'emoji personalitzat
+        enable_user: Activa l'usuari
+        memorialize_account: Memoritza el compte
+        promote_user: Promou l'usuari
+        remove_avatar_user: Eliminar avatar
+        reopen_report: Reobre l'informe
+        reset_password_user: Restableix la contrasenya
+        resolve_report: Resolt l'informe
+        silence_account: Silencia el compte
+        suspend_account: Suspèn el compte
+        unassigned_report: Des-assigna l'informe
+        unsilence_account: Desfés el silenci del compte
+        unsuspend_account: Desfés la suspensió del compte
+        update_announcement: Actualitza l'anunci
+        update_custom_emoji: Actualitza l'emoji personalitzat
+        update_status: Actualitza l'estat
       actions:
         assigned_to_self_report: "%{name} han assignat l'informe %{target} a ells mateixos"
         change_email_user: "%{name} ha canviat l'adreça de correu electrònic del usuari %{target}"
@@ -230,6 +268,9 @@ ca:
         update_custom_emoji: "%{name} ha actualitzat l'emoji %{target}"
         update_status: "%{name} estat actualitzat per %{target}"
       deleted_status: "(tut esborrat)"
+      empty: No s’han trobat registres.
+      filter_by_action: Filtra per acció
+      filter_by_user: Filtra per usuari
       title: Registre d'auditoria
     announcements:
       destroyed_msg: L’anunci s’ha esborrat amb èxit!
@@ -358,6 +399,7 @@ ca:
       destroyed_msg: S'ha eliminat correctament el bloc del domini de correu
       domain: Domini
       empty: Cap domini de correu a la llista negre.
+      from_html: des de %{domain}
       new:
         create: Afegeix un domini
         title: Nova adreça de correu en la llista negra
@@ -537,6 +579,9 @@ ca:
       trends:
         desc_html: Mostra públicament les etiquetes revisades anteriorment que actualment estan en tendència
         title: Etiquetes tendència
+    site_uploads:
+      delete: Esborra el fitxer pujat
+      destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
     statuses:
       back_to_account: Torna a la pàgina del compte
       batch:
@@ -573,7 +618,6 @@ ca:
     warning_presets:
       add_new: Afegeix-ne un de nou
       delete: Esborra
-      edit: Edita
       edit_preset: Edita l'avís predeterminat
       title: Gestiona les configuracions predefinides dels avisos
   admin_mailer:
@@ -661,6 +705,7 @@ ca:
     trouble_logging_in: Problemes per iniciar la sessió?
   authorize_follow:
     already_following: Ja estàs seguint aquest compte
+    already_requested: Ja has enviat una sol·licitud de seguiment a aquest usuari
     error: Malauradament, ha ocorregut un error cercant el compte remot
     follow: Segueix
     follow_request: 'Has enviat una sol·licitud de seguiment a:'
@@ -849,6 +894,7 @@ ca:
   media_attachments:
     validations:
       images_and_video: No es pot adjuntar un vídeo a una publicació que ja contingui imatges
+      not_ready: No es poden adjuntar fitxers que no s'hagin acabat de processar. Torna-ho a provar en un moment!
       too_many: No es poden adjuntar més de 4 fitxers
   migrations:
     acct: Mogut a
@@ -1070,6 +1116,8 @@ ca:
     disallowed_hashtags:
       one: 'conté una etiqueta no permesa: %{tags}'
       other: 'conté les etiquetes no permeses: %{tags}'
+    errors:
+      in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
     language_detection: Detecta automàticament el llenguatge
     open_in_web: Obre en la web
     over_character_limit: Límit de caràcters de %{max} superat
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 24f7f45fc..2d50cefd7 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -92,6 +92,7 @@ co:
       delete: Toglie
       destroyed_msg: Nota di muderazione sguassata!
     accounts:
+      add_email_domain_block: Mette u duminiu e-mail in lista nera
       approve: Appruvà
       approve_all: Appruvà tuttu
       are_you_sure: Site sicuru·a?
@@ -172,6 +173,7 @@ co:
         staff: Squadra
         user: Utilizatore
       search: Cercà
+      search_same_email_domain: Altri utilizatori cù listessu duminiu d'e-mail
       search_same_ip: Altri utilizatori cù listessa IP
       shared_inbox_url: URL di l’inbox spartuta
       show:
@@ -193,6 +195,42 @@ co:
       web: Web
       whitelisted: In a lista bianca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assignà signalamentu
+        change_email_user: Mudificà l'E-mail di l'Utilizatore
+        confirm_user: Cunfirmà Utilizatore
+        create_account_warning: Creà avertimentu
+        create_announcement: Creà Annunziu
+        create_custom_emoji: Creà Emoji Persunalizata
+        create_domain_allow: Creà Auturizazione di Duminiu
+        create_domain_block: Creà Blucchime di Duminiu
+        create_email_domain_block: Creà Blucchime di Duminiu E-mail
+        demote_user: Ritrugadà Utilizatore
+        destroy_announcement: Toglie Annunziu
+        destroy_custom_emoji: Toglie Emoji Persunalizata
+        destroy_domain_allow: Toglie Auturizazione di Duminiu
+        destroy_domain_block: Toglie Blucchime di Duminiu
+        destroy_email_domain_block: Toglie blucchime di duminiu e-mail
+        destroy_status: Toglie u statutu
+        disable_2fa_user: Disattivà l’identificazione à 2 fattori
+        disable_custom_emoji: Disattivà Emoji Persunalizata
+        disable_user: Disattivà Utilizatore
+        enable_custom_emoji: Attivà Emoji Persunalizata
+        enable_user: Attivà utilizatore
+        memorialize_account: Trasfurmà contu in mimuriale
+        promote_user: Prumove Utilizatore
+        remove_avatar_user: Toglie Avatar
+        reopen_report: Riapre Signalamentu
+        reset_password_user: Riinizializà Chjave d'Accessu
+        resolve_report: Chjode Signalamentu
+        silence_account: Silenzà Contu
+        suspend_account: Suspende Contu
+        unassigned_report: Disassignà signalamentu
+        unsilence_account: Ùn Silenzà Più u Contu
+        unsuspend_account: Ùn Suspende Più u Contu
+        update_announcement: Cambià Annunziu
+        update_custom_emoji: Cambià Emoji Persunalizata
+        update_status: Cambià Statutu
       actions:
         assigned_to_self_report: "%{name} s’hè assignatu u signalamentu %{target}"
         change_email_user: "%{name} hà cambiatu l’indirizzu e-mail di %{target}"
@@ -230,6 +268,9 @@ co:
         update_custom_emoji: "%{name} hà messu à ghjornu l’emoji %{target}"
         update_status: "%{name} hà cambiatu u statutu di %{target}"
       deleted_status: "(statutu sguassatu)"
+      empty: Nunda trovu.
+      filter_by_action: Filtrà da azzione
+      filter_by_user: Filtrà da utilizatore
       title: Ghjurnale d’audit
     announcements:
       destroyed_msg: Annunziu sguassatu!
@@ -358,6 +399,7 @@ co:
       destroyed_msg: U blucchime di u duminiu d’e-mail ùn hè più attivu
       domain: Duminiu
       empty: Ùn c'hè manc'un duminiu d'email in lista nera.
+      from_html: da %{domain}
       new:
         create: Creà un blucchime
         title: Nova iscrizzione nant’a lista nera e-mail
@@ -537,6 +579,9 @@ co:
       trends:
         desc_html: Mustrà à u pubblicu i hashtag chì sò stati digià verificati è chì sò in e tendenze avà
         title: Tendenze di hashtag
+    site_uploads:
+      delete: Sguassà u fugliale caricatu
+      destroyed_msg: Fugliale sguassatu da u situ!
     statuses:
       back_to_account: Ritornu à a pagina di u contu
       batch:
@@ -573,7 +618,6 @@ co:
     warning_presets:
       add_new: Aghjunghje
       delete: Sguassà
-      edit: Cambià
       edit_preset: Cambià a preselezzione d'avertimentu
       title: Amministrà e preselezzione d'avertimentu
   admin_mailer:
@@ -661,6 +705,7 @@ co:
     trouble_logging_in: Difficultà per cunnettavi?
   authorize_follow:
     already_following: Site digià abbunatu·a à stu contu
+    already_requested: Avete digià mandatu una dumanda d'abbunamentu à stu contu
     error: Peccatu, c’hè statu un prublemu ricercandu u contu
     follow: Siguità
     follow_request: 'Avete dumandatu di siguità:'
@@ -849,6 +894,7 @@ co:
   media_attachments:
     validations:
       images_and_video: Ùn si pò micca aghjunghje un filmettu à un statutu chì hà digià ritratti
+      not_ready: Ùn si pò micca aghjunghje un fugliale micca ancu trattatu. Ripruvate più tardi!
       too_many: Ùn si pò micca aghjunghje più di 4 fugliali
   migrations:
     acct: cugnome@duminiu di u novu contu
@@ -1070,6 +1116,8 @@ co:
     disallowed_hashtags:
       one: 'cuntene l’hashtag disattivatu: %{tags}'
       other: 'cuntene l’hashtag disattivati: %{tags}'
+    errors:
+      in_reply_not_found: U statutu à quellu avete pruvatu di risponde ùn sembra micca esiste.
     language_detection: Truvà a lingua autumaticamente
     open_in_web: Apre nant’à u web
     over_character_limit: Site sopr’à a limita di %{max} caratteri
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bab669e7e..d7c49279d 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -244,6 +244,7 @@ cs:
       edit:
         title: Upravit oznámení
       empty: Nebyla nalezena žádná oznámení.
+      live: Živě
       new:
         create: Vytvořit oznámení
         title: Nové oznámení
@@ -588,7 +589,6 @@ cs:
     warning_presets:
       add_new: Přidat nové
       delete: Smazat
-      edit: Upravit
       edit_preset: Upravit předlohu pro varování
       title: Spravovat předlohy pro varování
   admin_mailer:
@@ -676,6 +676,7 @@ cs:
     trouble_logging_in: Problémy s přihlášením?
   authorize_follow:
     already_following: Tento účet již sledujete
+    already_requested: Tomuto účtu už jste žádost o sledování zaslali
     error: Při hledání vzdáleného účtu bohužel nastala chyba
     follow: Sledovat
     follow_request: 'Poslali jste žádost o sledování uživateli:'
@@ -1119,6 +1120,7 @@ cs:
         other: "%{count} hlasů"
       vote: Hlasovat
     show_more: Zobrazit více
+    show_thread: Zobrazit vlákno
     sign_in_to_participate: Chcete-li se zúčastnit této konverzace, přihlaste se
     title: "%{name}: „%{quote}“"
     visibilities:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index afca0212a..572cf895a 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -569,6 +569,9 @@ cy:
       trends:
         desc_html: Arddangos hashnodau a adolygwyd yn gynt yn gyhoeddus sydd yn tueddu yn bresennol
         title: Hashnodau tueddig
+    site_uploads:
+      delete: Dileu ffeil sydd wedi'i uwchlwytho
+      destroyed_msg: Uwchlwythiad wefan wedi'i ddileu yn lwyddianus!
     statuses:
       back_to_account: Yn ôl i dudalen y cyfrif
       batch:
@@ -605,7 +608,6 @@ cy:
     warning_presets:
       add_new: Ychwanegu newydd
       delete: Dileu
-      edit: Golygu
       edit_preset: Golygu rhagosodiad rhybudd
       title: Rheoli rhagosodiadau rhybudd
   admin_mailer:
@@ -693,6 +695,7 @@ cy:
     trouble_logging_in: Trafferdd mewngofnodi?
   authorize_follow:
     already_following: Yr ydych yn dilyn y cyfrif hwn yn barod
+    already_requested: Rydych barod wedi anfon ceisiad dilyn i'r cyfrif hynny
     error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif anghysbell
     follow: Dilyn
     follow_request: 'Yr ydych wedi anfon cais dilyn at:'
@@ -889,6 +892,7 @@ cy:
   media_attachments:
     validations:
       images_and_video: Ni ellir ychwanegu fideo at statws sy'n cynnwys delweddau'n barod
+      not_ready: Methu atodi ffeiliau sydd dal yn prosesu. Ceisiwch eto mewn foment!
       too_many: Ni ellir ychwanegu mwy na 4 dogfen
   migrations:
     acct: enwdefnyddiwr@parth y cyfrif newydd
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1cdf7722e..c978029b3 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -489,7 +489,6 @@ da:
       most_recent: Seneste
     warning_presets:
       delete: Slet
-      edit: Rediger
   admin_mailer:
     new_report:
       body: "%{reporter} har anmeldt %{target}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50f994473..d99b36d14 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -92,6 +92,7 @@ de:
       delete: Löschen
       destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
     accounts:
+      add_email_domain_block: E-Mail-Domain blacklisten
       approve: Akzeptieren
       approve_all: Alle akzeptieren
       are_you_sure: Bist du sicher?
@@ -172,6 +173,7 @@ de:
         staff: Mitarbeiter
         user: Nutzer
       search: Suche
+      search_same_email_domain: Andere Benutzer mit der gleichen E-Mail-Domain
       search_same_ip: Andere Benutzer mit derselben IP
       shared_inbox_url: Geteilte Posteingang-URL
       show:
@@ -193,6 +195,42 @@ de:
       web: Web
       whitelisted: Auf der Whitelist
     action_logs:
+      action_types:
+        assigned_to_self_report: Bericht zuweisen
+        change_email_user: E-Mail des Benutzers ändern
+        confirm_user: Benutzer bestätigen
+        create_account_warning: Warnung erstellen
+        create_announcement: Ankündigung erstellen
+        create_custom_emoji: Eigene Emoji erstellen
+        create_domain_allow: Domain erlauben
+        create_domain_block: Domain blockieren
+        create_email_domain_block: E-Mail-Domain-Block erstellen
+        demote_user: Benutzer degradieren
+        destroy_announcement: Ankündigung löschen
+        destroy_custom_emoji: Eigene Emoji löschen
+        destroy_domain_allow: Erlaube das Löschen von Domains
+        destroy_domain_block: Domain-Blockade löschen
+        destroy_email_domain_block: E-Mail-Domain-Blockade löschen
+        destroy_status: Beitrag löschen
+        disable_2fa_user: 2FA deaktivieren
+        disable_custom_emoji: Benutzerdefiniertes Emoji deaktivieren
+        disable_user: Benutzer deaktivieren
+        enable_custom_emoji: Benutzerdefiniertes Emoji aktivieren
+        enable_user: Benutzer aktivieren
+        memorialize_account: Konto in ein Konto von einer verstorbenen Person umwandeln
+        promote_user: Benutzer befördern
+        remove_avatar_user: Profilbild entfernen
+        reopen_report: Meldung wieder eröffnen
+        reset_password_user: Passwort zurücksetzen
+        resolve_report: Bericht lösen
+        silence_account: Konto stummschalten
+        suspend_account: Konto sperren
+        unassigned_report: Berichtszuweisung entfernen
+        unsilence_account: Konto nicht mehr stummschalten
+        unsuspend_account: Konto nicht mehr sperren
+        update_announcement: Ankündigung aktualisieren
+        update_custom_emoji: Benutzerdefiniertes Emoji aktualisieren
+        update_status: Beitrag aktualisieren
       actions:
         assigned_to_self_report: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
         change_email_user: "%{name} hat die E-Mail-Adresse des Nutzers %{target} geändert"
@@ -230,6 +268,9 @@ de:
         update_custom_emoji: "%{name} hat das %{target} Emoji geändert"
         update_status: "%{name} hat einen Beitrag von %{target} aktualisiert"
       deleted_status: "(gelöschter Beitrag)"
+      empty: Keine Protokolle gefunden.
+      filter_by_action: Nach Aktion filtern
+      filter_by_user: Nach Benutzer filtern
       title: Überprüfungsprotokoll
     announcements:
       destroyed_msg: Ankündigung erfolgreich gelöscht!
@@ -358,6 +399,7 @@ de:
       destroyed_msg: E-Mail-Domain-Blockade erfolgreich gelöscht
       domain: Domain
       empty: Keine E-Mail-Domains sind momentan auf der Blacklist.
+      from_html: von %{domain}
       new:
         create: Blockade erstellen
         title: Neue E-Mail-Domain-Blockade
@@ -537,6 +579,9 @@ de:
       trends:
         desc_html: Zuvor überprüfte Hashtags öffentlich anzeigen, die derzeit angesagt sind
         title: Trendende Hashtags
+    site_uploads:
+      delete: Hochgeladene Datei löschen
+      destroyed_msg: Upload erfolgreich gelöscht!
     statuses:
       back_to_account: Zurück zum Konto
       batch:
@@ -573,7 +618,6 @@ de:
     warning_presets:
       add_new: Neu hinzufügen
       delete: Löschen
-      edit: Bearbeiten
       edit_preset: Warnungsvorlage bearbeiten
       title: Warnungsvorlagen verwalten
   admin_mailer:
@@ -661,6 +705,7 @@ de:
     trouble_logging_in: Schwierigkeiten beim Anmelden?
   authorize_follow:
     already_following: Du folgst diesem Konto bereits
+    already_requested: Du hast bereits eine Anfrage zum Folgen diesen Accounts versendet
     error: Das Remote-Konto konnte nicht geladen werden
     follow: Folgen
     follow_request: 'Du hast eine Folgeanfrage gesendet an:'
@@ -849,6 +894,7 @@ de:
   media_attachments:
     validations:
       images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthält, angehängt werden
+      not_ready: Dateien die noch nicht bearbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
       too_many: Es können nicht mehr als 4 Dateien angehängt werden
   migrations:
     acct: benutzername@domain des neuen Kontos
@@ -1070,6 +1116,8 @@ de:
     disallowed_hashtags:
       one: 'enthält einen verbotenen Hashtag: %{tags}'
       other: 'enthält verbotene Hashtags: %{tags}'
+    errors:
+      in_reply_not_found: Der Beitrag, auf den du antworten möchtest, scheint nicht zu existieren.
     language_detection: Sprache automatisch erkennen
     open_in_web: Im Web öffnen
     over_character_limit: Zeichenlimit von %{max} überschritten
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 3fe043754..acfa884b4 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -27,7 +27,15 @@ br:
       reset_password_instructions:
         action: Cheñch ar ger-tremen
         explanation: Goulennet ho peus ur ger-tremen nevez evit ho kont.
+        title: Adderaouekaat ar ger-tremen
+      two_factor_disabled:
+        title: 2FA diweredekaet
+      two_factor_enabled:
+        title: 2FA gweredekaet
     passwords:
       updated_not_active: Kemmet eo bet ho ker-tremen ent reizh.
     registrations:
       signed_up: Donemat ! Kevreet oc'h.
+  errors:
+    messages:
+      not_found: digavet
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 71c647f2b..3edd348e6 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -67,16 +67,16 @@ fr:
       no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d’utiliser l’URL complète.
       send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre adresse électronique existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
-      updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté⋅e.
+      updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté·e.
       updated_not_active: Votre mot de passe a été modifié avec succès.
     registrations:
       destroyed: Au revoir ! Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt.
-      signed_up: Bienvenue ! Vous êtes connecté⋅e.
-      signed_up_but_inactive: Vous êtes bien enregistré⋅e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
-      signed_up_but_locked: Vous êtes bien enregistré⋅e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
-      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous étudierons votre demande. Vous serez informé·e si elle a été approuvée.
+      signed_up: Bienvenue ! Vous êtes connecté·e.
+      signed_up_but_inactive: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
+      signed_up_but_locked: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
+      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous examinerons votre demande. Vous serez informé·e si elle a été approuvée.
       signed_up_but_unconfirmed: Un message contenant un lien de confirmation a été envoyé à votre adresse courriel. Ouvrez ce lien pour activer votre compte. Veuillez vérifier votre dossier d'indésirables si vous ne recevez pas le courriel.
-      update_needs_confirmation: Votre compte a bien été mis à jour, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse. Si vous n'avez pas reçu le courriel, vérifiez votre dossier d'indésirables.
+      update_needs_confirmation: Votre compte a bien été mis à jour, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse. Si vous n'avez pas reçu le courriel, vérifiez votre dossier de spams.
       updated: Votre compte a été modifié avec succès.
     sessions:
       already_signed_out: Déconnecté·e.
@@ -85,14 +85,14 @@ fr:
     unlocks:
       send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
-      unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté⋅e.
+      unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté·e.
   errors:
     messages:
       already_confirmed: a déjà été validée, veuillez essayer de vous connecter
       confirmation_period_expired: à confirmer dans les %{period}, merci de faire une nouvelle demande
       expired: a expiré, merci d’en faire une nouvelle demande
-      not_found: n’a pas été trouvé⋅e
-      not_locked: n’était pas verrouillé⋅e
+      not_found: n’a pas été trouvé·e
+      not_locked: n’était pas verrouillé·e
       not_saved:
-        one: 'Une erreur a empêché ce(tte) %{resource} d’être sauvegardé⋅e :'
+        one: 'Une erreur a empêché ce·tte %{resource} d’être sauvegardé·e :'
         other: "%{count} erreurs ont empêché %{resource} d’être sauvegardé⋅e :"
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index c40654016..666c4c996 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -1 +1,7 @@
+---
 hy:
+  devise:
+    confirmations:
+      confirmed: Ձեր էլփոստի հասցեն հաջողությամբ հաստատվեց։
+    sessions:
+      signed_in: Մուտքը հաջողվեց։
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 288617be8..4d6fb3902 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -8,10 +8,10 @@ is:
     failure:
       already_authenticated: Þú ert nú þegar skráð(ur) inn.
       inactive: Aðgangur þinn hefur ekki enn verið virkjaður.
-      invalid: Ógildur %{authentication_keys} eða lykilorð.
+      invalid: Ógilt %{authentication_keys} eða lykilorð.
       last_attempt: Þú getur reynt einu sinni í viðbót áður en aðgangnum þínum verður læst.
       locked: Notandaaðgangurinn þinn er læstur.
-      not_found_in_database: Ógildur %{authentication_keys} eða lykilorð.
+      not_found_in_database: Ógilt %{authentication_keys} eða lykilorð.
       pending: Notandaaðgangurinn þinn er enn til yfirferðar.
       timeout: Setan þín er útrunnin. Skráðu þig aftur inn til að halda áfram.
       unauthenticated: Þú þarft að skrá þig inn eða nýskrá þig áður en lengra er haldið.
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 650ade1e4..0149c4512 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -10,7 +10,7 @@ kab:
       inactive: Amiḍan-inek mazal ur yermed ara.
       invalid: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       last_attempt: Γur-k yiwen n uɛraḍ-nniḍen kan send ad yettucekkel umiḍan-ik.
-      locked: Amiḍan-ik yewḥel.
+      locked: Amiḍan-ik yettwargel.
       not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
       timeout: Tiγimit n tuqqna tezri. Ma ulac aγilif ɛiwed tuqqna akken ad tkemmleḍ.
@@ -22,10 +22,11 @@ kab:
         action_with_app: Wekked sakkin uγal γer %{app}
         explanation: Aqla-k terniḍ amiḍan deg %{host} s tansa imayl-agi. Mazal-ak yiwen utekki akken ad t-tremdeḍ. Ma mačči d kečč i yessutren ay-agi, ttxil-k ssinef izen-a.
         explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nγeṛ asuter-ik ticki tsentmeḍ tansa-ik imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ γer umiḍan-ik. Ma yella nugi asuter-ik, isefka-ik ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč i yellan deffir n usuter-agi, ttxil-k ssinef izen-agi.
-        extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec</a>.
+        extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec-nneγ</a>.
         subject: 'Maṣṭudun: Asentem n ujerred deg uqeddac %{instance}'
         title: Senqed tansa-inek imayl
       email_changed:
+        explanation: 'Tansa n yimayl n umiḍan-ik ibeddel ɣer:'
         extra: Ma mačči d kečč i ibeddlen tansa imayl, ihi yezmer d alebɛaḍ i ikecmen γer umiḍan-ik. Ttxil-k beddel awal-ik uffir tura neγ siwel i unedbal n uqeddac ma tḥesleḍ berra n umiḍan-ik.
         subject: 'Maṣṭudun: Imayl-ik yettubeddel'
         title: Tansa imayl tamaynut
@@ -42,6 +43,10 @@ kab:
         action: Beddel awal uffir
         explanation: Tessutreḍ awal uffir amaynut i umiḍan-ik.
         title: Aɛiwed n wawal uffir
+      two_factor_disabled:
+        title: Asesteb s snat n tarrayin insa
+      two_factor_enabled:
+        title: Asesteb s snat n tarrayin irmed
     passwords:
       send_paranoid_instructions: Ma nufa tansa-inek imayl tella deg uzadur-nneγ n yisefka, ad n-teṭṭfeḍ izen deg kra n tesdatin, deg-s assaγ i uɛawed n wawal uffir. Ma ur k-in-yewwiḍ ara yizen, ttxil-k ẓer deg ukaram spam.
       updated: Awal-ik uffir yettwabeddel mebla ugur. Aqla-k tura tjerrḍeḍ.
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index d578b8dc5..42eb0690a 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -2,7 +2,7 @@
 nn:
   devise:
     confirmations:
-      confirmed: E-posten din er stadefesta.
+      confirmed: E-posten din er stadfesta.
       send_instructions: Om nokre få minutt får du ein e-post som fortel deg korleis du skal stadfesta e-postadressa di. Sjekk søppelpostmappa di om du ikkje fekk e-posten.
       send_paranoid_instructions: Om vi har e-postadressa di i databasen vår, får du ein e-post som fortel deg korleis du skal stadfesta e-postadressa om nokre få minutt. Ver venleg og sjekk søppelpostmappa di om du ikkje fekk denne e-posten.
     failure:
@@ -12,21 +12,22 @@ nn:
       last_attempt: Du har eitt forsøk igjen før kontoen din vert låst.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
-      pending: Kontoen din er fortsatt under gjennomgang.
-      timeout: Økten din løp ut på tid. Logg inn på nytt for å fortsette.
-      unauthenticated: Du må logge inn eller registrere deg før du kan fortsette.
+      pending: Kontoen din er vert gjennomgått enno.
+      timeout: Økta di er utgått. Logg inn omatt for å halde fram.
+      unauthenticated: Du må logge inn eller registere deg før du kan halde fram.
       unconfirmed: Du må stadfesta e-postadressa di før du kan gå vidare.
     mailer:
       confirmation_instructions:
         action: Stadfest e-postadresse
         action_with_app: Stadfest og gå tilbake til %{app}
-        explanation: Du har laget en konto på %{host} med denne e-postadressen. Du er ett klikk unna å aktivere den. Hvis dette ikke var deg, vennligst se bort fra denne e-posten.
-        extra_html: Vennligst også sjekk ut <a href="%{terms_path}">instansens regler </a> og <a href="%{policy_path}">våre bruksvilkår</a>.
-        subject: 'Mastodon: Instruksjoner for å bekrefte e-postadresse %{instance}'
+        explanation: Du har registrert deg på %{host} med denne e-postadressa. Du er eitt klikk unna aktivere kontoen. Om det ikkje var deg, berre oversjå denne e-posten.
+        explanation_when_pending: Du har søkt om en invitasjon til %{host} med denne e-postadressa. Når du har stadfesta e-postadressa di, vil vi gå gjennom søknaden. Du kan logge på for å endre detaljar eller slette kontoen, men du har ikke tilgang til dei fleste funksjonane før kontoen din er godkjent. Dersom søknaden din vert avslått, vil dataene dine verte sletta, så du treng ikkje gjera meir. Dersom dette ikke var deg, berre oversjå denne e-posten.
+        extra_html: Ta ein kikk på <a href="%{terms_path}">reglane på instansen</a> og <a href="%{policy_path}">bruksvilkåra våre</a>.
+        subject: 'Mastodon: Instruksjonar for stadfesting hos %{instance}'
         title: Stadfest e-postadresse
       email_changed:
         explanation: 'E-postadressa til kontoen din vert endra til:'
-        extra: Hvis du ikke endret din e-postadresse, er det sannsynlig at noen har fått tilgang til din konto. Vennligst endre ditt passord umiddelbart eller kontakt instansens administrator dersom du er utestengt fra kontoen din.
+        extra: Dersom du ikkje har endra e-postadressa di, er det truleg at nokon har fått tilgang til kontoen din. Bytt straks passordet ditt, eller kontakt tenaradministratoren dersom du har vorte låst ut av kontoen.
         subject: 'Mastodon: E-postadressa er endra'
         title: Ny e-postadresse
       password_change:
@@ -36,8 +37,8 @@ nn:
         title: Passord endra
       reconfirmation_instructions:
         explanation: Stadfest den nye adressa for å byta e-postadressa di.
-        extra: Se bort fra denne e-posten dersom du ikke gjorde denne endringen. E-postadressen for Mastadon-kontoen blir ikke endret før du trykker på lenken over.
-        subject: 'Mastodon: Bekreft e-postadresse for %{instance}'
+        extra: Oversjå denne eposten dersom du ikkje gjorde endra. E-postadressa for Mastodon-kontoen vert ikkje endra før lenka over vert trykt på.
+        subject: 'Mastodon: Stadfest e-post for %{instance}'
         title: Stadfest e-postadresse
       reset_password_instructions:
         action: Endr passord
@@ -46,22 +47,25 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
-        subject: 'Mastodon: To-faktor autentisering deaktivert'
+        explanation: To-faktor-autentisering har vorte slått av for kontoen din. Det går no an logge inn med berre e-postadresse og passord.
+        subject: 'Mastodon: To-faktor-autentisering deaktivert'
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: To-faktor autentisering er aktivert for kontoen din. Et symbol som er generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
-        subject: 'Mastodon: To-faktor autentisering aktivert'
+        explanation: To-faktor-autentisering har vorte slått på for kontoen din. Ein kode frå den samankopla TOTP-appen er kravd for å logge inn.
+        subject: 'Mastodon: To-faktor-autentisering aktivert'
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
-        explanation: De forrige gjenopprettingskodene er ugyldig og nye generert.
+        explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
+        subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
+        title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
-        subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
+        subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
     omniauth_callbacks:
-      failure: Kunne ikke autentisere deg fra %{kind} fordi "%{reason}".
-      success: Vellykket autentisering fra %{kind}.
+      failure: Du kunne ikkje verte autentisert frå %{kind} av di "%{reason}".
+      success: Autentisert frå %{kind}-konto.
     passwords:
-      no_token: Du har ingen tilgang til denne siden hvis ikke klikket på en e-post om nullstilling av passord. Hvis du kommer fra en sådan bør du dobbelsjekke at du limte inn hele URLen.
-      send_instructions: Du vil motta en e-post med instruksjoner om nullstilling av passord om noen få minutter.
+      no_token: Du har ikkje tilgang til denne sida utan ha gått via ein e-post som gjeld å nullstille passordet. Dersom det er kva du har gjort, dobbelsjekk at du har kopiert heile URLen.
+      send_instructions: Om vi har e-postadressa di i databasen vår, får du ein e-post med lenke til gjenopprette passordet om nokre få minutt. Sjekk søppelpostmappa di om du ikkje fekk denne e-posten.
       send_paranoid_instructions: Om vi har e-postadressa di i databasen vår, får du ei lenkje til å endra passordet om nokre få minutt. Ver venleg og sjekk søppelpostmappa om du ikkje fekk denne e-posten.
       updated: Passordet ditt er endra. No er du logga inn.
       updated_not_active: Passordet ditt er endra.
@@ -71,24 +75,24 @@ nn:
       signed_up_but_inactive: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er ikkje aktivert enno.
       signed_up_but_locked: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er låst.
       signed_up_but_pending: Ei melding med ei stadfestingslenkje er vorten send til e-postadressa di. Når du klikkar på lenkja skal vi sjå gjennom søknaden din. Du får ei melding om han vert godkjend.
-      signed_up_but_unconfirmed: En e-post med en bekreftelseslenke har blitt sendt til din innboks. Klikk på lenken i e-posten for å aktivere kontoen din.
-      update_needs_confirmation: Du har oppdatert kontoen din, men vi må bekrefte din nye e-postadresse. Sjekk e-posten din og følg bekreftelseslenken for å bekrefte din nye e-postadresse.
-      updated: Kontoen din ble oppdatert.
+      signed_up_but_unconfirmed: Ei melding med ei lenke for å stadfeste kontoen har vorte sendt e-postadressa di. Klikk på lenka for å aktivere kontoen. Sjekk søppelpostmappa dersom du ikkje har fått e-posten.
+      update_needs_confirmation: Du har oppdatert kontoen din, men vi må stadfeste den nye e-postadressa. Sjekk innboksen og følg lenka for å stadfeste adressa di. Sjekk søppelpostmappa dersom du ikkje har fått den e-posten.
+      updated: Kontoen har vorte oppdatert.
     sessions:
       already_signed_out: Logga ut.
       signed_in: Logga inn.
       signed_out: Logga ut.
     unlocks:
-      send_instructions: Du vil motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      send_paranoid_instructions: Hvis kontoen din eksisterer vil du motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      unlocked: Kontoen din ble åpnet uten problemer. Logg på for å fortsette.
+      send_instructions: Om nokre minutt får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din. Sjekk søppelpostmappa om du ikkje finn den mailen.
+      send_paranoid_instructions: Dersom du har konto her, får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din om nokre minutt. Sjekk søppelpostmappa om du ikkje finn den mailen.
+      unlocked: Kontoen din har vorte låst opp. Logg inn for å halde fram.
   errors:
     messages:
-      already_confirmed: har allerede blitt bekreftet, prøv å logge på istedet
-      confirmation_period_expired: må bekreftes innen %{period}. Spør om en ny e-post for bekreftelse istedet
+      already_confirmed: er allereie stadfesta, prøv logge inn
+      confirmation_period_expired: må verte stadfesta innan %{period}, spør etter ein ny
       expired: er utgått, ver venleg å beda om ein ny ein
       not_found: ikkje funne
       not_locked: var ikkje låst
       not_saved:
-        one: '1 feil hindret denne %{resource} i å bli lagret:'
-        other: "%{count} feil hindret denne %{resource} i å bli lagret:"
+        one: '1 feil hindra %{resource} frå verte lagra:'
+        other: "%{count} feil hindra %{resource} frå verte lagra:"
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 92ac2948e..5f46a4ba1 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -3,96 +3,96 @@ pt-BR:
   devise:
     confirmations:
       confirmed: O seu endereço de e-mail foi confirmado.
-      send_instructions: Você receberá uma mensagem em sua caixa de entrada com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nossa base de dados, você receberá uma mensagem em sua caixa de entrada com instruções sobre confirmá-lo dentro de alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
+      send_instructions: Você receberá um e-mail com instruções sobre como confirmar o endereço de e-mail dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para confirmá-lo dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
     failure:
-      already_authenticated: A sua sessão já está aberta.
-      inactive: A sua contra ainda não está ativada.
+      already_authenticated: Você entrou na sua conta.
+      inactive: Sua conta não foi confirmada ainda.
       invalid: "%{authentication_keys} ou senha inválida."
       last_attempt: Você tem apenas mais uma tentativa sobrando antes que a sua conta seja bloqueada.
-      locked: A sua conta está bloqueada.
+      locked: Sua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou senha inválida."
-      pending: Sua conta ainda está sendo revisada.
-      timeout: A sua sessão expirou. Por favor, entre novamente para continuar.
-      unauthenticated: Você precisa entrar ou cadastrar-se antes de continuar.
+      pending: Sua conta está sendo revisada.
+      timeout: Você saiu de sua conta. Por favor, entre novamente para continuar.
+      unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
       unconfirmed: Você precisa confirmar o seu endereço de e-mail antes de continuar.
     mailer:
       confirmation_instructions:
-        action: Verificar endereço de e-mail
+        action: Confirmar endereço de e-mail
         action_with_app: Confirmar e voltar para %{app}
-        explanation: Você criou uma conta em %{host} com esse endereço de e-mail. Você está a um clique de ativá-la. Se não foi você, por favor ignore esse e-mail.
-        explanation_when_pending: Você pediu um convite para %{host} com esse endereço de email. Assim que você confirmar o seu endereço de e-mail, iremos revisar o seu pedido. Você não poderá fazer login até então. Se sua aplicação for rejeitada, seus dados serão removidos e nenhuma ação será necessária da sua parte. Se você não pediu por isso, por favor ignore esse e-mail.
+        explanation: Você criou uma conta em %{host} com esse endereço de e-mail. Se não foi você, por favor, ignore este e-mail.
+        explanation_when_pending: Você solicitou um convite para %{host} com esse endereço de e-mail. Após você confirmar o seu endereço de e-mail, espere o resultado da revisão de sua solicitação. Se sua conta por vetada, seus dados serão excluídos e nenhuma ação será necessária de sua parte. Se você não solicitou nada, por favor, ignore este e-mail.
         extra_html: Por favor confira também <a href="%{terms_path}">as regras da instância</a> e <a href="%{policy_path}">nossos termos de serviço</a>.
         subject: 'Mastodon: Instruções de confirmação para %{instance}'
-        title: Verifique o endereço de e-mail
+        title: Confirme o endereço de e-mail
       email_changed:
-        explanation: 'O e-mail associado à sua conta será mudado para:'
-        extra: Se você não mudou seu e-mail é possível que alguém tenha conseguido acesso à sua conta. Por favor mude sua senha imediatamente ou entre em contato com um administrador da sua instância se você ficou sem acesso à sua conta.
-        subject: 'Mastodon: Email alterado'
+        explanation: 'O e-mail vinculado à sua conta será alterado para:'
+        extra: Se você não alterou seu e-mail, é possível que alguém tenha acessado a sua conta. Altere sua senha imediatamente ou entre em contato com o administrador da sua instância se você perdeu o acesso à sua conta.
+        subject: 'Mastodon: Endereço de e-mail alterado'
         title: Novo endereço de e-mail
       password_change:
-        explanation: A senha da sua conta foi mudada.
-        extra: Se você não mudou a sua senha, é possível que alguém tenha conseguido acesso à sua conta. Por favor mude sua senha imediatamente ou entre em contato com um administrador da sua instância se você ficou sem acesso à sua conta.
-        subject: 'Mastodon: Senha modificada'
+        explanation: A senha da sua conta foi alterada.
+        extra: Se você não alterou sua senha, é possível que alguém tenha acessado a sua conta. Altere sua senha imediatamente ou entre em contato com o administrador da sua instância se você perdeu o acesso à sua conta.
+        subject: 'Mastodon: Senha alterada'
         title: Senha alterada
       reconfirmation_instructions:
-        explanation: Confirme o seu novo endereço para mudar seu e-mail.
-        extra: Se essa mudança não foi iniciada por você, por favor ignore esse e-mail. O endereço de e-mail para essa conta do Mastodon não irá mudar até que você acesse o link acima.
-        subject: 'Mastodon: Confirmar emai para %{instance}'
-        title: Verificar o endereço de e-mail
+        explanation: Confirme seu novo endereço para alterar seu e-mail.
+        extra: Se essa alteração não foi feita por você, por favor, ignore este e-mail. O endereço de e-mail para essa conta do Mastodon não será alterado até que você entre no link acima.
+        subject: 'Mastodon: Confirmar endereço de e-mail para %{instance}'
+        title: Confirmar endereço de e-mail
       reset_password_instructions:
-        action: Mudar a senha
-        explanation: Você pediu uma nova senha para sua conta.
-        extra: Se você não fez esse pedido, por favor ignore esse e-mail. Sua senha não irá mudar até que você acesse o link acima e crie uma nova.
-        subject: 'Mastodon: Instruções para mudança de senha'
-        title: Redefinir a senha
+        action: Alterar senha
+        explanation: Você solicitou uma nova senha para sua conta.
+        extra: Se você não solicitou nada, por favor, ignore este e-mail. Sua senha não será alterada até que você entre no link acima e crie uma nova.
+        subject: 'Mastodon: Instruções para alterar senha'
+        title: Redefinir senha
       two_factor_disabled:
         explanation: A autenticação de dois fatores para sua conta foi desativada. Agora é possível acessar apenas com seu endereço de e-mail e senha.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
         title: 2FA desativada
       two_factor_enabled:
-        explanation: A autenticação de dois fatores foi habilitada para sua conta. Um token gerado pelo app TOTP pareado será necessário para o login.
+        explanation: A autenticação de dois fatores foi ativada para sua conta. Um código gerado no aplicativo TOTP pareado será necessário para entrar.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
         title: 2FA ativada
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos códigos foram gerados.
-        subject: 'Mastodon: códigos de recuperação de dois fatores gerados novamente'
-        title: Códigos de recuperação de 2FA alterados
+        subject: 'Mastodon: Novos códigos de recuperação de dois fatores'
+        title: Códigos de recuperação de dois fatores alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções de desbloqueio'
     omniauth_callbacks:
-      failure: Não foi possível autenticá-lo como %{kind} porque "%{reason}".
-      success: Autenticado com sucesso como %{kind}.
+      failure: Não foi possível entrar como %{kind} porque "%{reason}".
+      success: Entrou como %{kind}.
     passwords:
-      no_token: Você não pode acessar esta página se não tiver vindo de uma mensagem de mudança de senha. Se este for o caso, por favor verifique se a URL utilizada está completa.
-      send_instructions: Se o seu endereço de e-mail já estiver cadastrado em nossa base de dados, você receberá uma mensagem com um link para realizar a mudança de senha em alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se o seu endereço de e-mail já estiver cadastrado em nossa base de dados, você receberá uma mensagem com um link para realizar a mudança de senha em alguns minutos. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      updated: A sua senha foi alterada. A sua sessão está aberta.
-      updated_not_active: A sua senha foi alterada.
+      no_token: Você não pode acessar esta página sem vir de um e-mail de alteração de senha. Se este for o caso, por favor, verifique se o link fornecido está completo.
+      send_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para alterar a senha dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se o seu endereço de e-mail já existir em nosso banco de dados, você receberá um e-mail com instruções para alterar a senha dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      updated: Sua senha foi alterada e você entrou na sua conta.
+      updated_not_active: Sua senha foi alterada com sucesso.
     registrations:
-      destroyed: Adeus! A sua conta foi cancelada. Esperamos vê-lo em breve.
-      signed_up: Bem vindo! A sua conta foi registrada com sucesso.
-      signed_up_but_inactive: A sua conta foi registrada. No entanto, não abrimos a sua sessão porque a sua conta ainda não foi ativada.
-      signed_up_but_locked: A sua conta foi registrada. No entanto, não abrimos a sua sessão porque a sua conta está bloqueada.
-      signed_up_but_pending: Uma mensagem com um link de confirmação foi enviada ao seu endereço de e-mail. Depois que você clicar no link, revisaremos seu pedido. Você será notificado se seu pedido for aprovado.
-      signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o seu endereço de e-mail. Por favor, siga o link para ativar a sua conta e, caso não tenha recebido esta mensagem, cheque a sua pasta de spam.
-      update_needs_confirmation: Você mudou o seu endereço de e-mail ou a sua senha, mas é necessário confirmar a mudança. Por favor siga o link que foi enviado para o seu novo endereço de e-mail e, caso não tenha recebido esta mensagem, cheque a sua pasta de spam.
-      updated: A sua conta foi alterada com sucesso.
+      destroyed: Adeus! Sua conta foi cancelada. Talvez um dia possamos nos ver de novo.
+      signed_up: Boas vindas! Conta criada.
+      signed_up_but_inactive: Conta criada! Agora você deve confirmá-la.
+      signed_up_but_locked: Conta criada! Porém, você deve desbloqueá-la.
+      signed_up_but_pending: Um e-mail com um link de confirmação foi enviado para o seu endereço de e-mail. Após você entrar no link, revisaremos sua solicitação e você será notificado caso seja aprovado.
+      signed_up_but_unconfirmed: Um e-mail com instruções para confirmar o seu endereço de e-mail foi enviado. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      update_needs_confirmation: Você alterou seu endereço de e-mail ou sua senha, porém é preciso confirmar a alteração. Por favor, entre no link que foi enviado para o seu novo endereço de e-mail e verifique sua pasta de spam caso ainda não o tenha recebido.
+      updated: Sua conta foi alterada com sucesso.
     sessions:
-      already_signed_out: Sessão encerrada.
-      signed_in: Sessão iniciada.
-      signed_out: Sessão encerrada.
+      already_signed_out: Você saiu de sua conta.
+      signed_in: Você entrou na sua conta.
+      signed_out: Você saiu de sua conta.
     unlocks:
-      send_instructions: Você receberá uma mensagem com instruções para desbloquear a sua conta em alguns instantes. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      send_paranoid_instructions: Se a sua conta já existe, você receberá uma mensagem com instruções para desbloquear a sua conta em alguns instantes. Por favor, cheque a sua pasta de spam caso não tenha recebido esta mensagem.
-      unlocked: A sua conta foi desbloqueada com sucesso. Por favor inicie sessão para continuar.
+      send_instructions: Você receberá um e-mail com instruções para desbloquear a sua conta dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      send_paranoid_instructions: Se a sua conta já existe, você receberá um e-mail com instruções para desbloqueá-la dentro de alguns minutos. Por favor, verifique sua pasta de spam caso ainda não o tenha recebido.
+      unlocked: Sua conta foi desbloqueada. Por favor, entre na sua conta para continuar.
   errors:
     messages:
-      already_confirmed: já foi confirmado, por favor tente iniciar sessão
+      already_confirmed: confirmado, agora tente entrar na sua conta
       confirmation_period_expired: precisa ser confirmada em até %{period}, por favor, solicite novo link de confirmação
       expired: expirou, por favor solicite uma nova
       not_found: não encontrado
-      not_locked: não está bloqueada
+      not_locked: Sua conta não está bloqueada.
       not_saved:
         one: '1 erro impediu este %{resource} de ser salvo(a):'
         other: "%{count} erros impediram este %{resource} de ser salvo(a):"
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 9689b01f5..c6cfe0c37 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -27,12 +27,12 @@ pt-PT:
         title: Verificar o endereço de e-mail
       email_changed:
         explanation: 'O e-mail associado à tua conta será alterado para:'
-        extra: Se não alteraste o teu e-mail é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
+        extra: Se não alterou o seu email, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entra em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
         subject: 'Mastodon: Email alterado'
         title: Novo endereço de e-mail
       password_change:
         explanation: A palavra-passe da tua conta foi alterada.
-        extra: Se não alteraste a tua palavra-passe, é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
+        extra: Se não alterou a sua palavra-passe, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
         subject: 'Mastodon: Nova palavra-passe'
         title: Palavra-passe alterada
       reconfirmation_instructions:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index 5d7e33422..52b229ca0 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -18,7 +18,7 @@ ru:
       unconfirmed: Вам необходимо подтвердить ваш адрес e-mail для продолжения.
     mailer:
       confirmation_instructions:
-        action: Подтвердите e-mail адрес
+        action: Подтвердить смену e-mail
         action_with_app: Подтвердить и вернуться в %{app}
         explanation: Вы создали учётную запись на сайте %{host}, используя этот e-mail адрес. Остался лишь один шаг для активации. Если это были не вы, просто игнорируйте письмо.
         explanation_when_pending: Вы подали заявку на %{host}, используя этот адрес e-mail. Как только вы его подтвердите, мы начнём изучать вашу заявку. До тех пор вы не сможете войти на сайт. Если ваша заявка будет отклонена, все данные будут автоматически удалены, от вас не потребуется никаких дополнительных действий. Если это были не вы, пожалуйста, проигнорируйте данное письмо.
@@ -28,7 +28,7 @@ ru:
       email_changed:
         explanation: 'E-mail адрес вашей учётной записи будет изменён на:'
         extra: Если вы не меняли e-mail адрес, возможно кто-то получил доступ к вашей учётной записи. Пожалуйста, немедленно смените пароль или свяжитесь с администратором узла, если вы уже потеряли доступ к ней.
-        subject: 'Mastodon: изменён e-mail адрес'
+        subject: 'Mastodon: Изменён e-mail адрес'
         title: Новый адрес e-mail
       password_change:
         explanation: Пароль Вашей учётной записи был изменён.
@@ -36,28 +36,28 @@ ru:
         subject: 'Mastodon: Пароль изменен'
         title: Пароль изменён
       reconfirmation_instructions:
-        explanation: Подтвердите новый адрес для смены e-mail.
-        extra: Если смену e-mail инициировали не вы, пожалуйста, игнорируйте это письмо. Адрес e-mail для учётной записи Mastodon не будет изменён, пока вы не перейдёте по ссылке выше.
-        subject: 'Mastodon: Подтверждение e-mail для узла %{instance}'
+        explanation: Для завершения смены e-mail, нажмите кнопку ниже.
+        extra: Если вы не изменяли e-mail, пожалуйста, игнорируйте это письмо. Новый адрес не будет привязан к учётной записи, пока вы не перейдёте по ссылке ниже.
+        subject: 'Mastodon: Подтвердите свой новый e-mail на %{instance}'
         title: Подтвердите e-mail адрес
       reset_password_instructions:
         action: Смена пароля
         explanation: Вы запросили новый пароль для вашей учётной записи.
         extra: Если это сделали не вы, пожалуйста, игнорируйте письмо. Ваш пароль не будет изменён, пока вы не перейдёте по ссылке выше и не создадите новый пароль.
-        subject: 'Mastodon: инструкция по смене пароля'
+        subject: 'Mastodon: Инструкция по сбросу пароля'
         title: Сброс пароля
       two_factor_disabled:
         explanation: Для вашей учётной записи была отключена двухфакторная авторизация. Выполнить вход теперь можно используя лишь e-mail и пароль.
-        subject: 'Mastodon: двухфакторная авторизация отключена'
-        title: Двухфакторная авторизация отключена
+        subject: 'Mastodon: Двухфакторная авторизация отключена'
+        title: 2ФА отключена
       two_factor_enabled:
         explanation: Для вашей учётной записи была настроена двухфакторная авторизация. Отныне для входа потребуется также временный код из приложения-аутентификатора.
-        subject: 'Mastodon: настроена двухфакторная авторизация'
-        title: Двухфакторная авторизация включена
+        subject: 'Mastodon: Настроена двухфакторная авторизация'
+        title: 2ФА включена
       two_factor_recovery_codes_changed:
         explanation: Предыдущие резервные коды были аннулированы и созданы новые.
-        subject: 'Mastodon: резервные коды двуфакторной авторизации обновлены'
-        title: Резервные коды двухфакторной авторизации изменены
+        subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
+        title: Резервные коды 2ФА изменены
       unlock_instructions:
         subject: 'Mastodon: Инструкция по разблокировке'
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index ceae8b238..e1bb9f959 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -12,13 +12,16 @@ zh-HK:
       last_attempt: 若你再一次嘗試失敗，我們將鎖定你的帳號，以策安全。
       locked: 你的帳號已被鎖定。
       not_found_in_database: 不正確的 %{authentication_keys} 或密碼。
+      pending: 您的帳戶仍在審核中。
       timeout: 你的登入階段已經過期，請重新登入以繼續使用。
       unauthenticated: 你必須先登入或登記，以繼續使用。
       unconfirmed: 你必須先確認電郵地址，繼續使用。
     mailer:
       confirmation_instructions:
         action: 驗證電子郵件地址
+        action_with_app: 確認並返回 %{app}
         explanation: 你在 %{host} 上使用這個電子郵件地址建立了一個帳戶。只需點擊下面的連結，即可啟用帳戶。如果你並沒有建立過帳戶，請忽略此郵件。
+        explanation_when_pending: 您使用此電子信箱位址申請了 %{host} 的邀請。當您確認電子信箱後我們將審核您的申請，而直到核准前您都無法登入。當您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您，請忽略此信件。
         extra_html: 請記得閱讀本服務站的<a href="%{terms_path}">相關規定</a>和<a href="%{policy_path}">使用條款</a>。
         subject: 'Mastodon: 確認電郵地址 %{instance}'
         title: 驗證電子郵件地址
@@ -43,6 +46,18 @@ zh-HK:
         extra: 如果你沒有請求本次變更，請忽略此郵件。你的密碼只有在你點擊上面的連結並輸入新密碼後才會更改。
         subject: 'Mastodon: 重設密碼'
         title: 重設密碼
+      two_factor_disabled:
+        explanation: 您帳戶的兩步驟驗證已停用。現在只能使用電子信箱位址及密碼登入。
+        subject: Mastodon：已停用兩步驟驗證
+        title: 已停用 2FA
+      two_factor_enabled:
+        explanation: 已對您的帳戶啟用兩步驟驗證。登入時將需要配對之 TOTP 應用程式所產生的 Token。
+        subject: Mastodon：已啟用兩步驟驗證
+        title: 已啟用 2FA
+      two_factor_recovery_codes_changed:
+        explanation: 上一次的復原碼已經失效，且已產生新的。
+        subject: Mastodon：兩步驟驗證復原碼已經重新產生
+        title: 2FA 復原碼已變更
       unlock_instructions:
         subject: 'Mastodon: 解除用戶鎖定'
     omniauth_callbacks:
@@ -59,6 +74,7 @@ zh-HK:
       signed_up: 歡迎你！你的登記已經成功。
       signed_up_but_inactive: 你的登記已經成功，可是由於你的用戶還被被啟用，暫時還不能讓你登入。
       signed_up_but_locked: 你的登記已經成功，可是由於你的用戶已被鎖定，我們無法讓你登入。
+      signed_up_but_pending: 包含確認連結的訊息已寄到您的電子信箱。按下此連結後我們將審核您的申請。核准後將通知您。
       signed_up_but_unconfirmed: 一條確認連結已經電郵到你的郵址。請使用讓連結啟用你的用戶。
       update_needs_confirmation: 你的用戶已經更新，但我們需要確認你的電郵地址。請打開你的郵箱，使用確認電郵的連結來確認的地郵址。
       updated: 你的用戶已經成功更新。
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index c7677c850..a9b8d5b90 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -1 +1,52 @@
+---
 br:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Anv an arload
+        website: Lec'hienn an arload
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Aotren
+        cancel: Nullañ
+        destroy: Distrujañ
+        edit: Aozañ
+      confirmations:
+        destroy: Ha sur oc'h ?
+      index:
+        application: Arload
+        delete: Dilemel
+        name: Anv
+        new: Arload nevez
+        show: Diskouez
+        title: Hoc'h arloadoù
+      new:
+        title: Arload nevez
+      show:
+        title: 'Arload : %{name}'
+    authorizations:
+      buttons:
+        authorize: Aotren
+    authorized_applications:
+      confirmations:
+        revoke: Ha sur oc'h ?
+      index:
+        application: Arload
+        date_format: "%d-%m-%Y %H:%M:%S"
+    flash:
+      applications:
+        create:
+          notice: Savet eo bet an arload.
+        destroy:
+          notice: Dilamet eo bet an arload.
+        update:
+          notice: Hizivaet eo bet an arload.
+    layouts:
+      admin:
+        nav:
+          applications: Arloadoù
+    scopes:
+      read:lists: gwelout ho listennoù
+      write:lists: krouiñ listennoù
+      write:statuses: embann toudoù
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index e9bf70cd2..8a628538b 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -25,7 +25,7 @@ fr:
         edit: Modifier
         submit: Envoyer
       confirmations:
-        destroy: Êtes-vous certain·e ?
+        destroy: Voulez-vous vraiment faire ça ?
       edit:
         title: Modifier l’application
       form:
@@ -37,7 +37,7 @@ fr:
       index:
         application: Application
         callback_url: URL de retour d’appel
-        delete: Effacer
+        delete: Supprimer
         empty: Vous n’avez pas d’application.
         name: Nom
         new: Nouvelle application
@@ -69,7 +69,7 @@ fr:
       buttons:
         revoke: Annuler
       confirmations:
-        revoke: Êtes-vous certain·e ?
+        revoke: Voulez-vous vraiment faire ça ?
       index:
         application: Application
         created_at: Créé le
@@ -145,7 +145,7 @@ fr:
       write:follows: suivre des personnes
       write:lists: créer des listes
       write:media: téléverser des fichiers média
-      write:mutes: masquer des gens et des conversations
-      write:notifications: nettoyer vos notifications
+      write:mutes: masquer des comptes et des conversations
+      write:notifications: effacer vos notifications
       write:reports: signaler d’autres personnes
       write:statuses: publier des statuts
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index b384b76b1..dd141a10e 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -51,12 +51,12 @@ kab:
     authorizations:
       buttons:
         authorize: Ssireg
-        deny: Ggami
+        deny: Aggi
       error:
         title: Tella-d tuccḍa
       new:
-        able_to: Asnas-agi yezmer
-        prompt: Eǧǧ i %{client_name} ad yekcem γer umiḍan-ik
+        able_to: Asnas-agi yezmer ad
+        prompt: Yessutred wesnan n %{client_name} akečum γer umiḍan-ik
         title: Tlaq tsiregt
       show:
         title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
@@ -102,7 +102,7 @@ kab:
       read:favourites: ẓer ismenyifen-ik
       read:filters: ẓer imsizedgen-ik
       read:follows: ẓer imeḍfaṛen-ik
-      read:lists: ẓer tibdarin-ik
+      read:lists: ẓer umuγen-ik·im
       read:mutes: ẓer wid i tesgugmeḍ
       read:notifications: ẓer tilγa-ik
       read:statuses: ẓer meṛṛa tisuffaγ
@@ -112,5 +112,5 @@ kab:
       write:bookmarks: ad yernu tisuffγin γer ticraḍ
       write:filters: rnu-d imsizedgen
       write:follows: ḍfeṛ imdanen
-      write:lists: rnu-d tibdarin
+      write:lists: yesnulfu umuγen
       write:media: ad yessali ifayluyen n teγwalt
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 6f4192ebe..16a2d0490 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -126,7 +126,7 @@ ko:
       read: 계정의 모든 데이터를 읽기
       read:accounts: 계정의 정보를 보기
       read:blocks: 차단을 보기
-      read:bookmarks: 내 갈무리 보기
+      read:bookmarks: 내 보관함 보기
       read:favourites: 관심글을 보기
       read:filters: 필터를 보기
       read:follows: 팔로우를 보기
@@ -139,7 +139,7 @@ ko:
       write: 계정 정보 수정
       write:accounts: 프로필 수정
       write:blocks: 계정이나 도메인 차단
-      write:bookmarks: 게시글을 갈무리하기
+      write:bookmarks: 게시글을 보관함에 넣기
       write:favourites: 관심글 지정
       write:filters: 필터 만들기
       write:follows: 사람을 팔로우
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index f670d5a8b..f5437672a 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -5,7 +5,7 @@ nn:
       doorkeeper/application:
         name: Applikasjonsnamn
         redirect_uri: Omdirigerings-URI
-        scopes: Omfang
+        scopes: Skop
         website: Applikasjonsnettside
     errors:
       models:
@@ -33,15 +33,15 @@ nn:
       help:
         native_redirect_uri: Bruk %{native_redirect_uri} for lokale testar
         redirect_uri: Bruk ei linjer per URI
-        scopes: Adskill omfang med mellomrom. La det være blankt for å bruke standard omfang.
+        scopes: Skil skop med mellomrom. Ikkje fyll inn noko som helst for å bruke standardskop.
       index:
         application: Applikasjon
         callback_url: Callback-URL
         delete: Slett
-        empty: Du har ingen søknader.
+        empty: Du har ikkje nokon applikasjonar.
         name: Namn
         new: Ny applikasjon
-        scopes: Omfang
+        scopes: Skop
         show: Vis
         title: Dine applikasjonar
       new:
@@ -49,8 +49,8 @@ nn:
       show:
         actions: Handlingar
         application_id: Klientnøkkel
-        callback_urls: Callback-URLer
-        scopes: Omfang
+        callback_urls: Callback-URLar
+        scopes: Skop
         secret: Klienthemmelegheit
         title: 'Applikasjon: %{name}'
     authorizations:
@@ -60,8 +60,8 @@ nn:
       error:
         title: Ein feil har oppstått
       new:
-        able_to: Den vil ha mulighet til
-        prompt: Applikasjon %{client_name} spør om tilgang til din konto
+        able_to: Applikasjonen vil kunne
+        prompt: Applikasjonen %{client_name} spør om tilgang til kontoen din
         title: Autorisasjon nødvendig
       show:
         title: Kopier denne autorisasjonskoden og lim den inn i applikasjonen.
@@ -74,15 +74,15 @@ nn:
         application: Applikasjon
         created_at: Autorisert
         date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfang
+        scopes: Skop
         title: Dine autoriserte applikasjonar
     errors:
       messages:
-        access_denied: Ressurseieren eller autoriseringstjeneren avviste forespørslen.
-        credential_flow_not_configured: Ressurseiers passordflyt feilet fordi Doorkeeper.configure.resource_owner_from_credentials ikke var konfigurert.
+        access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden.
+        credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje verte fullført av di «Doorkeeper.configure.resource_owner_from_credentials» er ikkje konfigurert.
         invalid_client: Klientautentisering feilet på grunn av ukjent klient, ingen autentisering inkludert, eller autentiseringsmetode er ikke støttet.
         invalid_grant: Autoriseringen er ugyldig, utløpt, opphevet, stemmer ikke overens med omdirigerings-URIen eller var utstedt til en annen klient.
-        invalid_redirect_uri: Den inkluderte omdirigerings-URLen er ikke gyldig.
+        invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig.
         invalid_request: Forespørslen mangler en eller flere parametere, inkluderte en parameter som ikke støttes eller har feil struktur.
         invalid_resource_owner: Ressurseierens detaljer er ikke gyldige, eller så er det ikke mulig å finne eieren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 90d8f9358..7d18fb2bb 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -38,7 +38,7 @@ pt-BR:
         application: Aplicativos
         callback_url: Link de retorno
         delete: Excluir
-        empty: Não tem aplicações.
+        empty: Você não tem aplicativos.
         name: Nome
         new: Novo aplicativo
         scopes: Autorizações
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 4cd80a4e0..bf414361d 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -60,7 +60,7 @@ sk:
         title: Nastala chyba
       new:
         able_to: Bude môcť
-        prompt: Aplikácia %{client_name} žiada prístup k vašemu účtu
+        prompt: Aplikácia %{client_name} vyžaduje prístup k tvojmu účtu
         title: Je potrebná autorizácia
       show:
         title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
@@ -73,7 +73,7 @@ sk:
         application: Aplikácia
         created_at: Autorizované
         scopes: Oprávnenia
-        title: Vaše autorizované aplikácie
+        title: Tvoje povolené aplikácie
     errors:
       messages:
         access_denied: Prístup zamietnutý.
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index be009af4d..8ca87578b 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -29,7 +29,7 @@ th:
       edit:
         title: แก้ไขแอปพลิเคชัน
       help:
-        native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบในเว็บ
+        native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบในเซิร์ฟเวอร์
         redirect_uri: ใช้หนึ่งบรรทัดต่อ URI
         scopes: แยกขอบเขตด้วยช่องว่าง เว้นว่างไว้เพื่อใช้ขอบเขตเริ่มต้น
       index:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 85c7bc648..e2fe9056b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -51,7 +51,7 @@ el:
   accounts:
     choices_html: 'Επιλογές από %{name}:'
     endorsements_hint: Μπορεις να εγκρίνεις ανθρώπους που ακολουθείς μέσω της δικτυακής εφαρμογής και αυτοί θα εμφανίζονται εδώ.
-    featured_tags_hint: Μπορείς να επιλέξεις συγκεκριμένες ταμπέλες που θα εμφανίζονται εδώ.
+    featured_tags_hint: Μπορείς να επιλέξεις συγκεκριμένες ετικέτες που θα εμφανίζονται εδώ.
     follow: Ακολούθησε
     followers:
       one: Ακόλουθος
@@ -92,6 +92,7 @@ el:
       delete: Διαγραφή
       destroyed_msg: Επιτυχής καταστροφή σημειώματος μεσολάβησης!
     accounts:
+      add_email_domain_block: Εγγραφή τομέα email σε μαύρη λίστα
       approve: Έγκριση
       approve_all: Έγκριση όλων
       are_you_sure: Σίγουρα;
@@ -172,6 +173,7 @@ el:
         staff: Προσωπικό
         user: Χρήστης
       search: Αναζήτηση
+      search_same_email_domain: Άλλοι χρήστες με τον ίδιο τομέα e-mail
       search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP
       shared_inbox_url: URL κοινόχρηστων εισερχομένων
       show:
@@ -193,6 +195,18 @@ el:
       web: Διαδίκτυο
       whitelisted: Εγκεκριμένοι
     action_logs:
+      action_types:
+        change_email_user: Αλλαγή email για χρήστη
+        destroy_status: Διαγραφή Κατάστασης
+        disable_2fa_user: Απενεργοποίηση 2FA
+        disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
+        disable_user: Απενεργοποίηση Χρήστη
+        enable_custom_emoji: Ενεργοποίηση Προσαρμοσμένων Emoji
+        enable_user: Ενεργοποίηση Χρήστη
+        promote_user: Προαγωγή Χρήστη
+        remove_avatar_user: Αφαίρεση Avatar
+        silence_account: Σίγαση Λογαριασμού
+        update_status: Ενημέρωση Κατάστασης
       actions:
         assigned_to_self_report: Ο/Η %{name} ανάθεσε την καταγγελία %{target} στον εαυτό του/της
         change_email_user: Ο/Η %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
@@ -230,6 +244,9 @@ el:
         update_custom_emoji: Ο/Η %{name} ενημέρωσε το emoji %{target}
         update_status: Ο/Η %{name} ενημέρωσε την κατάσταση του/της %{target}
       deleted_status: "(διαγραμμένη δημοσίευση)"
+      empty: Δεν βρέθηκαν αρχεία καταγραφής.
+      filter_by_action: Φιλτράρισμα ανά ενέργεια
+      filter_by_user: Φιλτράρισμα ανά χρήστη
       title: Αρχείο ελέγχου
     announcements:
       destroyed_msg: Επιτυχής διαγραφή ανακοίνωσης!
@@ -292,7 +309,7 @@ el:
       features: Λειτουργίες
       hidden_service: Ομοσπονδία με κρυμμένες υπηρεσίες
       open_reports: ανοιχτές καταγγελίες
-      pending_tags: ταμπέλες προς έγκριση
+      pending_tags: ετικέτες προς έγκριση
       pending_users: χρήστες προς έγκριση
       recent_users: Πρόσφατοι χρήστες
       search: Αναζήτηση πλήρους κειμένου
@@ -358,6 +375,7 @@ el:
       destroyed_msg: Επιτυχής διαγραφή email τομέα από τη μαύρη λίστα
       domain: Τομέας
       empty: Δεν έχουν οριστεί αποκλεισμένοι τομείς email.
+      from_html: από %{domain}
       new:
         create: Πρόσθεση τομέα
         title: Νέα εγγραφή email στη μαύρη λίστα
@@ -532,11 +550,14 @@ el:
         title: Προεπισκόπιση ροής
       title: Ρυθμίσεις ιστότοπου
       trendable_by_default:
-        desc_html: Επηρεάζει τις ταμπέλες που δεν είχαν απαγορευτεί νωρίτερα
-        title: Επέτρεψε στις ταμπέλες να εμφανιστούν στις τάσεις χωρίς προηγούμενη έγκριση
+        desc_html: Επηρεάζει όσες ετικέτες δεν είχαν απαγορευτεί νωρίτερα
+        title: Επέτρεψε στις ετικέτες να εμφανίζονται στις τάσεις χωρίς να χρειάζεται πρώτα έγκριση
       trends:
-        desc_html: Δημόσια εμφάνιση ταμπελών που έχουν ήδη εγκριθεί και είναι δημοφιλείς
-        title: Δημοφιλείς ταμπέλες
+        desc_html: Δημόσια εμφάνιση ετικετών που έχουν ήδη εγκριθεί και είναι δημοφιλείς
+        title: Δημοφιλείς ετικέτες
+    site_uploads:
+      delete: Διαγραφή μεταφορτωμένου αρχείου
+      destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
     statuses:
       back_to_account: Επιστροφή στη σελίδα λογαριασμού
       batch:
@@ -561,19 +582,18 @@ el:
       last_active: Τελευταία δραστηριότητα
       most_popular: Δημοφιλέστερες
       most_recent: Πιο πρόσφατες
-      name: Ταμπέλα
+      name: Ετικέτα
       review: Κατάσταση έγκρισης
       reviewed: Εγκεκριμένες
-      title: Ταμπέλες
+      title: Ετικέτες
       trending_right_now: Δημοφιλείς αυτή τη στιγμή
       unique_uses_today: "%{count} σημερινές δημοσιεύσεις"
       unreviewed: Εκκρεμεί έγκριση
-      updated_msg: Οι ρυθμίσεις των ταμπελών ενημερώθηκαν επιτυχώς
+      updated_msg: Οι ρυθμίσεις των ετικετών ενημερώθηκαν επιτυχώς
     title: Διαχείριση
     warning_presets:
       add_new: Πρόσθεση νέου
       delete: Διαγραφή
-      edit: Ενημέρωση
       edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
       title: Διαχείριση προκαθορισμένων προειδοποιήσεων
   admin_mailer:
@@ -585,8 +605,8 @@ el:
       body_remote: Κάποιος/α από τον τομέα %{domain} κατήγγειλε τον/την %{target}
       subject: Νέα καταγγελία για %{instance} (#%{id})
     new_trending_tag:
-      body: 'Η ταμπέλα #%{name} είναι δημοφιλής σήμερα, αλλά δεν έχει εγκριθεί μέχρι τώρα. Δεν θα εμφανίζεται δημοσίως μέχρι να δοθεί έγκρισή, αλλιώς αποθηκεύστε τη φόρμα ως έχει για να μην την δείτε ξανά.'
-      subject: Νέα ταμπέλα προς έγκριση στο %{instance} (#%{name})
+      body: 'Η ετικέτα #%{name} είναι δημοφιλής σήμερα, αλλά δεν έχει εγκριθεί μέχρι τώρα. Δεν θα εμφανίζεται δημοσίως μέχρι να δοθεί έγκριση, αλλιώς αποθήκευση τη φόρμα ως έχει για να μην την δεις ξανά.'
+      subject: Νέα ετικέτα προς έγκριση στο %{instance} (#%{name})
   aliases:
     add_new: Δημιουργία ψευδώνυμου
     created_msg: Δημιουργήθηκε νέο ψευδώνυμο. Τώρα μπορείς να ξεκινήσεις τη μεταφορά από τον παλιό λογαριασμό.
@@ -595,7 +615,7 @@ el:
     remove: Αφαίρεση ψευδώνυμου
   appearance:
     advanced_web_interface: Προηγμένη λειτουργία χρήσης
-    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές κολώνες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ομοσπονδιακή ροή και όσες λίστες και ταμπέλες θέλεις.'
+    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές κολώνες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ομοσπονδιακή ροή και όσες λίστες και ετικέτες θέλεις.'
     animations_and_accessibility: Κίνηση και προσβασιμότητα
     confirmation_dialogs: Ερωτήσεις επιβεβαίωσης
     discovery: Εξερεύνηση
@@ -661,6 +681,7 @@ el:
     trouble_logging_in: Πρόβλημα σύνδεσης;
   authorize_follow:
     already_following: Ήδη ακολουθείς αυτό το λογαριασμό
+    already_requested: Έχετε ήδη στείλει ένα αίτημα ακολούθησης σε αυτόν τον λογαριασμό
     error: Δυστυχώς παρουσιάστηκε ένα σφάλμα κατά την αναζήτηση του απομακρυσμένου λογαριασμού
     follow: Ακολούθησε
     follow_request: 'Έστειλες αίτημα παρακολούθησης προς:'
@@ -750,8 +771,8 @@ el:
   featured_tags:
     add_new: Προσθήκη νέας
     errors:
-      limit: Έχεις ήδη προσθέσει το μέγιστο αριθμό ταμπελών
-    hint_html: "<strong>Τι είναι οι προβεβλημένες ταμπέλες;</strong> Προβάλλονται στο δημόσιο προφίλ σου επιτρέποντας σε όποιον το βλέπει να χαζέψει τις δημοσιεύσεις που τις χρησιμοποιούν. Είναι ωραίος τρόπος να παρακολουθείς κάποια δημιουργία ή ένα μακροπρόθεσμο έργο."
+      limit: Έχεις ήδη προσθέσει το μέγιστο αριθμό ετικετών
+    hint_html: "<strong>Τι είναι οι προβεβλημένες ετικέτες;</strong> Προβάλλονται στο δημόσιο προφίλ σου επιτρέποντας σε όποιον το βλέπει να χαζέψει τις δημοσιεύσεις που τις χρησιμοποιούν. Είναι ένας ωραίος τρόπος να παρακολουθείς την πορεία μιας δημιουργία ή ενός μακροπρόθεσμου έργου."
   filters:
     contexts:
       account: Προφίλ
@@ -849,6 +870,7 @@ el:
   media_attachments:
     validations:
       images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ενημέρωση που ήδη περιέχει εικόνες
+      not_ready: Δεν μπορούν να επισυναφθούν αρχεία για τα οποία δεν έχει τελειώσει η επεξεργασία. Προσπαθήστε ξανά σε λίγο!
       too_many: Δεν γίνεται να προσθέσεις περισσότερα από 4 αρχεία
   migrations:
     acct: ΌνομαΧρήστη@Τομέας του νέου λογαριασμού
@@ -1044,7 +1066,7 @@ el:
     development: Ανάπτυξη
     edit_profile: Επεξεργασία προφίλ
     export: Εξαγωγή δεδομένων
-    featured_tags: Χαρακτηριστικές ταμπέλες
+    featured_tags: Χαρακτηριστικές ετικέτες
     identity_proofs: Αποδείξεις ταυτοτήτων
     import: Εισαγωγή
     import_and_export: Εισαγωγή & Εξαγωγή
@@ -1068,8 +1090,10 @@ el:
     boosted_from_html: Προωθήθηκε από %{acct_link}
     content_warning: 'Προειδοποίηση περιεχομένου: %{warning}'
     disallowed_hashtags:
-      one: 'περιέχει μη επιτρεπτή ταμπέλα: %{tags}'
-      other: 'περιέχει μη επιτρεπτές ταμπέλες: %{tags}'
+      one: 'περιέχει μη επιτρεπτή ετικέτα: %{tags}'
+      other: περιέχει μη επιτρεπτές ετικέτες %{tags}
+    errors:
+      in_reply_not_found: Η κατάσταση στην οποία προσπαθείτε να απαντήσετε δεν υπάρχει.
     language_detection: Αυτόματη αναγνώριση γλώσσας
     open_in_web: Δες στο διαδίκτυο
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0ec250025..bea07a443 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,6 +92,7 @@ en:
       delete: Delete
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
+      add_email_domain_block: Blacklist e-mail domain
       approve: Approve
       approve_all: Approve all
       are_you_sure: Are you sure?
@@ -172,6 +173,7 @@ en:
         staff: Staff
         user: User
       search: Search
+      search_same_email_domain: Other users with the same e-mail domain
       search_same_ip: Other users with the same IP
       shared_inbox_url: Shared inbox URL
       show:
@@ -193,6 +195,42 @@ en:
       web: Web
       whitelisted: Whitelisted
     action_logs:
+      action_types:
+        assigned_to_self_report: Assign Report
+        change_email_user: Change E-mail for User
+        confirm_user: Confirm User
+        create_account_warning: Create Warning
+        create_announcement: Create Announcement
+        create_custom_emoji: Create Custom Emoji
+        create_domain_allow: Create Domain Allow
+        create_domain_block: Create Domain Block
+        create_email_domain_block: Create E-mail Domain Block
+        demote_user: Demote User
+        destroy_announcement: Delete Announcement
+        destroy_custom_emoji: Delete Custom Emoji
+        destroy_domain_allow: Delete Domain Allow
+        destroy_domain_block: Delete Domain Block
+        destroy_email_domain_block: Delete e-mail domain block
+        destroy_status: Delete Status
+        disable_2fa_user: Disable 2FA
+        disable_custom_emoji: Disable Custom Emoji
+        disable_user: Disable User
+        enable_custom_emoji: Enable Custom Emoji
+        enable_user: Enable User
+        memorialize_account: Memorialize Account
+        promote_user: Promote User
+        remove_avatar_user: Remove Avatar
+        reopen_report: Reopen Report
+        reset_password_user: Reset Password
+        resolve_report: Resolve Report
+        silence_account: Silence Account
+        suspend_account: Suspend Account
+        unassigned_report: Unassign Report
+        unsilence_account: Unsilence Account
+        unsuspend_account: Unsuspend Account
+        update_announcement: Update Announcement
+        update_custom_emoji: Update Custom Emoji
+        update_status: Update Status
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
         change_email_user: "%{name} changed the e-mail address of user %{target}"
@@ -230,6 +268,9 @@ en:
         update_custom_emoji: "%{name} updated emoji %{target}"
         update_status: "%{name} updated status by %{target}"
       deleted_status: "(deleted status)"
+      empty: No logs found.
+      filter_by_action: Filter by action
+      filter_by_user: Filter by user
       title: Audit log
     announcements:
       destroyed_msg: Announcement successfully deleted!
@@ -358,6 +399,7 @@ en:
       destroyed_msg: Successfully deleted e-mail domain from blacklist
       domain: Domain
       empty: No e-mail domains currently blacklisted.
+      from_html: from %{domain}
       new:
         create: Add domain
         title: New e-mail blacklist entry
@@ -537,6 +579,9 @@ en:
       trends:
         desc_html: Publicly display previously reviewed hashtags that are currently trending
         title: Trending hashtags
+    site_uploads:
+      delete: Delete uploaded file
+      destroyed_msg: Site upload successfully deleted!
     statuses:
       back_to_account: Back to account page
       batch:
@@ -573,7 +618,6 @@ en:
     warning_presets:
       add_new: Add new
       delete: Delete
-      edit: Edit
       edit_preset: Edit warning preset
       title: Manage warning presets
   admin_mailer:
@@ -725,7 +769,7 @@ en:
     '422':
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
-    '429': Throttled
+    '429': Too many requests
     '500':
       content: We're sorry, but something went wrong on our end.
       title: This page is not correct
@@ -850,6 +894,7 @@ en:
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a status that already contains images
+      not_ready: Cannot attach files that have not finished processing. Try again in a moment!
       too_many: Cannot attach more than 4 files
   migrations:
     acct: Moved to
@@ -1072,6 +1117,8 @@ en:
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'
       other: 'contained the disallowed hashtags: %{tags}'
+    errors:
+      in_reply_not_found: The status you are trying to reply to does not appear to exist.
     language_detection: Automatically detect language
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 0742559ed..1375ebb33 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -474,7 +474,6 @@ en_GB:
     warning_presets:
       add_new: Add new
       delete: Delete
-      edit: Edit
       edit_preset: Edit warning preset
       title: Manage warning presets
   admin_mailer:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index b3cb2b523..a558efc51 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -33,7 +33,7 @@ eo:
       one: mesaĝo
       other: mesaĝoj
     status_count_before: Kie skribiĝis
-    tagline: Sekvi amikojn kaj trovi novan onin
+    tagline: Sekvi amikojn kaj trovi iujn novajn
     terms: Uzkondiĉoj
     unavailable_content: Nedisponebla enhavo
     unavailable_content_description:
@@ -557,7 +557,6 @@ eo:
     warning_presets:
       add_new: Aldoni novan
       delete: Forigi
-      edit: Redakti
       edit_preset: Redakti avertan antaŭagordon
       title: Administri avertajn antaŭagordojn
   admin_mailer:
@@ -819,11 +818,12 @@ eo:
       images_and_video: Aldoni videon al mesaĝo, kiu jam havas bildojn ne eblas
       too_many: Aldoni pli ol 4 dosierojn ne eblas
   migrations:
-    acct: uzantnomo@domajno de la nova konto
+    acct: Movigita al
     cancel: Nuligi alidirekton
     cancelled_msg: Sukcese forigis la alidirekton.
     errors:
       already_moved: estas la saman konton vi jam translokiĝis al
+      missing_also_known_as: ne returne referencas al ĉi tiu konto
       move_to_self: ne povas esti nuna konto
       not_found: ne povis trovi
       on_cooldown: Vi estas ĉe malvarmiĝi
@@ -907,11 +907,16 @@ eo:
     other: Aliaj aferoj
     posting_defaults: Afiŝadoj defaŭltoj
     public_timelines: Publikaj templinioj
+  reactions:
+    errors:
+      limit_reached: Limito de malsamaj reagoj atinginta
+      unrecognized_emoji: ne estas rekonita emoĝio
   relationships:
     activity: Konta aktiveco
     dormant: Dormanta
     followers: Sekvantoj
     following: Sekvatoj
+    invited: Invitita
     last_active: Laste aktiva
     most_recent: Plej lasta
     moved: Moviĝita
@@ -1035,7 +1040,7 @@ eo:
         one: "%{count} voĉdono"
         other: "%{count} voĉdonoj"
       vote: Voĉdoni
-    show_more: Montri pli
+    show_more: Malfoldi
     show_thread: Montri la fadenon
     sign_in_to_participate: Ensaluti por partopreni en la konversacio
     title: "%{name}: “%{quote}”"
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 6eec00cb6..b71ea5f39 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -92,6 +92,7 @@ es-AR:
       delete: Eliminar
       destroyed_msg: "¡Nota de moderación destruída exitosamente!"
     accounts:
+      add_email_domain_block: Desaprobar el dominio del correo electrónico
       approve: Aprobar
       approve_all: Aprobar todas
       are_you_sure: "¿Estás seguro?"
@@ -172,6 +173,7 @@ es-AR:
         staff: Equipo
         user: Usuario
       search: Buscar
+      search_same_email_domain: Otros usuarios con el mismo dominio de correo electrónico
       search_same_ip: Otros usuarios con la misma dirección IP
       shared_inbox_url: Dirección web de la bandeja de entrada compartida
       show:
@@ -193,6 +195,42 @@ es-AR:
       web: Web
       whitelisted: Aprobadas
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar denuncia
+        change_email_user: Cambiar correo electrónico del usuario
+        confirm_user: Confirmar usuario
+        create_account_warning: Crear advertencia
+        create_announcement: Crear anuncio
+        create_custom_emoji: Crear emoji personalizado
+        create_domain_allow: Crear permiso de dominio
+        create_domain_block: Crear bloqueo de dominio
+        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
+        demote_user: Descender usuario
+        destroy_announcement: Eliminar anuncio
+        destroy_custom_emoji: Eliminar emoji personalizado
+        destroy_domain_allow: Eliminar permiso de dominio
+        destroy_domain_block: Eliminar bloquedo de dominio
+        destroy_email_domain_block: Eliminar bloquedo de dominio de correo electrónico
+        destroy_status: Eliminar estado
+        disable_2fa_user: Deshabilitar 2FA
+        disable_custom_emoji: Deshabilitar emoji personalizado
+        disable_user: Deshabilitar usuario
+        enable_custom_emoji: Habilitar emoji personalizado
+        enable_user: Habilitar usuario
+        memorialize_account: Volver cuenta conmemorativa
+        promote_user: Promover usuario
+        remove_avatar_user: Quitar avatar
+        reopen_report: Reabrir denuncia
+        reset_password_user: Cambiar contraseña
+        resolve_report: Resolver denuncia
+        silence_account: Silenciar cuenta
+        suspend_account: Suspender cuenta
+        unassigned_report: Desasignar denuncia
+        unsilence_account: Dejar de silenciar cuenta
+        unsuspend_account: Dejar de suspender cuenta
+        update_announcement: Actualizar anuncio
+        update_custom_emoji: Actualizar emoji personalizado
+        update_status: Actualizar estado
       actions:
         assigned_to_self_report: "%{name} se asignó la denuncia %{target} a sí"
         change_email_user: "%{name} cambió la dirección de correo electrónico del usuario %{target}"
@@ -230,6 +268,9 @@ es-AR:
         update_custom_emoji: "%{name} actualizó el emoji %{target}"
         update_status: "%{name} actualizó el estado de %{target}"
       deleted_status: "(estado borrado)"
+      empty: No se encontraron registros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Registro de auditoría
     announcements:
       destroyed_msg: "¡Anuncio eliminado exitosamente!"
@@ -358,6 +399,7 @@ es-AR:
       destroyed_msg: Se aprobó dominio de correo electrónico exitosamente
       domain: Dominio
       empty: Actualmente no hay dominios de correo electrónico desaprobados.
+      from_html: de %{domain}
       new:
         create: Agregar dominio
         title: Nueva desaprobación de correo electrónico
@@ -537,6 +579,9 @@ es-AR:
       trends:
         desc_html: Mostrar públicamente etiquetas previamente revisadas que son tendencia actualmente
         title: Etiquetas tendencias
+    site_uploads:
+      delete: Eliminar archivo subido
+      destroyed_msg: "¡Subida al sitio eliminada exitosamente!"
     statuses:
       back_to_account: Volver a la página de la cuenta
       batch:
@@ -573,7 +618,6 @@ es-AR:
     warning_presets:
       add_new: Agregar nuevo
       delete: Eliminar
-      edit: Editar
       edit_preset: Editar preajuste de advertencia
       title: Administrar preajustes de advertencia
   admin_mailer:
@@ -661,6 +705,7 @@ es-AR:
     trouble_logging_in: "¿Tenés problemas para iniciar sesión?"
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
+    already_requested: Ya enviaste una solicitud de seguimiento a esa cuenta
     error: Lamentablemente, ocurrió un error buscando la cuenta remota
     follow: Seguir
     follow_request: 'Enviaste una solicitud de seguimiento a:'
@@ -849,6 +894,7 @@ es-AR:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+      not_ready: No se pueden adjuntar archivos que no terminaron de procesarse. ¡Intentá de nuevo en un rato!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
     acct: Mudada a
@@ -1070,6 +1116,8 @@ es-AR:
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
       other: 'contenía las etiquetas no permitidas: %{tags}'
+    errors:
+      in_reply_not_found: El estado al que intentás responder no existe.
     language_detection: Detectar idioma automáticamente
     open_in_web: Abrir en web
     over_character_limit: se excedió el límite de %{max} caracteres
@@ -1099,7 +1147,7 @@ es-AR:
       unlisted_long: Todos pueden ver, pero no está listado en las líneas temporales públicas
   stream_entries:
     pinned: Toot fijado
-    reblogged: retooteado
+    reblogged: retooteó
     sensitive_content: Contenido sensible
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a26143018..fac96aadf 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -92,6 +92,7 @@ es:
       delete: Borrar
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
+      add_email_domain_block: Poner en lista negra el dominio del correo
       approve: Aprobar
       approve_all: Aprobar todos
       are_you_sure: "¿Estás seguro?"
@@ -172,6 +173,7 @@ es:
         staff: Personal
         user: Usuario
       search: Buscar
+      search_same_email_domain: Otros usuarios con el mismo dominio de correo
       search_same_ip: Otros usuarios con la misma IP
       shared_inbox_url: URL de bandeja compartida
       show:
@@ -193,6 +195,42 @@ es:
       web: Web
       whitelisted: Añadido a la lista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar Reporte
+        change_email_user: Cambiar Correo Electrónico del Usuario
+        confirm_user: Confirmar Usuario
+        create_account_warning: Crear Advertencia
+        create_announcement: Crear Anuncio
+        create_custom_emoji: Crear Emoji Personalizado
+        create_domain_allow: Crear Permiso de Dominio
+        create_domain_block: Crear Bloqueo de Dominio
+        create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
+        demote_user: Degradar Usuario
+        destroy_announcement: Eliminar Anuncio
+        destroy_custom_emoji: Eliminar Emoji Personalizado
+        destroy_domain_allow: Eliminar Permiso de Dominio
+        destroy_domain_block: Eliminar Bloqueo de Dominio
+        destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+        destroy_status: Eliminar Estado
+        disable_2fa_user: Deshabilitar 2FA
+        disable_custom_emoji: Deshabilitar Emoji Personalizado
+        disable_user: Deshabilitar Usuario
+        enable_custom_emoji: Habilitar Emoji Personalizado
+        enable_user: Habilitar Usuario
+        memorialize_account: Transformar en Cuenta Conmemorativa
+        promote_user: Promover Usuario
+        remove_avatar_user: Eliminar Avatar
+        reopen_report: Reabrir Reporte
+        reset_password_user: Restablecer Contraseña
+        resolve_report: Resolver Reporte
+        silence_account: Silenciar Cuenta
+        suspend_account: Suspender Cuenta
+        unassigned_report: Desasignar Reporte
+        unsilence_account: Dejar de Silenciar Cuenta
+        unsuspend_account: Dejar de Suspender Cuenta
+        update_announcement: Actualizar Anuncio
+        update_custom_emoji: Actualizar Emoji Personalizado
+        update_status: Actualizar Estado
       actions:
         assigned_to_self_report: "%{name} se ha asignado la denuncia %{target} a sí mismo"
         change_email_user: "%{name} ha cambiado la dirección de correo del usuario %{target}"
@@ -230,6 +268,9 @@ es:
         update_custom_emoji: "%{name} actualizó el emoji %{target}"
         update_status: "%{name} actualizó el estado de %{target}"
       deleted_status: "(estado borrado)"
+      empty: No se encontraron registros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Log de auditoría
     announcements:
       destroyed_msg: "¡Anuncio eliminado con éxito!"
@@ -358,6 +399,7 @@ es:
       destroyed_msg: Dominio de correo borrado de la lista negra con éxito
       domain: Dominio
       empty: Actualmente no hay dominios de correo electrónico en la lista negra.
+      from_html: de %{domain}
       new:
         create: Añadir dominio
         title: Nueva entrada en la lista negra de correo
@@ -537,6 +579,9 @@ es:
       trends:
         desc_html: Mostrar públicamente hashtags previamente revisados que son tendencia
         title: Hashtags de tendencia
+    site_uploads:
+      delete: Eliminar archivo subido
+      destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     statuses:
       back_to_account: Volver a la cuenta
       batch:
@@ -573,7 +618,6 @@ es:
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
-      edit: Editar
       edit_preset: Editar aviso predeterminado
       title: Editar configuración predeterminada de avisos
   admin_mailer:
@@ -661,6 +705,7 @@ es:
     trouble_logging_in: "¿Problemas para iniciar sesión?"
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
+    already_requested: Ya has enviado una solicitud de seguimiento a esa cuenta
     error: Desafortunadamente, ha ocurrido un error buscando la cuenta remota
     follow: Seguir
     follow_request: 'Tienes una solicitud de seguimiento de:'
@@ -849,6 +894,7 @@ es:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+      not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
     acct: username@domain de la nueva cuenta
@@ -1070,6 +1116,8 @@ es:
     disallowed_hashtags:
       one: 'contenía un hashtag no permitido: %{tags}'
       other: 'contenía los hashtags no permitidos: %{tags}'
+    errors:
+      in_reply_not_found: El estado al que intentas responder no existe.
     language_detection: Detección automática de idioma
     open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 716da9010..8e3d56622 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -576,7 +576,6 @@ et:
     warning_presets:
       add_new: Lisa uus
       delete: Kustuta
-      edit: Redigeeri
       edit_preset: Redigeeri hoiatuse eelseadistust
       title: Halda hoiatuste eelseadistusi
   admin_mailer:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 3ca68d321..4c81c1617 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -72,8 +72,8 @@ eu:
     posts:
       one: Toot
       other: Toot
-    posts_tab_heading: Toot-ak
-    posts_with_replies: Toot-ak eta erantzunak
+    posts_tab_heading: Tootak
+    posts_with_replies: Tootak eta erantzunak
     reserved_username: Erabiltzaile-izena erreserbatuta dago
     roles:
       admin: Administratzailea
@@ -92,6 +92,7 @@ eu:
       delete: Ezabatu
       destroyed_msg: Moderazio ohara ongi suntsitu da!
     accounts:
+      add_email_domain_block: Sartu domeinua zerrenda beltzean
       approve: Onartu
       approve_all: Onartu denak
       are_you_sure: Ziur zaude?
@@ -172,6 +173,7 @@ eu:
         staff: Langilea
         user: Erabiltzailea
       search: Bilatu
+      search_same_email_domain: E-mail domeinu bera duten beste erabiltzailean
       search_same_ip: IP bera duten beste erabiltzaileak
       shared_inbox_url: Partekatutako sarrera ontziaren URL-a
       show:
@@ -358,6 +360,7 @@ eu:
       destroyed_msg: Ongi ezabatu da e-mail domeinua zerrenda beltzetik
       domain: Domeinua
       empty: Ez dago e-mail domeinurik zerrenda beltzean.
+      from_html: "%{domain} domeinutik"
       new:
         create: Gehitu domeinua
         title: Sarrera berria e-mail zerrenda beltzean
@@ -503,7 +506,7 @@ eu:
           open: Edonork eman dezake izena
         title: Erregistratzeko modua
       show_known_fediverse_at_about_page:
-        desc_html: Txandakatzean, fedibertso ezagun osoko toot-ak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko.
+        desc_html: Txandakatzean, fedibertso ezagun osoko tootak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko
         title: Erakutsi fedibertsu ezagun osoko denbora-lerroa aurrebistan
       show_staff_badge:
         desc_html: Erakutsi langile banda erabiltzailearen orrian
@@ -537,6 +540,9 @@ eu:
       trends:
         desc_html: Erakutsi publikoki orain joeran dauden aurretik errebisatutako traolak
         title: Traolak joeran
+    site_uploads:
+      delete: Ezabatu igotako fitxategia
+      destroyed_msg: Guneko igoera ongi ezabatu da!
     statuses:
       back_to_account: Atzera kontuaren orrira
       batch:
@@ -573,7 +579,6 @@ eu:
     warning_presets:
       add_new: Gehitu berria
       delete: Ezabatu
-      edit: Editatu
       edit_preset: Editatu abisu aurre-ezarpena
       title: Kudeatu abisu aurre-ezarpenak
   admin_mailer:
@@ -661,6 +666,7 @@ eu:
     trouble_logging_in: Arazoak saioa hasteko?
   authorize_follow:
     already_following: Kontu hau aurretik jarraitzen duzu
+    already_requested: Bidali duzu dagoeneko kontu hori jarraitzeko eskaera bat
     error: Zoritxarrez, urruneko kontua bilatzean errore bat gertatu da
     follow: Jarraitu
     follow_request: 'Jarraitzeko eskari bat bidali duzu hona:'
@@ -849,6 +855,7 @@ eu:
   media_attachments:
     validations:
       images_and_video: Ezin da irudiak dituen mezu batean bideo bat erantsi
+      not_ready: Ezin dira prozesatzen amaitu gabeko fitxategiak erantsi. Saiatu geroago!
       too_many: Ezin dira 4 fitxategi baino gehiago erantsi
   migrations:
     acct: Kontu berriaren erabiltzaile@domeinua
@@ -1076,7 +1083,7 @@ eu:
     pin_errors:
       limit: Gehienez finkatu daitekeen toot kopurua finkatu duzu jada
       ownership: Ezin duzu beste norbaiten toot bat finkatu
-      private: Ezin dira publikoak ez diren toot-ak finkatu
+      private: Ezin dira publikoak ez diren tootak finkatu
       reblog: Bultzada bat ezin da finkatu
     poll:
       total_people:
@@ -1098,7 +1105,7 @@ eu:
       unlisted: Zerrendatu gabea
       unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
   stream_entries:
-    pinned: Finkatutako toot-a
+    pinned: Finkatutako toota
     reblogged: "(r)en bultzada"
     sensitive_content: 'Kontuz: Eduki hunkigarria'
   tags:
@@ -1218,7 +1225,7 @@ eu:
     warning:
       explanation:
         disable: Zure kontua izoztuta dagoen bitartean, zure kontua bere horretan dirau, baina ezin duzu ekintzarik burutu desblokeatzen den arte.
-        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure Toot-ak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
+        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure tootak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
         suspend: Zure kontua kanporatua izan da, zure toot guztiak eta multimedia fitxategiak behin betiko ezabatu dira zerbitzari honetatik, eta zure jarraitzaileen zerbitzarietatik.
       get_in_touch: "%{instance} instantziako jendearekin harremanetan jartzeko e-mail honi erantzun ahal diozu."
       review_server_policies: Berrikusi zerbitzariko politikak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 02bbd2938..868dd8bcf 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -94,6 +94,7 @@ fa:
       delete: حذف
       destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
     accounts:
+      add_email_domain_block: مسدود کردن دامنهٔ رایانامه
       approve: پذیرفتن
       approve_all: پذیرفتن همه
       are_you_sure: مطمئنید؟
@@ -174,6 +175,7 @@ fa:
         staff: کارمند
         user: کاربر
       search: جستجو
+      search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
       search_same_ip: دیگر کاربران با IP یکسان
       shared_inbox_url: نشانی صندوق ورودی مشترک
       show:
@@ -195,6 +197,41 @@ fa:
       web: وب
       whitelisted: فهرست مجاز
     action_logs:
+      action_types:
+        assigned_to_self_report: واگذاری گزارش
+        change_email_user: تغییر رایانامه برای کاربر
+        confirm_user: تأیید کاربر
+        create_account_warning: ایجاد هشدار
+        create_announcement: ایجاد اعلامیه
+        create_custom_emoji: ایجاد اموجی سفارشی
+        create_domain_allow: ایجاد اجازهٔ دامنه
+        create_domain_block: ایجاد انسداد دامنه
+        create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
+        demote_user: تنزل کاربر
+        destroy_announcement: حذف اعلامیه
+        destroy_custom_emoji: حذف اموجی سفارشی
+        destroy_domain_allow: حذف اجازهٔ دامنه
+        destroy_domain_block: حذف انسداد دامنه
+        destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
+        destroy_status: حذف وضعیت
+        disable_2fa_user: از کار انداختن ورود دومرحله‌ای
+        disable_custom_emoji: از کار انداختن اموجی سفارشی
+        disable_user: از کار انداختن کاربر
+        enable_custom_emoji: به کار انداختن اموجی سفارشی
+        enable_user: به کار انداختن کاربر
+        promote_user: ترفیع کاربر
+        remove_avatar_user: برداشتن تصویر نمایه
+        reopen_report: بازگشایی گزارش
+        reset_password_user: بازنشانی گذرواژه
+        resolve_report: رفع گزارش
+        silence_account: خموشی حساب
+        suspend_account: تعلیق حساب
+        unassigned_report: رفع واگذاری گزارش
+        unsilence_account: رفع خموشی حساب
+        unsuspend_account: رفع تعلیق حساب
+        update_announcement: به‌روز رسانی اعلامیه
+        update_custom_emoji: به‌روز رسانی اموجی سفارشی
+        update_status: به‌روز رسانی وضعیت
       actions:
         assigned_to_self_report: "%{name} رسیدگی به گزارش %{target} را به عهده گرفت"
         change_email_user: "%{name} نشانی ایمیل کاربر %{target} را تغییر داد"
@@ -232,6 +269,9 @@ fa:
         update_custom_emoji: "%{name} شکلک %{target} را به‌روز کرد"
         update_status: "%{name} نوشتهٔ %{target} را به‌روز کرد"
       deleted_status: "(نوشتهٔ پاک‌شده)"
+      empty: هیچ گزارشی پیدا نشد.
+      filter_by_action: پالایش بر اساس کنش
+      filter_by_user: پالایش بر اساس کاربر
       title: سیاههٔ بازرسی
     announcements:
       destroyed_msg: اعلامیه با موفقیت حذف شد!
@@ -360,6 +400,7 @@ fa:
       destroyed_msg: مسدودسازی دامین ایمیل با موفقیت پاک شد
       domain: دامین
       empty: هیچ دامنه ایمیلی در حال حاضر در لیست‌سیاه قرار نگرفته است.
+      from_html: از %{domain}
       new:
         create: ساختن مسدودسازی
         title: مسدودسازی دامین ایمیل تازه
@@ -539,6 +580,9 @@ fa:
       trends:
         desc_html: برچسب‌های عمومی که پیش‌تر بازبینی شده‌اند و هم‌اینک پرطرفدارند
         title: برچسب‌های پرطرفدار
+    site_uploads:
+      delete: پرونده بارگذاری شده را پاک کنید
+      destroyed_msg: بارگذاری پایگاه با موفقیت حذف شد!
     statuses:
       back_to_account: بازگشت به صفحهٔ حساب
       batch:
@@ -575,7 +619,6 @@ fa:
     warning_presets:
       add_new: افزودن تازه
       delete: زدودن
-      edit: ویرایش
       edit_preset: ویرایش هشدار پیش‌فرض
       title: مدیریت هشدارهای پیش‌فرض
   admin_mailer:
@@ -663,6 +706,7 @@ fa:
     trouble_logging_in: برای ورود مشکلی دارید؟
   authorize_follow:
     already_following: شما همین الان هم این حساب را پی‌می‌گیرید
+    already_requested: درخواست پی‌گیری‌ای برای آن حساب فرستاده‌ بودید
     error: متأسفانه حین یافتن آن حساب خطایی رخ داد
     follow: پی بگیرید
     follow_request: 'شما درخواست پیگیری فرستاده‌اید به:'
@@ -762,16 +806,16 @@ fa:
       public: فهرست عمومی
       thread: گفتگوها
     edit:
-      title: ویرایش فیلتر
+      title: ویرایش پالایه
     errors:
       invalid_context: زمینه‌ای موجود نیست یا نامعتبر است
-      invalid_irreversible: فیلترهای برگشت‌ناپذیر تنها در زمینهٔ پیگیری‌ها یا اعلان‌ها کار می‌کنند
+      invalid_irreversible: پالایش برگشت‌ناپذیر تنها در زمینهٔ خانه یا آگاهی‌ها کار می‌کنند
     index:
       delete: پاک‌کردن
-      empty: شما هیچ فیلتری ندارید.
-      title: فیلترها
+      empty: هیچ پالایه‌ای ندارید.
+      title: پالایه‌ها
     new:
-      title: افزودن فیلتر تازه
+      title: افزودن پالایهٔ جدید
   footer:
     developers: برنامه‌نویسان
     more: بیشتر…
@@ -851,6 +895,7 @@ fa:
   media_attachments:
     validations:
       images_and_video: نمی‌توان برای نوشته‌ای که تصویر دارد ویدیو بارگذاری کرد
+      not_ready: پرونده‌هایی که پردازش را تمام نکرده‌اند نمی‌توانند پیوست شوند. یکبار دیگر امتحان کنید!
       too_many: نمی‌توان بیشتر از ۴ تصویر بارگذاری کرد
   migrations:
     acct: username@domain حساب تازه
@@ -1072,6 +1117,8 @@ fa:
     disallowed_hashtags:
       one: 'دارای هشتگ غیرمجاز: %{tags}'
       other: 'دارای هشتگ‌های غیرمجاز: %{tags}'
+    errors:
+      in_reply_not_found: به نظر نمی‌رسد وضعیتی که می‌خواهید به آن پاسخ دهید، وجود داشته باشد.
     language_detection: زبان نوشته خودبه‌خود شناخته شود
     open_in_web: بازکردن در وب
     over_character_limit: از حد مجاز %{max} حرف فراتر رفتید
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 063e3bb91..c5703e596 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -17,11 +17,13 @@ fi:
     hosted_on: Mastodon palvelimella %{domain}
     learn_more: Lisätietoja
     privacy_policy: Tietosuojaseloste
+    server_stats: 'Palvelimen tilastot:'
     source_code: Lähdekoodi
     status_count_after:
       one: tila
       other: tilanne
     status_count_before: He ovat luoneet
+    tagline: Seuraa ja löydä uusia kavereita
     terms: Käyttöehdot
     unavailable_content_description:
       domain: Palvelin
@@ -59,6 +61,7 @@ fi:
     roles:
       admin: Ylläpitäjä
       bot: Botti
+      group: Ryhmä
       moderator: Moderaattori
     unavailable: Profiili ei saatavilla
     unfollow: Lopeta seuraaminen
@@ -190,19 +193,27 @@ fi:
         update_custom_emoji: "%{name} päivitti emojin %{target}"
         update_status: "%{name} päivitti käyttäjän %{target} tilan"
       title: Auditointiloki
+    announcements:
+      title: Ilmoitukset
     custom_emojis:
+      assign_category: Aseta kategoria
       by_domain: Verkkotunnus
       copied_msg: Emojin paikallisen kopion luonti onnistui
       copy: Kopioi
       copy_failed_msg: Emojista ei voitu tehdä paikallista kopiota
+      create_new_category: Luo uusi kategoria
       created_msg: Emojin luonti onnistui!
       delete: Poista
       destroyed_msg: Emojon poisto onnistui!
       disable: Poista käytöstä
+      disabled: Ei käytössä
       disabled_msg: Emojin poisto käytöstä onnistui
+      emoji: Emoji
       enable: Ota käyttöön
+      enabled: Käytössä
       enabled_msg: Emojin käyttöönotto onnistui
       image_hint: PNG enintään 50 kt
+      list: Listaa
       listed: Listassa
       new:
         title: Lisää uusi mukautettu emoji
@@ -210,12 +221,20 @@ fi:
       shortcode: Lyhennekoodi
       shortcode_hint: Vähintään kaksi merkkiä, vain kirjaimia, numeroita ja alaviivoja
       title: Mukautetut emojit
+      uncategorized: Luokittelemattomat
+      unlist: Poista listalta
       unlisted: Ei listassa
       update_failed_msg: Emojin päivitys epäonnistui
       updated_msg: Emojin päivitys onnistui!
       upload: Lähetä
     dashboard:
       authorized_fetch_mode: Suojattu tila
+      config: Asetukset
+      feature_deletions: Tilien poistot
+      feature_invites: Kutsulinkit
+      feature_profile_directory: Profiilihakemisto
+      feature_registrations: Rekisteröitymiset
+      title: Hallintapaneeli
     domain_blocks:
       add_new: Lisää uusi
       created_msg: Verkkotunnuksen estoa käsitellään
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index bf79bc0ff..1b259d7c9 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,7 +4,7 @@ fr:
     about_hashtag_html: Voici les pouets tagués avec <strong>#%{hashtag}</strong>. Vous pouvez interagir avec eux si vous avez un compte n’importe où dans le Fédiverse.
     about_mastodon_html: 'Le réseau social de l''avenir : Pas d''annonces, pas de surveillance institutionnelle, conception éthique et décentralisation ! Possédez vos données avec Mastodon !'
     about_this: À propos
-    active_count_after: actif·ve
+    active_count_after: actif·ve·s
     active_footnote: Utilisateur·rice·s actif·ve·s mensuels (MAU)
     administered_by: 'Administrée par :'
     api: API
@@ -25,7 +25,7 @@ fr:
       Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un utilisateur individuel.
       Il est utilisé à des fins de fédération et ne doit pas être bloqué à moins que vous ne vouliez bloquer l’instance entière, dans ce cas vous devriez utiliser un bloqueur de domaine.
     learn_more: En savoir plus
-    privacy_policy: Politique de vie privée
+    privacy_policy: Politique de confidentialité
     see_whats_happening: Voir ce qui se passe
     server_stats: 'Statistiques du serveur :'
     source_code: Code source
@@ -40,25 +40,25 @@ fr:
       domain: Serveur
       reason: Motif
       rejecting_media: 'Les fichiers média de ces serveurs ne seront pas traités ou stockés et aucune miniature ne sera affichée, nécessitant un clic vers le fichier d’origine :'
-      silenced: 'Les messages de ces serveurs seront cachés des flux publics et conversations, et les interactions de leurs utilisateur·ice·s ne donneront lieu à aucune notification, à moins que vous ne les suiviez :'
-      suspended: 'Aucune donnée venant de ces serveurs ne sera traitée, stockée ou échangée, rendant toute interaction ou communication avec les utilisateurs de ces serveurs impossible :'
-    unavailable_content_html: Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateurs de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.
+      silenced: 'Les messages de ces serveurs seront cachés des flux publics et conversations, et les interactions de leurs utilisateur·rice·s ne donneront lieu à aucune notification, à moins que vous ne les suiviez :'
+      suspended: 'Aucune donnée venant de ces serveurs ne sera traitée, stockée ou échangée, rendant toute interaction ou communication avec les utilisateur·rice·s de ces serveurs impossible :'
+    unavailable_content_html: Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur·rice·s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.
     user_count_after:
-      one: utilisateur
-      other: utilisateurs
+      one: utilisateur·rice
+      other: utilisateur·rice·s
     user_count_before: Abrite
     what_is_mastodon: Qu’est-ce que Mastodon ?
   accounts:
     choices_html: "%{name} recommande :"
     endorsements_hint: Vous pouvez recommander des personnes que vous suivez depuis l’interface web, et elles apparaîtront ici.
-    featured_tags_hint: Vous pouvez recommander des hashtags spécifiques qui seront affichés ici.
+    featured_tags_hint: Vous pouvez mettre en avant certains hashtags qui seront affichés ici.
     follow: Suivre
     followers:
       one: Abonné·e
-      other: Abonné⋅e⋅s
+      other: Abonné·e·s
     following: Abonnements
     joined: Inscrit·e en %{date}
-    last_active: actif·ve dernièrement
+    last_active: dernière activité
     link_verified_on: La propriété de ce lien a été vérifiée le %{date}
     media: Médias
     moved_html: "%{name} a changé de compte pour %{new_profile_link} :"
@@ -74,7 +74,7 @@ fr:
       other: Pouets
     posts_tab_heading: Pouets
     posts_with_replies: Pouets & réponses
-    reserved_username: Ce nom d’utilisateur⋅ice est réservé
+    reserved_username: Ce nom d’utilisateur·ice est réservé
     roles:
       admin: Admin
       bot: Robot
@@ -92,9 +92,10 @@ fr:
       delete: Supprimer
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
+      add_email_domain_block: Mettre le domaine du courriel sur liste noire
       approve: Approuver
       approve_all: Tout approuver
-      are_you_sure: Êtes-vous certain⋅e ?
+      are_you_sure: Voulez-vous vraiment faire ça ?
       avatar: Avatar
       by_domain: Domaine
       change_email:
@@ -119,7 +120,7 @@ fr:
       email_status: État du courriel
       enable: Activer
       enabled: Activé
-      followers: Abonné⋅e⋅s
+      followers: Abonné·e·s
       follows: Abonnements
       header: Entête
       inbox_url: URL d’entrée
@@ -159,7 +160,7 @@ fr:
       remove_avatar: Supprimer l’avatar
       remove_header: Supprimer l’entête
       resend_confirmation:
-        already_confirmed: Cet·te utilisateur·ice est déjà confirmé·e
+        already_confirmed: Cet·te utilisateur·rice est déjà confirmé·e
         send: Renvoyer un courriel de confirmation
         success: Courriel de confirmation envoyé avec succès !
       reset: Réinitialiser
@@ -172,6 +173,7 @@ fr:
         staff: Équipe
         user: Utilisateur
       search: Rechercher
+      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       shared_inbox_url: URL de la boite de réception partagée
       show:
@@ -188,35 +190,71 @@ fr:
       undo_silenced: Démasquer
       undo_suspension: Annuler la suspension
       unsubscribe: Se désabonner
-      username: Nom d’utilisateur⋅ice
+      username: Nom d’utilisateur·ice
       warn: Avertissement
       web: Web
       whitelisted: Sur liste blanche
     action_logs:
+      action_types:
+        assigned_to_self_report: Affecter le signalement
+        change_email_user: Modifier le courriel pour
+        confirm_user: Confirmer l’utilisateur
+        create_account_warning: Créer une alerte
+        create_announcement: Créer une annonce
+        create_custom_emoji: Créer des émojis personnalisés
+        create_domain_allow: Créer un domaine autorisé
+        create_domain_block: Créer un blocage de domaine
+        create_email_domain_block: Créer un blocage de domaine de courriel
+        demote_user: Rétrograder l’utilisateur·ice
+        destroy_announcement: Supprimer l’annonce
+        destroy_custom_emoji: Supprimer des émojis personnalisés
+        destroy_domain_allow: Supprimer le domaine autorisé
+        destroy_domain_block: Supprimer le blocage de domaine
+        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
+        destroy_status: Supprimer le statut
+        disable_2fa_user: Désactiver l’A2F
+        disable_custom_emoji: Désactiver les émojis personnalisés
+        disable_user: Désactiver l’utilisateur·ice
+        enable_custom_emoji: Activer les émojis personnalisées
+        enable_user: Activer l’utilisateur
+        memorialize_account: Mémorialiser le compte
+        promote_user: Promouvoir l’utilisateur
+        remove_avatar_user: Supprimer l’avatar
+        reopen_report: Rouvrir le signalement
+        reset_password_user: Réinitialiser le mot de passe
+        resolve_report: Résoudre le signalement
+        silence_account: Rendre le compte silencieux
+        suspend_account: Suspendre le compte
+        unassigned_report: Ne plus assigner le signalement
+        unsilence_account: Désactiver le silence du compte
+        unsuspend_account: Annuler la suspension du compte
+        update_announcement: Modifier l’annonce
+        update_custom_emoji: Mettre à jour les émojis personnalisés
+        update_status: Mettre à jour le statut
       actions:
         assigned_to_self_report: "%{name} s’est assigné·e le signalement de %{target}"
         change_email_user: "%{name} a modifié l’adresse de courriel de l’utilisateur·rice %{target}"
-        confirm_user: "%{name} adresse courriel confirmée de l’utilisateur·ice %{target}"
+        confirm_user: "%{name} adresse courriel confirmée pour l’utilisateur·rice %{target}"
         create_account_warning: "%{name} a envoyé un avertissement à %{target}"
         create_announcement: "%{name} a créé une nouvelle annonce %{target}"
         create_custom_emoji: "%{name} a importé de nouveaux émojis %{target}"
         create_domain_allow: "%{name} a inscrit le domaine %{target} sur liste blanche"
         create_domain_block: "%{name} a bloqué le domaine %{target}"
         create_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste noire"
-        demote_user: "%{name} a rétrogradé l’utilisateur·ice %{target}"
+        demote_user: "%{name} a rétrogradé l’utilisateur·rice %{target}"
         destroy_announcement: "%{name} a supprimé l’annonce %{target}"
         destroy_custom_emoji: "%{name} a détruit l’émoticône %{target}"
         destroy_domain_allow: "%{name} a supprimé le domaine %{target} de la liste blanche"
         destroy_domain_block: "%{name} a débloqué le domaine %{target}"
         destroy_email_domain_block: "%{name} a mis le domaine de courriel %{target} sur liste blanche"
         destroy_status: "%{name} a enlevé le statut de %{target}"
-        disable_2fa_user: "%{name} a désactivé l’authentification à deux facteurs pour l’utilisateur·ice %{target}"
+        disable_2fa_user: "%{name} a désactivé l’authentification à deux facteurs pour l’utilisateur·rice %{target}"
         disable_custom_emoji: "%{name} a désactivé l’émoji %{target}"
-        disable_user: "%{name} a désactivé le login pour l’utilisateur·ice %{target}"
+        disable_user: "%{name} a désactivé la connexion pour l’utilisateur·rice %{target}"
         enable_custom_emoji: "%{name} a activé l’émoji %{target}"
-        enable_user: "%{name} a activé le login pour l’utilisateur·ice %{target}"
+        enable_user: "%{name} a activé la connexion pour l’utilisateur·rice %{target}"
         memorialize_account: "%{name} a transformé le compte de %{target} en une page de mémorial"
-        promote_user: "%{name} a promu l’utilisateur·ice %{target}"
+        promote_user: "%{name} a promu l’utilisateur·rice %{target}"
         remove_avatar_user: "%{name} a supprimé l’avatar de %{target}"
         reopen_report: "%{name} a rouvert le signalement %{target}"
         reset_password_user: "%{name} a réinitialisé le mot de passe de %{target}"
@@ -230,6 +268,9 @@ fr:
         update_custom_emoji: "%{name} a mis à jour l’émoji %{target}"
         update_status: "%{name} a mis à jour le statut de %{target}"
       deleted_status: "(statut supprimé)"
+      empty: Aucun journal trouvé.
+      filter_by_action: Filtrer par action
+      filter_by_user: Filtrer par utilisateur·ice
       title: Journal d’audit
     announcements:
       destroyed_msg: Annonce supprimée avec succès !
@@ -296,7 +337,7 @@ fr:
       pending_users: utilisateur·rice·s en attente d’approbation
       recent_users: Utilisateur·rice·s récent·e·s
       search: Recherche plein texte
-      single_user_mode: Mode utilisateur·ice unique
+      single_user_mode: Mode utilisateur·rice unique
       software: Logiciel
       space: Espace utilisé
       title: Tableau de bord
@@ -347,7 +388,7 @@ fr:
         retroactive:
           silence: Annuler le masquage des comptes existants affectés pour ce domaine
           suspend: Annuler la suspension des comptes existants affectés pour ce domaine
-        title: Annuler le blocage de domaine pour %{domain}
+        title: Annuler le blocage du domaine %{domain}
         undo: Annuler
       undo: Annuler le bloqueur de domaine
       view: Afficher les bloqueurs de domaines
@@ -358,6 +399,7 @@ fr:
       destroyed_msg: Le blocage de domaine de courriel a été désactivé
       domain: Domaine
       empty: Aucun domaine de courriel n’est actuellement sur liste noire.
+      from_html: de %{domain}
       new:
         create: Créer le blocage
         title: Nouveau blocage de domaine de courriel
@@ -394,7 +436,7 @@ fr:
       title: Relations de %{acct}
     relays:
       add_new: Ajouter un nouveau relais
-      delete: Effacer
+      delete: Supprimer
       description_html: Un <strong>relai de fédération</strong> est un serveur intermédiaire qui échange de grandes quantités de pouets publics entre les serveurs qui publient dessus et ceux qui y sont abonnés. <strong>Il peut aider les petits et moyen serveurs à découvrir du contenu sur le fediverse</strong>, ce qui normalement nécessiterait que les membres locaux suivent des gens inscrits sur des serveurs distants.
       disable: Désactiver
       disabled: Désactivé
@@ -420,7 +462,7 @@ fr:
           one: "%{count} signalement"
           other: "%{count} signalements"
       action_taken_by: Intervention de
-      are_you_sure: Êtes vous certain⋅e ?
+      are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
       by_target_domain: Domaine du compte signalé
@@ -433,7 +475,7 @@ fr:
         create: Ajouter une note
         create_and_resolve: Résoudre avec une note
         create_and_unresolve: Ré-ouvrir avec une note
-        delete: Effacer
+        delete: Supprimer
         placeholder: Décrivez quelles actions ont été prises, ou toute autre mise à jour…
       reopen: Ré-ouvrir le signalement
       report: 'Signalement #%{id}'
@@ -448,14 +490,14 @@ fr:
       updated_at: Mis à jour
     settings:
       activity_api_enabled:
-        desc_html: Nombre de statuts affichés localement, d’utilisateur·ice·s actif·ve·s et de nouveaux·elles utilisateur·ice·s regroupé·e·s par semaine
-        title: Publier des statistiques agrégées sur l’activité des utilisateur·ice·s
+        desc_html: Nombre de statuts affichés localement, de comptes actifs et de nouvelles inscriptions regroupé·e·s par semaine
+        title: Publier des statistiques agrégées sur l’activité des utilisateur·rice·s
       bootstrap_timeline_accounts:
-        desc_html: Séparez les noms d’utilisateur·ice par des virgules. Ne fonctionne qu’avec des comptes locaux et non verrouillés. Si laissé vide, tous les administrateur⋅ice⋅s locaux sont sélectionné⋅e⋅s.
-        title: Abonnements par défaut pour les nouveaux·elles utilisateur·ice·s
+        desc_html: Séparez les noms d’utilisateur·rice·s par des virgules. Ne fonctionne qu’avec des comptes locaux et non verrouillés. Si laissé vide, tous les administrateur·rice·s locaux sont sélectionné⋅e⋅s.
+        title: Abonnements par défaut pour les nouveaux·elles utilisateur·rice·s
       contact_information:
         email: Entrez une adresse courriel publique
-        username: Entrez un nom d’utilisateur⋅ice
+        username: Entrez un nom d’utilisateur·ice
       custom_css:
         desc_html: Modifier l’apparence avec une CSS chargée sur chaque page
         title: CSS personnalisé
@@ -466,11 +508,11 @@ fr:
         all: À tout le monde
         disabled: À personne
         title: Afficher les bloqueurs de domaines
-        users: Pour les utilisateurs locaux connectés
+        users: Aux utilisateur·rice·s connecté·e·s localement
       domain_blocks_rationale:
         title: Montrer la raison
       enable_bootstrap_timeline_accounts:
-        title: Activer le suivi par défaut pour les nouveaux·elles utilisateur·ice·s
+        title: Activer les abonnements par défaut pour les nouveaux·elles utilisateur·rice·s
       hero:
         desc_html: Affichée sur la page d’accueil. Au moins 600x100px recommandé. Lorsqu’elle n’est pas définie, se rabat sur la vignette du serveur
         title: Image d’en-tête
@@ -482,7 +524,7 @@ fr:
         title: Publier la liste des serveurs découverts
       preview_sensitive_media:
         desc_html: Les liens de prévisualisation sur les autres sites web afficheront une vignette même si le média est sensible
-        title: Afficher les médias sensibles dans les prévisualisations OpenGraph
+        title: Montrer les médias sensibles dans les prévisualisations OpenGraph
       profile_directory:
         desc_html: Permettre aux utilisateur·ice·s d’être découvert·e·s
         title: Activer l’annuaire des profils
@@ -491,7 +533,7 @@ fr:
           desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées. Vous pouvez utiliser des balises HTML
           title: Message de fermeture des inscriptions
         deletion:
-          desc_html: Permettre à tou·te·s les utilisateur·ice·s de supprimer leur compte
+          desc_html: Permettre à tou·te·s les utilisateur·rice·s de supprimer leur compte
           title: Autoriser les suppressions de compte
         min_invite_role:
           disabled: Personne
@@ -503,10 +545,10 @@ fr:
           open: N’importe qui peut s’inscrire
         title: Mode d’enregistrement
       show_known_fediverse_at_about_page:
-        desc_html: Lorsque l’option est activée, les pouets provenant de toutes les serveurs connus sont affichés dans la prévisualisation. Sinon, seuls les pouets locaux sont affichés
+        desc_html: Lorsque l’option est activée, les pouets provenant de toutes les serveurs connus sont montrés dans la prévisualisation. Sinon, seuls les pouets locaux sont montrés
         title: Afficher le fediverse connu dans la prévisualisation du fil
       show_staff_badge:
-        desc_html: Montrer un badge de responsable sur une page utilisateur·ice
+        desc_html: Montrer un badge de responsable sur une page utilisateur·rice
         title: Montrer un badge de responsable
       site_description:
         desc_html: Paragraphe introductif sur la page d’accueil. Décrivez ce qui rend spécifique ce serveur Mastodon et toute autre chose importante. Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
@@ -528,15 +570,18 @@ fr:
         desc_html: Utilisée pour les prévisualisations via OpenGraph et l’API. 1200x630px recommandé
         title: Vignette du serveur
       timeline_preview:
-        desc_html: Afficher le fil public sur la page d’accueil et autoriser l'accès anonyme à l'API du fil public
+        desc_html: Afficher un lien vers le fil public sur la page d’accueil et autoriser l'accès anonyme au fil public via l'API
         title: Autoriser la prévisualisation anonyme du fil global
       title: Paramètres du serveur
       trendable_by_default:
         desc_html: Affecte les hashtags qui n'ont pas été précédemment non autorisés
-        title: Autoriser les hashtags à apparaître dans les tendances sans examen préalable
+        title: Autoriser les hashtags à apparaître dans les tendances sans approbation préalable
       trends:
         desc_html: Afficher publiquement les hashtags approuvés qui sont populaires en ce moment
         title: Hashtags populaires
+    site_uploads:
+      delete: Supprimer le fichier téléversé
+      destroyed_msg: Téléversement sur le site supprimé avec succès !
     statuses:
       back_to_account: Retour à la page du compte
       batch:
@@ -556,13 +601,13 @@ fr:
       accounts_week: Utilisation unique cette semaine
       breakdown: Répartition de l’utilisation actuelle par source
       context: Contexte
-      directory: Dans le répertoire
-      in_directory: "%{count} dans le répertoire"
+      directory: Dans l’annuaire
+      in_directory: "%{count} dans l’annuaire"
       last_active: Dernière activité
       most_popular: Plus populaire
       most_recent: Plus récent
-      name: Mot-clé
-      review: État de traitement
+      name: Hashtag
+      review: État du traitement
       reviewed: Traité
       title: Hashtags
       trending_right_now: Populaire en ce moment
@@ -572,8 +617,7 @@ fr:
     title: Administration
     warning_presets:
       add_new: Ajouter un nouveau
-      delete: Effacer
-      edit: Éditer
+      delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       title: Gérer les avertissements prédéfinis
   admin_mailer:
@@ -585,12 +629,12 @@ fr:
       body_remote: Quelqu’un de %{domain} a signalé %{target}
       subject: Nouveau signalement sur %{instance} (#%{id})
     new_trending_tag:
-      body: 'Le hashtag #%{name} est populaire aujourd’hui, mais il n’a pas été approuvé. Il ne sera pas affiché publiquement à moins que vous l’autorisiez, ou sauvegardiez simplement ce formulaire tel quel pour ne plus jamais en entendre parler.'
-      subject: Nouveau hashtag en attente de traitement sur %{instance} (#%{name})
+      body: 'Le hashtag #%{name} est dans les tendances aujourd’hui, mais il n’a pas été approuvé. Il ne sera pas affiché publiquement à moins que vous l’autorisiez, ou sauvegardez simplement ce formulaire tel quel pour ne plus jamais en entendre parler.'
+      subject: Nouveau hashtag en attente d’approbation sur %{instance} (#%{name})
   aliases:
     add_new: Créer un alias
     created_msg: Un nouvel alias a été créé avec succès. Vous pouvez maintenant déménager depuis l'ancien compte.
-    deleted_msg: Suppression réussie de l'alias. Le déménagement de ce compte vers celui-ci ne sera plus possible.
+    deleted_msg: Alias supprimé avec succès. Le déménagement de ce compte vers celui-ci ne sera plus possible.
     hint_html: Si vous voulez déménager d’un autre compte vers celui-ci, vous pouvez créer ici un alias, qui est nécessaire avant de pouvoir migrer les abonné·e·s de l’ancien compte vers celui-ci. Cette action en soi est <strong>inoffensive et réversible</strong>. <strong>La migration du compte est initiée à partir de l’ancien compte</strong>.
     remove: Détacher l'alias
   appearance:
@@ -618,7 +662,7 @@ fr:
     invalid_url: L’URL fournie est invalide
     regenerate_token: Régénérer le jeton d’accès
     token_regenerated: Jeton d’accès régénéré avec succès
-    warning: Soyez prudent⋅e avec ces données. Ne les partagez pas !
+    warning: Soyez prudent·e avec ces données. Ne les partagez pas !
     your_token: Votre jeton d’accès
   auth:
     apply_for_account: Demander une invitation
@@ -630,7 +674,7 @@ fr:
     description:
       prefix_invited_by_user: "@%{name} vous invite à rejoindre ce serveur Mastodon !"
       prefix_sign_up: Inscrivez-vous aujourd’hui sur Mastodon !
-      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateurs de n'importe quel serveur Mastodon et bien plus !
+      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateur·rice·s de n'importe quel serveur Mastodon et bien plus !
     didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
     forgot_password: Mot de passe oublié ?
     invalid_reset_password_token: Le lien de réinitialisation du mot de passe est invalide ou a expiré. Merci de réessayer.
@@ -661,13 +705,14 @@ fr:
     trouble_logging_in: Vous avez un problème pour vous connecter ?
   authorize_follow:
     already_following: Vous suivez déjà ce compte
+    already_requested: Vous avez déjà envoyé une demande d’abonnement à ce compte
     error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
     follow: Suivre
     follow_request: 'Vous avez demandé à suivre :'
     following: 'Youpi ! Vous suivez maintenant  :'
     post_follow:
       close: Ou bien, vous pouvez fermer cette fenêtre.
-      return: Afficher le profil de l’utilisateur⋅ice
+      return: Afficher le profil de l’utilisateur·ice
       web: Retour à l’interface web
     title: Suivre %{acct}
   challenge:
@@ -707,11 +752,11 @@ fr:
       email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
-      username_available: Votre nom d’utilisateur·ice sera à nouveau disponible
-      username_unavailable: Votre nom d’utilisateur·ice restera indisponible
+      username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
+      username_unavailable: Votre nom d’utilisateur·rice restera indisponible
   directories:
     directory: Annuaire des profils
-    explanation: Découvrir des utilisateurs en se basant sur leurs centres d’intérêt
+    explanation: Découvrir des utilisateur·rice·s en selon leurs centres d’intérêt
     explore_mastodon: Explorer %{title}
   domain_validator:
     invalid_domain: n’est pas un nom de domaine valide
@@ -748,10 +793,10 @@ fr:
     mutes: Vous masquez
     storage: Médias stockés
   featured_tags:
-    add_new: Ajouter un nouvel hashtag
+    add_new: Ajouter un nouveau hashtag
     errors:
-      limit: Vous avez déjà recommandé le nombre maximum de hashtags
-    hint_html: "<strong>Que sont les hashtags vedettes ?</strong> Ils sont affichés avec emphase sur votre flux d'actualités publique et permettent aux gens de parcourir vos messages publics spécifiquement sous ces hashtags. Ils sont un excellent outil pour garder trace des œuvres créatives ou des projets à long terme."
+      limit: Vous avez déjà mis en avant le nombre maximum de hashtags
+    hint_html: "<strong>Que sont les hashtags mis en avant ?</strong> Ils sont affichés en évidence sur votre profil public et permettent aux gens de parcourir vos messages publics qui utilisent ces hashtags. Ils sont un excellent outil pour garder la trace d’activités créatrices ou de projets de long terme."
   filters:
     contexts:
       account: Profils
@@ -765,7 +810,7 @@ fr:
       invalid_context: Contexte invalide ou insuffisant
       invalid_irreversible: Le filtrage irréversible ne fonctionne que pour l’accueil et les notifications
     index:
-      delete: Effacer
+      delete: Supprimer
       empty: Vous n'avez aucun filtre.
       title: Filtres
     new:
@@ -817,8 +862,8 @@ fr:
     types:
       blocking: Liste de comptes bloqués
       domain_blocking: Liste des serveurs bloqués
-      following: Liste d’utilisateur⋅ice⋅s suivi⋅e⋅s
-      muting: Liste d’utilisateur⋅ice⋅s que vous masquez
+      following: Liste d’utilisateur·rice·s suivi·e·s
+      muting: Liste d’utilisateur·rice·s que vous masquez
     upload: Importer
   in_memoriam_html: En mémoire de.
   invites:
@@ -849,6 +894,7 @@ fr:
   media_attachments:
     validations:
       images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
+      not_ready: Impossible de joindre les fichiers en traitements. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
     acct: A déménagé vers
@@ -857,7 +903,7 @@ fr:
     cancelled_msg: Suppression de la redirection réussie.
     errors:
       already_moved: est le même compte que vous avez déjà déplacé vers
-      missing_also_known_as: ne référence pas rétroactivement ce compte
+      missing_also_known_as: ne référence pas ce compte en retour
       move_to_self: ne peut pas être le compte actuel
       not_found: n'a pas été trouvé
       on_cooldown: Vous êtes soumis·e à un temps de rechargement
@@ -905,7 +951,7 @@ fr:
     follow_request:
       action: Gérer les demandes d’abonnement
       body: "%{name} a demandé à vous suivre"
-      subject: 'Abonné⋅e·s en attente : %{name}'
+      subject: 'Abonné·e·s en attente : %{name}'
       title: Nouvelle demande d’abonnement
     mention:
       action: Répondre
@@ -1044,7 +1090,7 @@ fr:
     development: Développement
     edit_profile: Modifier le profil
     export: Export de données
-    featured_tags: Hashtags recommandés
+    featured_tags: Hashtags mis en avant
     identity_proofs: Preuves d’identité
     import: Import de données
     import_and_export: Import et export
@@ -1070,6 +1116,8 @@ fr:
     disallowed_hashtags:
       one: 'contient un hashtag désactivé : %{tags}'
       other: 'contient les hashtags désactivés : %{tags}'
+    errors:
+      in_reply_not_found: Le statut auquel vous essayez de répondre ne semble pas exister.
     language_detection: Détecter automatiquement la langue
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
@@ -1086,13 +1134,13 @@ fr:
         one: "%{count} vote"
         other: "%{count} votes"
       vote: Voter
-    show_more: Afficher plus
+    show_more: Déplier
     show_thread: Afficher le fil de discussion
     sign_in_to_participate: Inscrivez-vous pour prendre part à la conversation
     title: '%{name} : "%{quote}"'
     visibilities:
       private: Abonné⋅e⋅s uniquement
-      private_long: Seul⋅e⋅s vos abonné⋅e⋅s verront vos statuts
+      private_long: Afficher seulement à vos vos abonné·e·s
       public: Public
       public_long: Tout le monde peut voir vos statuts
       unlisted: Public sans être affiché sur le fil public
@@ -1111,7 +1159,7 @@ fr:
       <ul>
       <li><em>Informations de base sur votre compte</em> : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.</li>
       <li><em>Posts, liste d’abonnements et autres informations publiques</em> : La liste de vos abonnements ainsi que la liste de vos abonné·e·s sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistré·e·s. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonné·e·s, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimer un post, il est probable que vos abonné·e·s en soient informé·e·s. Partager un message ou le marquer comme favori est toujours une action publique.</li>
-      <li><em>Posts directs et abonné·e·s uniquement</em> : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. <em>Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partager aucune information sensible à l’aide de Mastodon.</em></li>
+      <li><em>Posts directs et abonné·e·s uniquement</em> : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne foi pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. <em>Gardez s’il vous plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partager aucune information sensible à l’aide de Mastodon.</em></li>
       <li><em>IP et autres métadonnées</em> : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.</li>
       </ul>
 
@@ -1124,7 +1172,7 @@ fr:
       <ul>
       <li>Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.</li>
       <li>Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.</li>
-      <li>L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.</li>
+      <li>L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyer des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour touts autres requêtes ou questions.</li>
       </ul>
 
       <hr class="spacer" />
@@ -1152,7 +1200,7 @@ fr:
 
       <h3 id="cookies">Utilisons-nous des témoins de connexion ?</h3>
 
-      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transféres sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et de, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
+      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transfère sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et de, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
 
       <p>Nous utilisons les témoins de connexion comme un moyen de comprendre et de nous souvenir de vos préférences pour vos prochaines visites.</p>
 
@@ -1164,13 +1212,13 @@ fr:
 
       <p>Votre contenu public peut être téléchargé par d’autres serveurs du réseau. Dans le cas où vos abonné·e·s et vos destinataires résideraient sur des serveurs différents du vôtre, vos posts publics et abonné·e·s uniquement peuvent être délivrés vers les serveurs de vos abonné·e·s tandis que vos messages directs sont délivrés aux serveurs de vos destinataires.</p>
 
-      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, votre liste d’abonnements, votre liste d’abonné·e·s, vos listes, tout vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
+      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, votre liste d’abonnements, votre liste d’abonné·e·s, vos listes, tous vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
 
       <hr class="spacer" />
 
       <h3 id="children">Utilisation de ce site par les enfants</h3>
 
-      <p>Si ce serveur est situé dans dans l’UE ou l’EEE : Notre site, produits et services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
+      <p>Si ce serveur est situé dans l’UE ou l’EEE : Notre site, produits et services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
 
       <p>Si ce serveur est situé dans aux États-Unis d’Amérique : Notre site, produits et services sont tous destinés à des personnes âgées de 13 ans ou plus. Si vous avez moins de 13 ans, en application du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), merci de ne pas utiliser ce site.</p>
 
@@ -1218,8 +1266,8 @@ fr:
     warning:
       explanation:
         disable: Lorsque votre compte est gelé, les données de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusqu’à ce qu’il soit débloqué.
-        silence: Lorsque votre compte est limité, seulement les utilisateurs qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d’autres utilisateurs peuvent vous suivre manuellement.
-        suspend: Votre compte a été suspendu, et tous vos pouets et vos fichiers multimédia téléversés ont été supprimés irréversiblement de ce serveur, et des serveurs où vous aviez des abonné⋅e⋅s.
+        silence: Lorsque votre compte est limité, seul·e·s les utilisateur·rice·s qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d’autres utilisateur·rice·s peuvent vous suivre manuellement.
+        suspend: Votre compte a été suspendu, et tous vos pouets et vos fichiers multimédia téléversés ont été supprimés irréversiblement de ce serveur, et des serveurs où vous aviez des abonné·e·s.
       get_in_touch: Vous pouvez répondre à cette adresse pour entrer en contact avec l’équipe de %{instance}.
       review_server_policies: Passer en revue les politiques du serveur
       statuses: 'Spécialement, pour :'
@@ -1242,7 +1290,7 @@ fr:
       full_handle: Votre identifiant complet
       full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
       review_preferences_action: Modifier les préférences
-      review_preferences_step: Assurez-vous de définir vos préférences, telles que les courriels que vous aimeriez recevoir ou le niveau de confidentialité auquel vous aimeriez que vos messages soient soumis par défaut. Si vous n’avez pas le mal des transports, vous pouvez choisir d’activer la lecture automatique des GIF.
+      review_preferences_step: Assurez-vous de définir vos préférences, telles que les courriels que vous aimeriez recevoir ou le niveau de confidentialité auquel vous publier vos messages par défaut. Si vous n’avez pas le mal des transports, vous pouvez choisir d’activer la lecture automatique des GIF.
       subject: Bienvenue sur Mastodon
       tip_federated_timeline: La fil public global est une vue en direct du réseau Mastodon. Mais elle n’inclut que les personnes auxquelles vos voisin·es sont abonné·e·s, donc elle n’est pas complète.
       tip_following: Vous suivez les administrateur·rice·s de votre serveur par défaut. Pour trouver d’autres personnes intéressantes, consultez les fils publics local et global.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c3a33932d..35d8ac2d6 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -92,6 +92,7 @@ gl:
       delete: Eliminar
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
+      add_email_domain_block: Bloquear o dominio do email
       approve: Aprobar
       approve_all: Aprobar todos
       are_you_sure: Está segura?
@@ -172,6 +173,7 @@ gl:
         staff: Persoal (staff)
         user: Usuaria
       search: Procurar
+      search_same_email_domain: Outras usuarias co mesmo dominio de email
       search_same_ip: Outras usuarias co mesmo IP
       shared_inbox_url: URL da caixa de entrada compartida
       show:
@@ -193,6 +195,42 @@ gl:
       web: Web
       whitelisted: Lista branca
     action_logs:
+      action_types:
+        assigned_to_self_report: Asignar denuncia
+        change_email_user: Editar email do usuario
+        confirm_user: Confirmar usuario
+        create_account_warning: Crear aviso
+        create_announcement: Crear anuncio
+        create_custom_emoji: Crear emoticonas personalizadas
+        create_domain_allow: Crear permiso de dominio
+        create_domain_block: Crear bloqueo de dominio
+        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
+        demote_user: Degradar usuario
+        destroy_announcement: Eliminar anuncio
+        destroy_custom_emoji: Eliminar emoticona personalizada
+        destroy_domain_allow: Eliminar permiso de dominio
+        destroy_domain_block: Eliminar bloqueo de dominio
+        destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
+        destroy_status: Eliminar estado
+        disable_2fa_user: Desactivar autenticación de dous factores
+        disable_custom_emoji: Deshabilitar emoticona personalizada
+        disable_user: Deshabilitar usuario
+        enable_custom_emoji: Habilitar emoticona personalizada
+        enable_user: Activar usuario
+        memorialize_account: Transformar en conta conmemorativa
+        promote_user: Promover usuario
+        remove_avatar_user: Eliminar avatar
+        reopen_report: Reabrir denuncia
+        reset_password_user: Restabelecer contrasinal
+        resolve_report: Resolver denuncia
+        silence_account: Silenciar conta
+        suspend_account: Suspender conta
+        unassigned_report: Desasignar denuncia
+        unsilence_account: Deixar de silenciar conta
+        unsuspend_account: Retirar suspensión de conta
+        update_announcement: Actualizar anuncio
+        update_custom_emoji: Actualizar emoticona personalizada
+        update_status: Actualizar estado
       actions:
         assigned_to_self_report: "%{name} atribuíu a denuncia %{target} a el mesmo"
         change_email_user: "%{name} cambiou o enderezo de correo-e da usuaria %{target}"
@@ -230,6 +268,9 @@ gl:
         update_custom_emoji: "%{name} actualizou a emoticona %{target}"
         update_status: "%{name} actualizou o estado de %{target}"
       deleted_status: "(estado eliminado)"
+      empty: Non se atoparon rexistros.
+      filter_by_action: Filtrar por acción
+      filter_by_user: Filtrar por usuario
       title: Rexistro de auditoría
     announcements:
       destroyed_msg: Anuncio eliminado de xeito correcto!
@@ -358,6 +399,7 @@ gl:
       destroyed_msg: Eliminouse de xeito correcto o dominio de email da listaxe negra
       domain: Dominio
       empty: Actualmente non hai dominios de email na listaxe negra.
+      from_html: desde %{domain}
       new:
         create: Engadir dominio
         title: Nova entrada na listaxe negra de email
@@ -537,6 +579,9 @@ gl:
       trends:
         desc_html: Amosar de xeito público cancelos revisados previamente que actualmente son tendencia
         title: Cancelos en tendencia
+    site_uploads:
+      delete: Eliminar o ficheiro subido
+      destroyed_msg: Eliminado correctamente o subido!
     statuses:
       back_to_account: Voltar a páxina da conta
       batch:
@@ -573,7 +618,6 @@ gl:
     warning_presets:
       add_new: Engadir novo
       delete: Eliminar
-      edit: Editar
       edit_preset: Editar aviso preestablecido
       title: Xestionar avisos preestablecidos
   admin_mailer:
@@ -661,6 +705,7 @@ gl:
     trouble_logging_in: Problemas para conectar?
   authorize_follow:
     already_following: Xa está a seguir esta conta
+    already_requested: Xa tes enviada unha solicitude de seguimento a esa conta
     error: Desgraciadamente, algo fallou ao buscar a conta remota
     follow: Seguir
     follow_request: 'Enviou unha petición de seguimento a:'
@@ -849,6 +894,7 @@ gl:
   media_attachments:
     validations:
       images_and_video: Non pode anexar un vídeo a un estado que xa contén imaxes
+      not_ready: Non se poden anexar ficheiros que aínda se están a procesar. Agarda un intre!
       too_many: Non pode anexar máis de 4 ficheiros
   migrations:
     acct: nomeusuaria@dominio da nova conta
@@ -1070,6 +1116,8 @@ gl:
     disallowed_hashtags:
       one: 'contiña un cancelo non permitido: %{tags}'
       other: 'contiña uns cancelos non permitidos: %{tags}'
+    errors:
+      in_reply_not_found: O estado ó cal tentas respostar semella que non existe.
     language_detection: Detección automática do idioma
     open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 401d07cf6..fc4805625 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -19,7 +19,7 @@ hi:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 9dd14c1dd..d7bd91c7a 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -50,7 +50,7 @@ hr:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2d7f3a137..30331b2cb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -11,9 +11,7 @@ hu:
     apps: Mobil appok
     apps_platforms: Használd a Mastodont iOS-ről, Androidról vagy más platformról
     browse_directory: Böngészd a profilokat és szűrj érdeklődési körre
-    browse_local_posts: 'Nézz bele a szerver publikus, élő adatfolyamába
-
-'
+    browse_local_posts: Nézz bele a szerver publikus, élő adatfolyamába
     browse_public_posts: Nézz bele a Mastodon élő adatfolyamába
     contact: Kapcsolat
     contact_missing: Nincs megadva
@@ -94,6 +92,7 @@ hu:
       delete: Törlés
       destroyed_msg: Moderációs bejegyzés törölve!
     accounts:
+      add_email_domain_block: Email domain tiltólistára vétele
       approve: Jóváhagyás
       approve_all: Mindet jóváhagy
       are_you_sure: Biztos vagy benne?
@@ -174,6 +173,7 @@ hu:
         staff: Stáb
         user: Felhasználó
       search: Keresés
+      search_same_email_domain: Felhasználók ugyanezzel az email domainnel
       search_same_ip: Más felhasználók ugyanezzel az IP-vel
       shared_inbox_url: Megosztott bejövő üzenetek URL
       show:
@@ -195,27 +195,63 @@ hu:
       web: Web
       whitelisted: Engedélyező-listán
     action_logs:
+      action_types:
+        assigned_to_self_report: Jelentés hozzárendelése
+        change_email_user: Felhasználó e-mail címének módosítása
+        confirm_user: Felhasználó megerősítése
+        create_account_warning: Figyelmeztetés létrehozása
+        create_announcement: Közlemény létrehozása
+        create_custom_emoji: Egyéni emodzsi létrehozása
+        create_domain_allow: Domain engedélyezés létrehozása
+        create_domain_block: Domain blokkolás létrehozása
+        create_email_domain_block: E-mail domain blokkolás létrehozása
+        demote_user: Felhasználó lefokozása
+        destroy_announcement: Közlemény törlése
+        destroy_custom_emoji: Egyéni emodzsi törlése
+        destroy_domain_allow: Domain engedélyezés törlése
+        destroy_domain_block: Domain blokkolás törlése
+        destroy_email_domain_block: E-mail domain blokkolás törlése
+        destroy_status: Állapot törlése
+        disable_2fa_user: Kétlépcsős hitelesítés letiltása
+        disable_custom_emoji: Egyéni emodzsi letiltása
+        disable_user: Felhasználói letiltása
+        enable_custom_emoji: Egyéni emodzsi engedélyezése
+        enable_user: Felhasználó engedélyezése
+        memorialize_account: Fiók emlékké nyilvánítása
+        promote_user: Felhasználó előléptetése
+        remove_avatar_user: Profilkép eltávolítása
+        reopen_report: Jelentés újranyitása
+        reset_password_user: Jelszó visszaállítása
+        resolve_report: Jelentés megoldása
+        silence_account: Fiók némítása
+        suspend_account: Fiók felfüggesztése
+        unassigned_report: Jelentés hozzárendelésének megszüntetése
+        unsilence_account: Fiók némításának feloldása
+        unsuspend_account: Fiók felfüggesztésének feloldása
+        update_announcement: Közlemény frissítése
+        update_custom_emoji: Egyéni emodzsi frissítése
+        update_status: Állapot frissítése
       actions:
         assigned_to_self_report: "%{name} a %{target} bejelentést magához rendelte"
         change_email_user: "%{name} megváltoztatta %{target} felhasználó e-mail címét"
         confirm_user: "%{name} megerősítette e-mail címét: %{target}"
         create_account_warning: "%{name} figyelmeztetést küldött %{target} felhasználónak"
         create_announcement: "%{name} új közleményt hozott létre %{target}"
-        create_custom_emoji: "%{name} új emojit töltött fel: %{target}"
+        create_custom_emoji: "%{name} új emodzsit töltött fel: %{target}"
         create_domain_allow: "%{name} engedélyező listára vette %{target} domaint"
         create_domain_block: "%{name} letiltotta az alábbi domaint: %{target}"
         create_email_domain_block: "%{name} feketelistára tette az alábbi e-mail domaint: %{target}"
         demote_user: "%{name} lefokozta az alábbi felhasználót: %{target}"
         destroy_announcement: "%{name} törölte a közleményt %{target}"
-        destroy_custom_emoji: "%{name} törölte az emojit: %{target}"
+        destroy_custom_emoji: "%{name} törölte az emodzsit: %{target}"
         destroy_domain_allow: "%{name} leszedte %{target} domaint az engedélyező listáról"
         destroy_domain_block: "%{name} engedélyezte az alábbi domaint: %{target}"
         destroy_email_domain_block: "%{name} fehérlistára tette az alábbi e-mail domaint: %{target}"
         destroy_status: "%{name} eltávolította az alábbi felhasználó tülkjét: %{target}"
         disable_2fa_user: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
-        disable_custom_emoji: "%{name} letiltotta az alábbi emojit: %{target}"
+        disable_custom_emoji: "%{name} letiltotta az alábbi emodzsit: %{target}"
         disable_user: "%{name} letiltotta az alábbi felhasználó bejelentkezését: %{target}"
-        enable_custom_emoji: "%{name} engedélyezte az alábbi emojit: %{target}"
+        enable_custom_emoji: "%{name} engedélyezte az alábbi emodzsit: %{target}"
         enable_user: "%{name} engedélyezte az alábbi felhasználó bejelentkezését: %{target}"
         memorialize_account: "%{name} emléket állított az alábbi felhasználónak: %{target}"
         promote_user: "%{name} előléptette az alábbi felhasználót: %{target}"
@@ -229,9 +265,12 @@ hu:
         unsilence_account: "%{name} feloldotta a némítást %{target} felhasználói fiókján"
         unsuspend_account: "%{name} feloldotta %{target} felhasználói fiókjának felfüggesztését"
         update_announcement: "%{name} frissítette a közleményt %{target}"
-        update_custom_emoji: "%{name} frissítette az alábbi emojit: %{target}"
+        update_custom_emoji: "%{name} frissítette az alábbi emodzsit: %{target}"
         update_status: "%{name} frissítette %{target} felhasználó tülkjét"
       deleted_status: "(törölt tülk)"
+      empty: Nem található napló.
+      filter_by_action: Szűrés művelet alapján
+      filter_by_user: Szűrés felhasználó alapján
       title: Audit napló
     announcements:
       destroyed_msg: A közlemény sikeresen törölve!
@@ -251,34 +290,34 @@ hu:
     custom_emojis:
       assign_category: Kategóriák
       by_domain: Domain
-      copied_msg: Sikeresen létrehoztuk az emoji helyi másolatát
+      copied_msg: Sikeresen létrehoztuk az emodzsi helyi másolatát
       copy: Másolás
-      copy_failed_msg: Emoji helyi másolatának létrehozása sikertelen
+      copy_failed_msg: Emodzsi helyi másolatának létrehozása sikertelen
       create_new_category: Új kategória létrehozása
-      created_msg: Emoji létrehozva!
+      created_msg: Emodzsi létrehozva!
       delete: Törlés
-      destroyed_msg: Emoji törlése sikeres!
+      destroyed_msg: Emodzsi törlése sikeres!
       disable: Letiltás
       disabled: Letiltva
-      disabled_msg: Emoji letiltva
-      emoji: Emoji
+      disabled_msg: Emodzsi letiltva
+      emoji: Emodzsi
       enable: Engedélyezés
       enabled: Engedélyezve
-      enabled_msg: Emoji engedélyezve
+      enabled_msg: Emodzsji engedélyezve
       image_hint: PNG (maximális méret 50KB)
       list: Listázás
       listed: Listázva
       new:
-        title: Új egyedi emoji hozzáadása
+        title: Új egyedi emodzsi hozzáadása
       overwrite: Felülírás
       shortcode: Rövidítés
       shortcode_hint: Legalább két karakter, csak betűk, számok és alsóvonás
-      title: Egyedi emojik
+      title: Egyedi emodzsik
       uncategorized: Nem kategorizált
       unlist: Elrejtés a listáról
       unlisted: Nincs listázva
-      update_failed_msg: Nem sikerült frissíteni az emojit
-      updated_msg: Emoji sikeresen frissítve!
+      update_failed_msg: Nem sikerült frissíteni az emodzsit
+      updated_msg: Emodzsi sikeresen frissítve!
       upload: Feltöltés
     dashboard:
       authorized_fetch_mode: Áttöltő üzemmód engedélyezve
@@ -360,6 +399,7 @@ hu:
       destroyed_msg: E-mail domain sikeresen eltávolítva a feketelistáról
       domain: Domain
       empty: Nincs email domain a feketelistán.
+      from_html: "%{domain}-ról"
       new:
         create: Domain hozzáadása
         title: Új e-mail feketelista bejegyzés
@@ -539,6 +579,9 @@ hu:
       trends:
         desc_html: Előzetesen engedélyezett és most trendi hashtagek nyilvános mutatása
         title: Trendi hashtagek
+    site_uploads:
+      delete: Feltöltött fájl törlése
+      destroyed_msg: Sikeresen töröltük a site feltöltését!
     statuses:
       back_to_account: Vissza a fiók oldalára
       batch:
@@ -575,7 +618,6 @@ hu:
     warning_presets:
       add_new: Új hozzáadása
       delete: Törlés
-      edit: Szerkesztés
       edit_preset: Figyelmeztetés szerkesztése
       title: Figyelmeztetések
   admin_mailer:
@@ -663,6 +705,7 @@ hu:
     trouble_logging_in: Problémád van a bejelentkezéssel?
   authorize_follow:
     already_following: Már követed ezt a felhasználót
+    already_requested: Már küldtél követési kérelmet ennek a fióknak
     error: Hiba történt a távoli felhasználó keresésekor
     follow: Követés
     follow_request: 'Engedélyt kértél az alábbi felhasználó követésére:'
@@ -851,6 +894,7 @@ hu:
   media_attachments:
     validations:
       images_and_video: Nem csatolhatsz videót olyan tülkhöz, amelyhez már csatoltál képet
+      not_ready: Nem lehet olyan fájlt csatolni, melynek még nem fejeződött be a feldolgozása. Próbáld kicsit később!
       too_many: Maximum négy fájlt csatolhatsz a tülkhöz
   migrations:
     acct: Az új fiók felhasznalonev@domain formátumban
@@ -956,7 +1000,7 @@ hu:
   reactions:
     errors:
       limit_reached: A különböző reakciók száma elérte a határértéket
-      unrecognized_emoji: nem ismert emoji
+      unrecognized_emoji: nem ismert emodzsi
   relationships:
     activity: Fiók aktivitás
     dormant: Elhagyott
@@ -1072,6 +1116,8 @@ hu:
     disallowed_hashtags:
       one: 'tiltott hashtaget tartalmaz: %{tags}'
       other: 'tiltott hashtageket tartalmaz: %{tags}'
+    errors:
+      in_reply_not_found: Már nem létezik az a tülk, melyre válaszolni szeretnél.
     language_detection: Nyelv automatikus felismerése
     open_in_web: Megnyitás a weben
     over_character_limit: Túllépted a maximális %{max} karakteres keretet
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 2c692235b..a0bed56fd 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -20,6 +20,11 @@ hy:
       other: Հետևորդներ
     media: Մեդիա
     never_active: Երբեք
+    roles:
+      admin: Ադմինիստրատոր
+      bot: Բոտ
+      group: Խումբ
+      moderator: Մոդերատոր
     unfollow: Չհետևել
   admin:
     account_moderation_notes:
@@ -33,7 +38,7 @@ hy:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ca222946c..27bfccc22 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -88,6 +88,7 @@ id:
       delete: Hapus
       destroyed_msg: Catatan moderasi berhasil dihapus!
     accounts:
+      add_email_domain_block: Masukkan domain surel ke daftar hitam
       approve: Terima
       approve_all: Terima semua
       are_you_sure: Anda yakin?
@@ -168,6 +169,7 @@ id:
         staff: Staf
         user: Pengguna
       search: Cari
+      search_same_email_domain: Pengguna lain dengan domain surel yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
       shared_inbox_url: URL kotak masuk bersama
       show:
@@ -353,6 +355,7 @@ id:
       destroyed_msg: Berhasil menghapus domain surel dari daftar hitam
       domain: Domain
       empty: Tidak ada domain surel yang masuk daftar hitam.
+      from_html: dari %{domain}
       new:
         create: Tambah domain
         title: Entri daftar hitam surel baru
@@ -529,6 +532,9 @@ id:
       trends:
         desc_html: Tampilkan secara publik tagar tertinjau yang kini sedang tren
         title: Tagar sedang tren
+    site_uploads:
+      delete: Hapus berkas yang diunggah
+      destroyed_msg: Situs yang diunggah berhasil dihapus!
     statuses:
       back_to_account: Kembali ke halaman akun
       batch:
@@ -565,7 +571,6 @@ id:
     warning_presets:
       add_new: Tambah baru
       delete: Hapus
-      edit: Sunting
       edit_preset: Sunting preset peringatan
       title: Kelola preset peringatan
   admin_mailer:
@@ -653,6 +658,7 @@ id:
     trouble_logging_in: Kesulitan masuk?
   authorize_follow:
     already_following: Anda sudah mengikuti akun ini
+    already_requested: Anda sudah mengirimkan permintaan untuk mengikuti akun tersebut
     error: Sayangnya, ada error saat melihat akun remote
     follow: Ikuti
     follow_request: 'Anda telah mengirim permintaan untuk mengikuti ke:'
@@ -716,7 +722,7 @@ id:
     '422':
       content: Verifikasi keamanan gagal. Apa anda memblokir cookie?
       title: Verifikasi keamanan gagal
-    '429': Throttled
+    '429': Lambat
     '500':
       content: Maaf, ada sesuatu yang salah pada sistem kami.
       title: Halaman ini tidak benar
@@ -755,6 +761,7 @@ id:
       title: Ubah saringan
     errors:
       invalid_context: Konteks tidak ada atau invalid
+      invalid_irreversible: Penyaringan yang tidak dapat dipulihkan hanya bekerja di beranda atau konteks notifikasi
     index:
       delete: Hapus
       empty: Anda tidak memiliki filter.
@@ -838,6 +845,7 @@ id:
   media_attachments:
     validations:
       images_and_video: Tidak bisa melampirkan video pada status yang telah memiliki gambar
+      not_ready: Tidak dapat melampirkan berkas yang belum selesai diproses. Coba lagi nanti!
       too_many: Tidak dapat melampirkan lebih dari 4 file
   migrations:
     acct: Pindah ke
@@ -846,21 +854,27 @@ id:
     cancelled_msg: Pembatalan peralihan berhasil.
     errors:
       already_moved: adalah akun yang sama yang sudah Anda pindahkan ke
+      missing_also_known_as: ini bukan back-reference akun ini
       move_to_self: tidak boleh akun sekarang
       not_found: tidak dapat ditemukan
+      on_cooldown: Anda berada di masa tenang
     followers_count: Jumlah pengikut saat migrasi
     incoming_migrations: Pindah dari akun berbeda
     incoming_migrations_html: Untuk pindah dari akun lain ke sini, Anda harus <a href="%{path}">membuat alias akun</a> terlebih dahulu.
     moved_msg: Akun Anda dialihkan ke %{acct} dan pengikut Anda akan ikut dipindahkan.
     not_redirecting: Saat ini akun Anda tidak dialihkan ke akun lain.
     on_cooldown: Anda baru saja memindahkan akun Anda. Fungsi ini akan tersedia kembali %{count} hari lagi.
+    past_migrations: Migrasi lampau
     proceed_with_move: Pindahkan pengikut
     redirecting_to: Akun Anda dialihkan ke %{acct}.
     set_redirect: Atur peralihan
     warning:
+      backreference_required: Akun baru harus dikonfigurasi terlebih dahulu agar merujuk ke akun ini
       before: 'Sebelum lanjut, mohon perhatikan catatan ini:'
       cooldown: Setelah pindah akun adalah masa tenang, masa Anda tidak dapat pindah akun lagi
+      disabled_account: Akun Anda tidak akan dapat dipakai secara penuh. Namun, Anda tetap akan memiliki akses ke ekspor data dan aktivasi ulang.
       followers: Tindakan ini akan memindah semua pengikut Anda dari akun sekarang ke akun baru
+      only_redirect_html: Secara alternatif, Anda <a href="%{path}">hanya dapat menaruh tulisan mengarahkan ke profil Anda</a>.
       other_data: Tidak akan ada data lagi yang dipindahkan secara otomatis
       redirect: Pemberitahuan peralihan akan dimunculkan pada akun profil Anda dan akun akan dikecualikan dari pencarian
   moderation:
@@ -898,6 +912,8 @@ id:
       subject: "%{name} mem-boost status anda"
       title: Boost baru
   notifications:
+    email_events: Event untuk notifikasi surel
+    email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
     other_settings: Pengaturan notifikasi lain
   number:
     human:
@@ -919,6 +935,7 @@ id:
     errors:
       already_voted: Anda sudah mengikuti japat ini
       duplicate_options: berisi item ganda
+      duration_too_long: terlalu jauh ke masa depan
       duration_too_short: terlalu cepat
       expired: Japat telah berakhir
       invalid_choice: Opsi pilihan yang dipilih tidak ada
@@ -929,11 +946,16 @@ id:
     other: Lainnya
     posting_defaults: Kiriman bawaan
     public_timelines: Linimasa publik
+  reactions:
+    errors:
+      limit_reached: Batas reaksi yang berbeda terpenuhi
+      unrecognized_emoji: bukan emoji yang dikenal
   relationships:
     activity: Aktivitas akun
     dormant: Terbengkalai
     followers: Pengikut
     following: Mengikuti
+    invited: Diundang
     last_active: Terakhir aktif
     most_recent: Terkini
     moved: Dipindah
@@ -1040,6 +1062,8 @@ id:
     content_warning: 'Peringatan konten: %{warning}'
     disallowed_hashtags:
       other: 'berisi tagar yang tidak diizinkan: %{tags}'
+    errors:
+      in_reply_not_found: Status yang ingin Anda balas sudah tidak ada.
     language_detection: Deteksi bahasa secara otomatis
     open_in_web: Buka di web
     over_character_limit: melebihi %{max} karakter
@@ -1126,11 +1150,14 @@ id:
       explanation: Beberapa tips sebelum Anda memulai
       final_action: Mulai mengirim
       final_step: 'Mulai mengirim! Tanpa pengikut, pesan publik Anda akan tetap dapat dilihat oleh akun lain, contohnya di linimasa lokal atau di tagar. Anda mungkin ingin memperkenalkan diri dengan tagar #introductions.'
+      full_handle: Penanganan penuh Anda
       full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
       review_preferences_action: Ubah preferensi
       review_preferences_step: Pastikan Anda telah mengatur preferensi Anda, seperti surel untuk menerima pesan, atau tingkat privasi bawaan untuk kiriman Anda. Jika Anda tidak alergi dengan gerakan gambar, Anda dapat mengaktifkan opsi mainkan otomatis GIF.
       subject: Selamat datang di Mastodon
+      tip_federated_timeline: Linimasa gabungan adalah ruang yang menampilkan jaringan Mastodon. Tapi ini hanya berisi tetangga orang-orang yang Anda ikuti, jadi tidak sepenuhnya komplet.
       tip_following: Anda secara otomatis mengikuti admin server. Untuk mencari akun-akun yang menarik, silakan periksa linimasa lokal dan gabungan.
+      tip_local_timeline: Linimasa lokal adalah ruang yang menampilkan orang-orang di %{instance}. Mereka adalah tetangga dekat!
       tip_mobile_webapp: Jika peramban mobile Anda ingin menambahkan Mastodon ke layar utama, Anda dapat menerima notifikasi dorong. Ia akan berjalan seperti aplikasi asli!
       tips: Tips
       title: Selamat datang, %{name}!
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4e426e469..0b09134bb 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -79,7 +79,7 @@ io:
     '406': This page is not available in the requested format.
     '410': La pagino quan tu serchas ne plus existas.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d6cf23966..7e681e736 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -92,6 +92,7 @@ is:
       delete: Eyða
       destroyed_msg: Tókst að eyða minnispunkti umsjónarmanns!
     accounts:
+      add_email_domain_block: Útiloka tölvupóstlén
       approve: Samþykkja
       approve_all: Samþykkja allt
       are_you_sure: Ertu viss?
@@ -115,7 +116,7 @@ is:
       display_name: Birtingarnafn
       domain: Lén
       edit: Breyta
-      email: Tölvupóstur
+      email: Tölvupóstfang
       email_status: Staða tölvupósts
       enable: Virkja
       enabled: Virkt
@@ -133,7 +134,7 @@ is:
         title: Staðsetning
       login_status: Staða innskráningar
       media_attachments: Myndaviðhengi
-      memorialize: Breya í minningargrein
+      memorialize: Breyta í minningargrein
       moderation:
         active: Virkur
         all: Allt
@@ -172,6 +173,7 @@ is:
         staff: Starfsmaður
         user: Notandi
       search: Leita
+      search_same_email_domain: Aðra notendur með sama tölvupóstlén
       search_same_ip: Aðrir notendur með sama IP-vistfang
       shared_inbox_url: Slóð á sameiginlegt innhólf
       show:
@@ -193,6 +195,42 @@ is:
       web: Vefur
       whitelisted: Á lista yfir leyft
     action_logs:
+      action_types:
+        assigned_to_self_report: Úthluta kæru
+        change_email_user: Skipta um tölvupóstfang notanda
+        confirm_user: Staðfesta notanda
+        create_account_warning: Útbúa aðvörun
+        create_announcement: Búa til tilkynningu
+        create_custom_emoji: Búa til sérsniðið tjáningartákn
+        create_domain_allow: Búa til lén leyft
+        create_domain_block: Búa til lén bannað
+        create_email_domain_block: Búa til tölvupóstfang bannað
+        demote_user: Lækka notanda í tign
+        destroy_announcement: Eyða tilkynningu
+        destroy_custom_emoji: Eyða sérsniðnu tjáningartákni
+        destroy_domain_allow: Eyða léni leyft
+        destroy_domain_block: Eyða léni bannað
+        destroy_email_domain_block: Eyða tölvupóstfangi bannað
+        destroy_status: Eyða stöðufærslu
+        disable_2fa_user: Gera tveggja-þátta auðkenningu óvirka
+        disable_custom_emoji: Gera sérsniðið tjáningartákn óvirkt
+        disable_user: Gera notanda óvirkan
+        enable_custom_emoji: Virkja sérsniðið tjáningartákn
+        enable_user: Virkja notanda
+        memorialize_account: Gera aðgang að minningargrein
+        promote_user: Hækka notanda í tign
+        remove_avatar_user: Fjarlægja auðkennismynd
+        reopen_report: Enduropna kæru
+        reset_password_user: Endurstilla lykilorð
+        resolve_report: Leysa kæru
+        silence_account: Hylja notandaaðgang
+        suspend_account: Setja notandaaðgang í bið
+        unassigned_report: Aftengja úthlutun kæru
+        unsilence_account: Hætta að hylja notandaaðgang
+        unsuspend_account: Taka notandaaðgang úr bið
+        update_announcement: Uppfæra tilkynningu
+        update_custom_emoji: Uppfæra sérsniðið tjáningartákn
+        update_status: Uppfæra stöðufærslu
       actions:
         assigned_to_self_report: "%{name} úthlutaði skýrslu %{target} til sín"
         change_email_user: "%{name} breytti tölvupóstfangi fyrir notandann %{target}"
@@ -230,6 +268,9 @@ is:
         update_custom_emoji: "%{name} uppfærði tjáningartákn %{target}"
         update_status: "%{name} uppfærði stöðufærslu frá %{target}"
       deleted_status: "(eydd stöðufærsla)"
+      empty: Engar atvikaskrár fundust.
+      filter_by_action: Sía eftir aðgerð
+      filter_by_user: Sía eftir notanda
       title: Atvikaskrá
     announcements:
       destroyed_msg: Það tókst að eyða auglýsingunni!
@@ -358,6 +399,7 @@ is:
       destroyed_msg: Tókst að eyða póstléni af lista yfir bannað
       domain: Lén
       empty: Engin tölvupóstlén eru á bannlista.
+      from_html: frá %{domain}
       new:
         create: Bæta við léni
         title: Ný færsla á bannlista fyrir tölvupóstföng
@@ -537,6 +579,9 @@ is:
       trends:
         desc_html: Birta opinberlega þau áður yfirförnu myllumerki sem eru núna í umræðunni
         title: Myllumerki í umræðunni
+    site_uploads:
+      delete: Eyða innsendri skrá
+      destroyed_msg: Það tókst að eyða innsendingu á vefsvæði!
     statuses:
       back_to_account: Fara aftur á síðu notandaaðgangsins
       batch:
@@ -573,7 +618,6 @@ is:
     warning_presets:
       add_new: Bæta við nýju
       delete: Eyða
-      edit: Breyta
       edit_preset: Breyta forstilltri aðvörun
       title: Sýsla með forstilltar aðvaranir
   admin_mailer:
@@ -661,6 +705,7 @@ is:
     trouble_logging_in: Vandræði við að skrá inn?
   authorize_follow:
     already_following: Þú ert að þegar fylgjast með þessum aðgangi
+    already_requested: Þú ert þegar búin/n að senda fylgjendabeiðni á þennan notanda
     error: Því miður, það kom upp villa við að fletta upp fjartengda notandaaðgangnum
     follow: Fylgjast með
     follow_request: 'Þú sendir beiðni um að fylgjast með til:'
@@ -849,6 +894,7 @@ is:
   media_attachments:
     validations:
       images_and_video: Ekki er hægt að hengja myndskeið við stöðufærslu sem þegar inniheldur myndir
+      not_ready: Ekki er hægt að hengja við skrár sem ekki er búið að vinna til fulls. Prófaðu aftur eftir augnablik!
       too_many: Ekki er hægt að hengja við fleiri en 4 skrár
   migrations:
     acct: Færði í
@@ -1070,6 +1116,8 @@ is:
     disallowed_hashtags:
       one: 'innihélt óleyfilegt myllumerki: %{tags}'
       other: 'innihélt óleyfilegu myllumerkin: %{tags}'
+    errors:
+      in_reply_not_found: Stöðufærslan sem þú ert að reyna að svara að er líklega ekki til.
     language_detection: Greina tungumál sjálfvirkt
     open_in_web: Opna í vafra
     over_character_limit: hámarksfjölda stafa (%{max}) náð
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2ccdc076c..2cc6d50d2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -92,6 +92,7 @@ it:
       delete: Elimina
       destroyed_msg: Nota di moderazione distrutta con successo!
     accounts:
+      add_email_domain_block: Inserisci il dominio email nella blacklist
       approve: Approva
       approve_all: Approva tutto
       are_you_sure: Sei sicuro?
@@ -172,6 +173,7 @@ it:
         staff: Personale
         user: Utente
       search: Cerca
+      search_same_email_domain: Altri utenti con lo stesso dominio e-mail
       search_same_ip: Altri utenti con lo stesso IP
       shared_inbox_url: URL Inbox Condiviso
       show:
@@ -193,6 +195,42 @@ it:
       web: Web
       whitelisted: Nella whitelist
     action_logs:
+      action_types:
+        assigned_to_self_report: Assegna report
+        change_email_user: Cambia l'e-mail per l'utente
+        confirm_user: Conferma utente
+        create_account_warning: Crea avviso
+        create_announcement: Crea un annuncio
+        create_custom_emoji: Crea emoji personalizzata
+        create_domain_allow: Crea permesso di dominio
+        create_domain_block: Crea blocco di dominio
+        create_email_domain_block: Crea blocco dominio e-mail
+        demote_user: Degrada l'utente
+        destroy_announcement: Cancella annuncio
+        destroy_custom_emoji: Cancella emoji personalizzata
+        destroy_domain_allow: Cancella permesso di dominio
+        destroy_domain_block: Cancella blocco di dominio
+        destroy_email_domain_block: Cancella blocco dominio e-mail
+        destroy_status: Cancella stato
+        disable_2fa_user: Disabilita l'autenticazione a due fattori
+        disable_custom_emoji: Disabilita emoji personalizzata
+        disable_user: Disabilita utente
+        enable_custom_emoji: Abilita emoji personalizzata
+        enable_user: Abilita utente
+        memorialize_account: Trasforma in account commemorativo
+        promote_user: Promuovi utente
+        remove_avatar_user: Elimina avatar
+        reopen_report: Riapri report
+        reset_password_user: Reimposta password
+        resolve_report: Risolvi report
+        silence_account: Silenzia account
+        suspend_account: Sospendi account
+        unassigned_report: Disassegna report
+        unsilence_account: De-silenzia account
+        unsuspend_account: Annulla la sospensione dell'account
+        update_announcement: Aggiorna annuncio
+        update_custom_emoji: Aggiorna emoji personalizzata
+        update_status: Aggiorna stato
       actions:
         assigned_to_self_report: "%{name} ha assegnato il rapporto %{target} a se stesso"
         change_email_user: "%{name} ha cambiato l'indirizzo email per l'utente %{target}"
@@ -230,6 +268,9 @@ it:
         update_custom_emoji: "%{name} ha aggiornato l'emoji %{target}"
         update_status: "%{name} stato aggiornato da %{target}"
       deleted_status: "(stato cancellato)"
+      empty: Nessun log trovato.
+      filter_by_action: Filtra per azione
+      filter_by_user: Filtra per utente
       title: Registro di controllo
     announcements:
       destroyed_msg: Annuncio eliminato!
@@ -244,7 +285,7 @@ it:
       scheduled_for: Programmato per %{time}
       scheduled_msg: Annuncio programmato per la pubblicazione!
       title: Annunci
-      unpublished_msg: Annuncio tolto dalla pubblicazione!
+      unpublished_msg: Annuncio ritirato!
       updated_msg: Annuncio aggiornato!
     custom_emojis:
       assign_category: Assegna categoria
@@ -358,6 +399,7 @@ it:
       destroyed_msg: Dominio email cancellato con successo dalla lista nera
       domain: Dominio
       empty: Nessun dominio di posta elettronica attualmente in blacklist.
+      from_html: da %{domain}
       new:
         create: Aggiungi dominio
         title: Nuova voce della lista nera delle email
@@ -537,6 +579,9 @@ it:
       trends:
         desc_html: Visualizza pubblicamente gli hashtag precedentemente esaminati che sono attualmente in tendenza
         title: Hashtag di tendenza
+    site_uploads:
+      delete: Cancella il file caricato
+      destroyed_msg: Caricamento sito eliminato!
     statuses:
       back_to_account: Torna alla pagina dell'account
       batch:
@@ -573,7 +618,6 @@ it:
     warning_presets:
       add_new: Aggiungi nuovo
       delete: Cancella
-      edit: Modifica
       edit_preset: Modifica avviso predefinito
       title: Gestisci avvisi predefiniti
   admin_mailer:
@@ -662,6 +706,7 @@ it:
     trouble_logging_in: Problemi di accesso?
   authorize_follow:
     already_following: Stai già seguendo questo account
+    already_requested: Hai già mandato una richiesta di seguire questo account
     error: Sfortunatamente c'è stato un errore nel consultare l'account remoto
     follow: Segui
     follow_request: 'Hai mandato una richiesta di diventare seguace a:'
@@ -850,6 +895,7 @@ it:
   media_attachments:
     validations:
       images_and_video: Impossibile allegare video a un post che contiene già immagini
+      not_ready: Impossibile allegare file per cui l'elaborazione non è finita. Riprova tra poco!
       too_many: Impossibile allegare più di 4 file
   migrations:
     acct: utente@dominio del nuovo account
@@ -1071,6 +1117,8 @@ it:
     disallowed_hashtags:
       one: 'contiene un hashtag non permesso: %{tags}'
       other: 'contiene gli hashtags non permessi: %{tags}'
+    errors:
+      in_reply_not_found: Lo stato a cui stai tentando di rispondere non sembra esistere.
     language_detection: Individua lingua automaticamente
     open_in_web: Apri sul Web
     over_character_limit: Limite caratteri superato di %{max}
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2875d4fd7..211ffb09c 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -88,6 +88,7 @@ ja:
       delete: 削除
       destroyed_msg: モデレーションメモを削除しました！
     accounts:
+      add_email_domain_block: ドメインをブラックリストに追加
       approve: 承認
       approve_all: すべて承認
       are_you_sure: 本当に実行しますか？
@@ -168,6 +169,7 @@ ja:
         staff: スタッフ
         user: ユーザー
       search: 検索
+      search_same_email_domain: 同じドメインのメールアドレスを使用しているユーザー
       search_same_ip: 同じ IP のユーザーを検索
       shared_inbox_url: Shared inbox URL
       show:
@@ -189,6 +191,42 @@ ja:
       web: Web
       whitelisted: ホワイトリストに登録済み
     action_logs:
+      action_types:
+        assigned_to_self_report: 通報の担当者に設定
+        change_email_user: ユーザーのメールアドレスを変更
+        confirm_user: ユーザーの確認
+        create_account_warning: 警告を作成
+        create_announcement: お知らせを作成
+        create_custom_emoji: カスタム絵文字を作成
+        create_domain_allow: ドメインホワイトリストに追加
+        create_domain_block: ドメインブロックを作成
+        create_email_domain_block: メールドメインブロックを作成
+        demote_user: ユーザーを降格
+        destroy_announcement: お知らせを削除
+        destroy_custom_emoji: カスタム絵文字を削除
+        destroy_domain_allow: ドメインホワイトリストから削除
+        destroy_domain_block: ドメインブロックを削除
+        destroy_email_domain_block: メールドメインブロックを削除
+        destroy_status: トゥートを削除
+        disable_2fa_user: 二段階認証を無効にする
+        disable_custom_emoji: カスタム絵文字を無効化
+        disable_user: ユーザーを無効化
+        enable_custom_emoji: カスタム絵文字を有効化
+        enable_user: ユーザーを有効化
+        memorialize_account: 追悼アカウント
+        promote_user: ユーザーを昇格
+        remove_avatar_user: アイコンを削除
+        reopen_report: 通報を再度開く
+        reset_password_user: パスワードをリセット
+        resolve_report: 通報を解決済みにする
+        silence_account: アカウントをサイレンス
+        suspend_account: アカウントをサスペンド
+        unassigned_report: 通報の担当を解除
+        unsilence_account: アカウントのサイレンスを解除
+        unsuspend_account: アカウントのサスペンドを解除
+        update_announcement: お知らせを更新
+        update_custom_emoji: カスタム絵文字を更新
+        update_status: ステータスを更新
       actions:
         assigned_to_self_report: "%{name} さんが通報 %{target} を自身の担当に割り当てました"
         change_email_user: "%{name} さんが %{target} さんのメールアドレスを変更しました"
@@ -226,6 +264,9 @@ ja:
         update_custom_emoji: "%{name} さんがカスタム絵文字 %{target} を更新しました"
         update_status: "%{name} さんが %{target} さんの投稿を更新しました"
       deleted_status: "(削除済)"
+      empty: ログが見つかりませんでした
+      filter_by_action: アクションでフィルター
+      filter_by_user: ユーザーでフィルター
       title: 操作履歴
     announcements:
       destroyed_msg: お知らせが削除されました
@@ -353,6 +394,7 @@ ja:
       destroyed_msg: ブラックリストから外しました
       domain: ドメイン
       empty: メールブラックリストに登録されたドメインはありません
+      from_html: "%{domain} から"
       new:
         create: ドメインを追加
         title: メールアドレス用ブラックリスト新規追加
@@ -529,6 +571,9 @@ ja:
       trends:
         desc_html: 現在トレンドになっている承認済みのハッシュタグを公開します
         title: トレンドタグを有効にする
+    site_uploads:
+      delete: ファイルを削除
+      destroyed_msg: ファイルを削除しました！
     statuses:
       back_to_account: アカウントページに戻る
       batch:
@@ -565,7 +610,6 @@ ja:
     warning_presets:
       add_new: 追加
       delete: 削除
-      edit: 編集
       edit_preset: プリセット警告文を編集
       title: プリセット警告文を管理
   admin_mailer:
@@ -653,6 +697,7 @@ ja:
     trouble_logging_in: ログインできませんか？
   authorize_follow:
     already_following: あなたは既にこのアカウントをフォローしています
+    already_requested: 既にこのアカウントへフォローリクエストを送信しています
     error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました
     follow: フォロー
     follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:'
@@ -839,6 +884,7 @@ ja:
   media_attachments:
     validations:
       images_and_video: 既に画像が追加されているため、動画を追加することはできません
+      not_ready: ファイルのアップロードに失敗しました。しばらくしてからもう一度お試しください！
       too_many: 追加できるファイルは4つまでです
   migrations:
     acct: 引っ越し先の ユーザー名@ドメイン
@@ -1055,6 +1101,8 @@ ja:
     content_warning: '閲覧注意: %{warning}'
     disallowed_hashtags:
       other: '許可されていないハッシュタグが含まれています: %{tags}'
+    errors:
+      in_reply_not_found: あなたが返信しようとしているトゥートは存在しないようです。
     language_detection: 自動検出
     open_in_web: Webで開く
     over_character_limit: 上限は %{max}文字までです
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 03f4d8c13..92c14f68c 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -58,7 +58,7 @@ kab:
     posts:
       one: Tajewwiqt
       other: Tijewwiqin
-    posts_tab_heading: Tiberraḥin
+    posts_tab_heading: Tijewwiqin
     posts_with_replies: Tijewwaqin akked tririyin
     reserved_username: Isem-agi n umseqdac yettwaṭṭef yakan
     roles:
@@ -107,6 +107,7 @@ kab:
       location:
         all: Akk
         local: Adigan
+        remote: Ameccaq
         title: Amḍiq
       login_status: Addad n tuqqna
       memorialize: Err amiḍan d asebter n usmekti
@@ -122,8 +123,8 @@ kab:
       protocol: Aneggaf
       public: Azayez
       redownload: Smiren amaγnu
-      reject: Ggami
-      reject_all: Ggami-ten akk
+      reject: Aggi
+      reject_all: Aggi-ten akk
       remove_avatar: Kkes tugna n wummuγ
       resend_confirmation:
         already_confirmed: Amseqdac-agi yettwasentem yakan
@@ -143,26 +144,26 @@ kab:
       statuses: Tisuffγin
       subscribe: Jerred
       time_in_queue: Deg tebdert n uraju %{time}
-      title: Imiḍan
+      title: Imiḍanen
       unconfirmed_email: Imayl ur yettwasentem ara
       undo_silenced: Kkes asgugem
       unsubscribe: Ur ṭafar ara
       username: Isem n useqdac
       web: Web
-      whitelisted: Deg tebdert tamellalt
+      whitelisted: Deg umuγ tamellalt
     action_logs:
       actions:
         change_email_user: "%{name} ibeddel imayl n umseqdac %{target}"
         confirm_user: "%{name} isentem tansa imayl n umseqdac %{target}"
         create_account_warning: "%{name} yuzen alγu i %{target}"
         create_custom_emoji: "%{name} yessuli-d imujiten imaynuten %{target}"
-        create_domain_allow: "%{name} yerna taγult %{target} γer tebdart tamellalt"
+        create_domain_allow: "%{name} yerna taγult %{target} γer wumuγ amellal"
         create_domain_block: "%{name} yesseḥbes taγult %{target}"
-        create_email_domain_block: "%{name} yerna taγult n imayl %{target} γer tebdart taberkant"
+        create_email_domain_block: "%{name} yerna taγult n imayl %{target} γer wumuγ aberkan"
         destroy_custom_emoji: "%{name} ihudd imuji %{target}"
-        destroy_domain_allow: "%{name} yekkes taγult %{target} seg tebdart tamellalt"
+        destroy_domain_allow: "%{name} yekkes taγult %{target} seg wumuγ amellal"
         destroy_domain_block: "%{name} yekkes aseḥbes n taγult %{target}"
-        destroy_email_domain_block: "%{name} yerna taγult n imayl %{target} γer tebdart tamellalt"
+        destroy_email_domain_block: "%{name} yerna taγult n imayl %{target} γer wumuγ amellal"
         destroy_status: "%{name} yekkes tasuffeγt n %{target}"
         disable_custom_emoji: "%{name} yessens imuji %{target}"
         disable_user: "%{name} yessens tuqqna i umseqdac %{target}"
@@ -178,6 +179,7 @@ kab:
       edit:
         title: Ẓreg ulγu
       empty: Ulac kra n ulγuyen.
+      live: Srid
       new:
         create: Rnu-d ulγu
         title: Ulγu amaynut
@@ -198,32 +200,35 @@ kab:
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
       image_hint: PNG n ddaw n 50KT
-      list: Tabdart
+      list: Umuγ
       new:
         title: Timerna n imuji udmawan amaynut
       overwrite: Semselsi
       title: Imujiten udmawanen
-      unlist: Kkes si tabdert
-      unlisted: Yettwakkes si tabdert
+      unlist: Kkes seg wumuγ
+      unlisted: Yettwakkes seg wumuγ
       update_failed_msg: Ur izmir ara ad-issali umuji-a
       upload: Sali
     dashboard:
       config: Tawila
+      feature_invites: Iseγwan n iɛaṛuḍen
       feature_profile_directory: Akaram n imaγnuten
       feature_registrations: Ajerred
+      feature_relay: Anmegli n tfidiṛalitt
       features: Timahaltin
-      open_reports: ad yeldi ineqqisen
+      open_reports: yeldin d ineqqisen
+      pending_users: imseqdacen ttrajun aɛiwed n tmuγli
       recent_users: Iseqdacen n memli kan
       software: Aseγẓan
       title: Tafelwit
       total_users: igellan akk d iseqdacen
-      week_users_active: yermed deg yimalas-agi
+      week_users_active: urmiden deg yimalas-agi
       week_users_new: imseqdacen deg yimalas-agi
     domain_allows:
-      add_new: Timerna n taγult γer tebdart tamellalt
-      created_msg: Taγult-a tettwarna γer tebdart tamellalt mebla ugur
-      destroyed_msg: Taγult-a tettwakkes seg tebdart tamellalt
-      undo: Kkes seg tebdart tamellalt
+      add_new: Timerna n taγult γer wumuγ amellal
+      created_msg: Taγult-a tettwarna γer wumuγ amellal mebla ugur
+      destroyed_msg: Taγult-a tettwakkes seg umuγ amellal
+      undo: Kkes seg umuγ amellal
     domain_blocks:
       domain: Taγult
       new:
@@ -242,13 +247,13 @@ kab:
       domain: Taγult
       new:
         create: Rnu taγult
-        title: Timerna n taγult tamaynut n imayl γer tebdart taberkant
-      title: Tabdart taberkant n imayl
+        title: Timerna n taγult tamaynut n imayl γer wumuγ aberkan
+      title: Umuγ aberkan n imayl
     instances:
       by_domain: Taγult
       delivery_available: Yella usiweḍ
       known_accounts:
-        one: "%{count} n umiḍan i yettwassen"
+        one: "%{count} n umiḍan i yettwasnen"
         other: "%{count} n yimiḍanen i yettwassnen"
       moderation:
         all: Akk
@@ -265,13 +270,19 @@ kab:
         expired: Ifat
         title: Asizdeg
       title: Iɛaruḍen
+    pending_accounts:
+      title: Imiḍanen yettrajun (%{count})
     relays:
+      add_new: Rnu anmegli amaynut
       delete: Kkes
       disable: Gdel
+      disabled: Yettwassens
       enable: Rmed
       enabled: Yermed
+      inbox_url: URL n unmegli
       save_and_enable: Sekles rnu rmed-it
       status: Addad
+      title: Imnegliyen
     reports:
       account:
         reports:
@@ -312,6 +323,8 @@ kab:
         title: Aglam n uqeddac
       site_title: Isem n uqeddac
       title: Iγewwaṛen n usmel
+    site_uploads:
+      delete: Kkes afaylu yulin
     statuses:
       back_to_account: Tuγalin γer usebter n umiḍan
       batch:
@@ -320,6 +333,7 @@ kab:
       media:
         title: Taγwalt
       no_media: Mebla taγwalt
+      title: Tisuffiγin n umiḍan
       with_media: S taγwalt
     tags:
       directory: Deg ukaram
@@ -327,10 +341,11 @@ kab:
       last_active: Armud aneggaru
       most_popular: Ittwasnen aṭas
       most_recent: Melmi kan
+      name: Ahacṭag
+      title: Ihacṭagen
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
-      edit: Ẓreg
   admin_mailer:
     new_report:
       subject: Aneqqis amaynut i %{instance} (#%{id})
@@ -342,9 +357,13 @@ kab:
     sensitive_content: Agbur amḥulfu
   application_mailer:
     salutation: "%{name},"
+    view: 'Ẓaṛ:'
     view_profile: Sken-d amaγnu
+    view_status: Sken-d tasuffiγt
   auth:
     change_password: Awal uffir
+    checkbox_agreement_html: Qebleγ <a href="%{rules_path}" target="_blank">ilugan n uqeddac-a</a> akked <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
+    checkbox_agreement_without_rules_html: Qebleγ <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
     delete_account: Kkes amiḍan
     description:
       prefix_sign_up: Zeddi di Maṣṭudun assa!
@@ -359,7 +378,7 @@ kab:
     register: Jerred
     reset_password: Wennez awal uffir
     security: Taγellist
-    set_new_password: Egr-ed awal uffir amaynut
+    set_new_password: Egr-d awal uffir amaynut
     status:
       account_status: Addad n umiḍan
       functional: Amiḍan-inek·m yettwaheyya.
@@ -369,7 +388,7 @@ kab:
     follow: Ḍfeṛ
     following: 'Igerrez! Aqlik teṭafareḍ tura:'
     post_follow:
-      return: Sken-ed amγnu n useqdac
+      return: Sken-d amγnu n useqdac
       web: Ddu γer Web
     title: Ḍfeṛ %{acct}
   challenge:
@@ -381,18 +400,18 @@ kab:
       default: "%d %b %Y"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}a"
+      about_x_hours: "%{count}isr"
       about_x_months: "%{count}ug"
-      about_x_years: "%{count}i"
-      almost_x_years: "%{count}i"
+      about_x_years: "%{count}isg"
+      almost_x_years: "%{count}isg"
       half_a_minute: Tura kan
-      less_than_x_minutes: "%{count}t"
+      less_than_x_minutes: "%{count}tis"
       less_than_x_seconds: Tura kan
-      over_x_years: "%{count}i"
+      over_x_years: "%{count}isg"
       x_days: "%{count}wu"
-      x_minutes: "%{count}t"
-      x_months: "%{count}ug"
-      x_seconds: "%{count}t"
+      x_minutes: "%{count}tis"
+      x_months: "%{count}agu"
+      x_seconds: "%{count}tas"
   deletes:
     proceed: Kkes amiḍan
   directories:
@@ -405,8 +424,9 @@ kab:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
-    '500': 
+    '429': Too many requests
+    '500':
+      title: Asebter-ayi d arameγtu
     '503': The page could not be served due to a temporary server failure.
   existing_username_validator:
     not_found_multiple: ur yezmir ara ad yaf %{usernames}
@@ -415,7 +435,7 @@ kab:
       date: Azemz
       size: Teγzi
     csv: CSV
-    lists: Tibdarin
+    lists: Umuγen
     mutes: Wid tesgugmeḍ
   featured_tags:
     add_new: Rnu amaynut
@@ -437,6 +457,7 @@ kab:
     more: Ugar…
   generic:
     all: Akk
+    changes_saved_msg: Ttwaskelsen ibelliden-ik·im akken ilaq!
     copy: Nγel
     delete: Kkes
     order_by: Sizwer s
@@ -452,7 +473,8 @@ kab:
     modes:
       overwrite: Semselsi
     types:
-      following: Tabdart n wid teṭafareḍ
+      following: Umuγ n wid teṭafareḍ
+      muting: Umuγ n wid tesgugmeḍ
     upload: Sali
   invites:
     expires_in:
@@ -466,7 +488,8 @@ kab:
     title: Ɛreḍ-d kra n yimdanen
   migrations:
     acct: Ibeddel γer
-    incoming_migrations: Tusiḍ-ed seg umiḍan nniḍen
+    incoming_migrations: Tusiḍ-d seg umiḍan nniḍen
+    proceed_with_move: Awid imeḍfaṛen-ik
   notification_mailer:
     digest:
       action: Wali akk tilγa
@@ -494,6 +517,12 @@ kab:
     status: Addad n umiḍan
   remote_follow:
     no_account_html: Ur tesɛid ara amiḍan? Tzmreḍ <a href='%{sign_up_path}' target='_blank'>ad jerdeḍ da</a>
+    proceed: Kemmel taḍfart
+  remote_interaction:
+    favourite:
+      proceed: Kemmel asmenyef
+    reply:
+      proceed: Kemmel tiririt
   sessions:
     activity: Armud aneggaru
     browser: Iminig
@@ -559,7 +588,7 @@ kab:
       total_people:
         one: "%{count} n wemdan"
         other: "%{count} n yemdanen"
-    show_more: Sken-ed ugar
+    show_more: Sken-d ugar
     sign_in_to_participate: Qqen i waken ad tzeddiḍ deg udiwenni
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 416a5fc7d..bb7a57e87 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -555,7 +555,6 @@ kk:
     warning_presets:
       add_new: Add nеw
       delete: Deletе
-      edit: Еdit
       edit_preset: Edit warning prеset
       title: Manage warning presеts
   admin_mailer:
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index d6c1d98eb..25bee609a 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -7,7 +7,7 @@ kn:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e70fbef21..2ac3fb39d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -88,6 +88,7 @@ ko:
       delete: 삭제
       destroyed_msg: 중재 기록이 성공적으로 삭제되었습니다!
     accounts:
+      add_email_domain_block: 이 이메일 도메인을 차단하기
       approve: 승인
       approve_all: 모두 승인
       are_you_sure: 정말로 실행하시겠습니까?
@@ -168,6 +169,7 @@ ko:
         staff: 스태프
         user: 사용자
       search: 검색
+      search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들
       search_same_ip: 같은 IP의 다른 사용자들
       shared_inbox_url: 공유된 inbox URL
       show:
@@ -189,6 +191,42 @@ ko:
       web: 웹
       whitelisted: 허용 목록
     action_logs:
+      action_types:
+        assigned_to_self_report: 신고 맡기
+        change_email_user: 사용자의 이메일 변경
+        confirm_user: 사용자 확인
+        create_account_warning: 경고 생성
+        create_announcement: 공지사항 생성
+        create_custom_emoji: 커스텀 에모지 생성
+        create_domain_allow: 도메인 허용 생성
+        create_domain_block: 도메인 차단 추가
+        create_email_domain_block: 이메일 도메인 차단 생성
+        demote_user: 사용자 강등
+        destroy_announcement: 공지사항 삭제
+        destroy_custom_emoji: 커스텀 에모지 삭제
+        destroy_domain_allow: 도메인 허용 삭제
+        destroy_domain_block: 도메인 차단 삭제
+        destroy_email_domain_block: 이메일 도메인 차단 삭제
+        destroy_status: 게시물 삭제
+        disable_2fa_user: 2단계 인증 비활성화
+        disable_custom_emoji: 커스텀 에모지 비활성화
+        disable_user: 사용자 비활성화
+        enable_custom_emoji: 커스텀 에모지 활성화
+        enable_user: 사용자 활성화
+        memorialize_account: 계정을 장기 저장
+        promote_user: 사용자 승급
+        remove_avatar_user: 아바타 지우기
+        reopen_report: 신고 다시 열기
+        reset_password_user: 암호 재설정
+        resolve_report: 신고 처리
+        silence_account: 계정 침묵
+        suspend_account: 계정 정지
+        unassigned_report: 신고 맡기 취소
+        unsilence_account: 계정 침묵 취소
+        unsuspend_account: 계정 정지 취소
+        update_announcement: 공지사항 업데이트
+        update_custom_emoji: 커스텀 에모지 업데이트
+        update_status: 게시물 게시
       actions:
         assigned_to_self_report: "%{name}이 리포트 %{target}을 자신에게 할당했습니다"
         change_email_user: "%{name}이 %{target}의 이메일 주소를 변경했습니다"
@@ -226,6 +264,9 @@ ko:
         update_custom_emoji: "%{name}이 에모지 %{target}를 업데이트 했습니다"
         update_status: "%{name}이 %{target}의 상태를 업데이트 했습니다"
       deleted_status: "(삭제됨)"
+      empty: 로그를 찾을 수 없습니다
+      filter_by_action: 행동으로 거르기
+      filter_by_user: 유저로 거르기
       title: 감사 기록
     announcements:
       destroyed_msg: 공지가 성공적으로 삭제되었습니다!
@@ -355,6 +396,7 @@ ko:
       destroyed_msg: 이메일 도메인 차단 규칙을 삭제했습니다
       domain: 도메인
       empty: 현재 블랙리스트에 등록한 이메일 도메인이 없습니다
+      from_html: "%{domain}에서"
       new:
         create: 차단 규칙 생성
         title: 새 이메일 도메인 차단
@@ -531,6 +573,9 @@ ko:
       trends:
         desc_html: 리뷰를 거친 해시태그를 유행하는 해시태그에 공개적으로 보여줍니다
         title: 유행하는 해시태그
+    site_uploads:
+      delete: 업로드한 파일 삭제
+      destroyed_msg: 사이트 업로드를 성공적으로 삭제했습니다!
     statuses:
       back_to_account: 계정으로 돌아가기
       batch:
@@ -567,7 +612,6 @@ ko:
     warning_presets:
       add_new: 새로 추가
       delete: 삭제
-      edit: 편집
       edit_preset: 경고 틀 수정
       title: 경고 틀 관리
   admin_mailer:
@@ -655,6 +699,7 @@ ko:
     trouble_logging_in: 로그인 하는데 문제가 있나요?
   authorize_follow:
     already_following: 이미 이 계정을 팔로우 하고 있습니다
+    already_requested: 이미 이 계정에게 팔로우 요청을 보냈습니다
     error: 리모트 계정을 확인하는 도중 오류가 발생했습니다
     follow: 팔로우
     follow_request: '당신은 다음 계정에 팔로우 신청을 했습니다:'
@@ -841,6 +886,7 @@ ko:
   media_attachments:
     validations:
       images_and_video: 이미 사진이 첨부 된 게시물엔 동영상을 첨부 할 수 없습니다
+      not_ready: 처리가 끝나지 않은 파일은 첨부할 수 없습니다. 잠시 후에 다시 시도해 주세요!
       too_many: 최대 4개까지 첨부할 수 있습니다
   migrations:
     acct: 새 계정의 username@domain
@@ -1057,6 +1103,8 @@ ko:
     content_warning: '열람 주의: %{warning}'
     disallowed_hashtags:
       other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'
+    errors:
+      in_reply_not_found: 답장하려는 게시물이 존재하지 않습니다.
     language_detection: 자동으로 언어 감지
     open_in_web: Web으로 열기
     over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9af094c01..5a4542ea8 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -410,7 +410,6 @@ lt:
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
-      edit: Keisti
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
   admin_mailer:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f6625dd41..5c493be56 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -7,7 +7,7 @@ lv:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index acb18fb5a..c2cafa5a7 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -7,7 +7,7 @@ mk:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 960ab95cc..f2731cf04 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -51,7 +51,7 @@ ml:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 3f83ed785..72228df52 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -7,7 +7,7 @@ mr:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 71dc72d9d..3ab481846 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -291,7 +291,7 @@ ms:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 976072368..7ab26c4ba 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -537,6 +537,9 @@ nl:
       trends:
         desc_html: Eerder beoordeelde hashtags die op dit moment trending zijn openbaar tonen
         title: Trending hashtags
+    site_uploads:
+      delete: Geüpload bestand verwijderen
+      destroyed_msg: Verwijderen website-upload geslaagd!
     statuses:
       back_to_account: Terug naar accountpagina
       batch:
@@ -573,7 +576,6 @@ nl:
     warning_presets:
       add_new: Nieuwe toevoegen
       delete: Verwijderen
-      edit: Bewerken
       edit_preset: Voorinstelling van waarschuwing bewerken
       title: Voorinstellingen van waarschuwingen beheren
   admin_mailer:
@@ -661,6 +663,7 @@ nl:
     trouble_logging_in: Problemen met inloggen?
   authorize_follow:
     already_following: Je volgt dit account al
+    already_requested: Je hebt al een volgverzoek naar dat account verstuurd
     error: Helaas, er is een fout opgetreden bij het opzoeken van de externe account
     follow: Volgen
     follow_request: 'Jij hebt een volgverzoek ingediend bij:'
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index fd61f2156..f83646a7b 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -21,9 +21,7 @@ nn:
     federation_hint_html: Med ein konto på %{instance} kan du fylgja folk på kva som helst slags Mastod-tenar og meir.
     get_apps: Prøv ein mobilapp
     hosted_on: "%{domain} er vert for Mastodon"
-    instance_actor_flash: 'Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet.
-
-'
+    instance_actor_flash: "Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet. \n"
     learn_more: Lær meir
     privacy_policy: Personvernsreglar
     see_whats_happening: Sjå kva som skjer
@@ -566,7 +564,6 @@ nn:
     warning_presets:
       add_new: Legg til ny
       delete: Slett
-      edit: Rediger
       edit_preset: Endr åtvaringsoppsett
       title: Handsam åtvaringsoppsett
   admin_mailer:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 256ed99a3..4a1b859dc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -561,7 +561,6 @@
     warning_presets:
       add_new: Legg til ny
       delete: Slett
-      edit: Rediger
   admin_mailer:
     new_pending_account:
       body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 4a60227ab..0be4f6458 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -186,6 +186,33 @@ oc:
       web: Web
       whitelisted: Mes en lista blanca
     action_logs:
+      action_types:
+        assigned_to_self_report: Assignar lo rapòrt
+        change_email_user: Cambiar l’adreça de l’utilizaire
+        confirm_user: Confirmar l’utilizaire
+        create_account_warning: Crear un avertiment
+        create_announcement: Crear una anóncia
+        create_custom_emoji: Crear un emoji personalizat
+        demote_user: Retrogradar l’utilizaire
+        destroy_announcement: Suprimir l’anóncia
+        destroy_custom_emoji: Suprimir l’emoji personalizat
+        destroy_domain_block: Suprimir lo blocatge de domeni
+        destroy_status: Suprimir l’estatut
+        disable_2fa_user: Desactivar 2FA
+        disable_custom_emoji: Desactivar l’emoji personalizat
+        disable_user: Desactivar l’utilizaire
+        enable_custom_emoji: Activar l’emoji personalizat
+        enable_user: Activar l’utilizaire
+        promote_user: Promòure l’utilizaire
+        remove_avatar_user: Suprimir l’avatar
+        reopen_report: Tornar dobrir lo rapòrt
+        reset_password_user: Reïnicializar lo senhal
+        resolve_report: Resòlver lo rapòrt
+        suspend_account: Suspendre lo compte
+        unassigned_report: Desafectar lo rapòrt
+        update_announcement: Actualizar l’anóncia
+        update_custom_emoji: Actualizar l’emoji personalizat
+        update_status: Actualizar l’estatut
       actions:
         assigned_to_self_report: "%{name} s’assignèt lo rapòrt %{target}"
         change_email_user: "%{name} cambièt l’adreça de corrièl de %{target}"
@@ -223,6 +250,9 @@ oc:
         update_custom_emoji: "%{name} metèt a jorn l’emoji %{target}"
         update_status: "%{name} metèt a jorn l’estatut a %{target}"
       deleted_status: "(estatut suprimit)"
+      empty: Cap de jornal pas trobat.
+      filter_by_action: Filtrar per accion
+      filter_by_user: Filtrar per utilizaire
       title: Audit dels jornals
     announcements:
       destroyed_msg: Anóncia corrèctament tirada !
@@ -558,7 +588,6 @@ oc:
     warning_presets:
       add_new: N’ajustar un nòu
       delete: Escafar
-      edit: Modificar
       edit_preset: Modificar lo tèxt predefinit d’avertiment
       title: Gerir los tèxtes predefinits
   admin_mailer:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 28a486145..c8bad6de3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -100,6 +100,7 @@ pl:
       delete: Usuń
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną!
     accounts:
+      add_email_domain_block: Dodaj domenę e-mail na czarną listę
       approve: Przyjmij
       approve_all: Zatwierdź wszystkie
       are_you_sure: Jesteś tego pewien?
@@ -180,6 +181,7 @@ pl:
         staff: Ekipa
         user: Użytkownik
       search: Szukaj
+      search_same_email_domain: Inni użytkownicy z e-mail w tej domenie
       search_same_ip: Inni użytkownicy z tym samym IP
       shared_inbox_url: Adres udostępnianej skrzynki
       show:
@@ -201,6 +203,42 @@ pl:
       web: Sieć
       whitelisted: Na białej liście
     action_logs:
+      action_types:
+        assigned_to_self_report: Przypisz zgłoszenie
+        change_email_user: Zmień adres e-mail użytkownika
+        confirm_user: Potwierdź użytkownika
+        create_account_warning: Utwórz ostrzeżenie
+        create_announcement: Utwórz ogłoszenie
+        create_custom_emoji: Utwórz niestandardowe emoji
+        create_domain_allow: Utwórz zezwolenie dla domeny
+        create_domain_block: Utwórz blokadę domeny
+        create_email_domain_block: Utwórz blokadę domeny e-mail
+        demote_user: Zdegraduj użytkownika
+        destroy_announcement: Usuń ogłoszenie
+        destroy_custom_emoji: Usuń niestandardowe emoji
+        destroy_domain_allow: Usuń zezwolenie dla domeny
+        destroy_domain_block: Usuń blokadę domeny
+        destroy_email_domain_block: Usuń blokadę domeny e-mail
+        destroy_status: Usuń wpis
+        disable_2fa_user: Wyłącz 2FA
+        disable_custom_emoji: Wyłącz niestandardowe emoji
+        disable_user: Wyłącz użytkownika
+        enable_custom_emoji: Włącz niestandardowe emoji
+        enable_user: Włącz użytkownika
+        memorialize_account: Upamiętnij konto
+        promote_user: Podnieś uprawnienia
+        remove_avatar_user: Usuń awatar
+        reopen_report: Otwórz zgłoszenie ponownie
+        reset_password_user: Resetuj hasło
+        resolve_report: Rozwiąż zgłoszenie
+        silence_account: Wycisz konto
+        suspend_account: Zawieś konto
+        unassigned_report: Cofnij przypisanie zgłoszenia
+        unsilence_account: Cofnij wyciszenie konta
+        unsuspend_account: Cofnij zawieszenie konta
+        update_announcement: Aktualizuj ogłoszenie
+        update_custom_emoji: Aktualizuj niestandardowe emoji
+        update_status: Aktualizuj wpis
       actions:
         assigned_to_self_report: "%{name} przypisał(a) sobie zgłoszenie %{target}"
         change_email_user: "%{name} zmienił(a) adres e-mail użytkownika %{target}"
@@ -238,6 +276,9 @@ pl:
         update_custom_emoji: "%{name} zaktualizował(a) emoji %{target}"
         update_status: "%{name} zaktualizował(a) wpis użytkownika %{target}"
       deleted_status: "(usunięty wpis)"
+      empty: Nie znaleziono aktywności w dzienniku.
+      filter_by_action: Filtruj według działania
+      filter_by_user: Filtruj według użytkownika
       title: Dziennik działań administracyjnych
     announcements:
       destroyed_msg: Pomyślnie usunięto ogłoszenie!
@@ -368,6 +409,7 @@ pl:
       destroyed_msg: Pomyślnie usunięto blokadę domeny e-mail
       domain: Domena
       empty: Żadna domena e-mail nie znajduje się obecnie na czarnej liście.
+      from_html: z %{domain}
       new:
         create: Utwórz blokadę
         title: Nowa blokada domeny e-mail
@@ -424,6 +466,17 @@ pl:
       created_msg: Pomyslnie utworzono notatkę moderacyjną.
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną.
     reports:
+      account:
+        notes:
+          few: "%{count} notatki"
+          many: "%{count} notatek"
+          one: "%{count} notatka"
+          other: "%{count} notatki"
+        reports:
+          few: "%{count} zgłoszenia"
+          many: "%{count} zgłoszeń"
+          one: "%{count} zgłoszenie"
+          other: "%{count} zgłoszenia"
       action_taken_by: Działanie podjęte przez
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
@@ -464,6 +517,18 @@ pl:
       custom_css:
         desc_html: Modyfikuj wygląd pliku CSS ładowanego na każdej stronie
         title: Niestandardowy CSS
+      default_noindex:
+        desc_html: Wpływa na wszystkich użytkowników, którzy nie zmienili tego ustawienia
+        title: Domyślnie żądaj nieindeksowania użytkowników w wyszukiwarkach
+      domain_blocks:
+        all: Każdemu
+        disabled: Nikomu
+        title: Pokazuj zablokowane domeny
+        users: Zalogowanym lokalnym użytkownikom
+      domain_blocks_rationale:
+        title: Pokaż uzasadnienia
+      enable_bootstrap_timeline_accounts:
+        title: Dodawaj domyślne obserwacje nowym użytkownikom
       hero:
         desc_html: Wyświetlany na stronie głównej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. Jeżeli nie ustawiony, zostanie użyta miniatura serwera
         title: Obraz bohatera
@@ -514,6 +579,9 @@ pl:
         desc_html: Miejsce na własną politykę prywatności, zasady użytkowania i inne unormowania prawne. Możesz korzystać ze znaczników HTML
         title: Niestandardowe zasady użytkowania
       site_title: Nazwa serwera
+      spam_check_enabled:
+        desc_html: Mastodon może automatycznie zgłaszać konta, które wysyłają powtarzające się niechciane wiadomości. Część zgłoszeń może być nieprawidłowa.
+        title: Automatyzacja antyspamu
       thumbnail:
         desc_html: 'Używana w podglądzie przez OpenGraph i API. Zalecany rozmiar: 1200x630 pikseli'
         title: Miniatura serwera
@@ -521,12 +589,22 @@ pl:
         desc_html: Wyświetlaj publiczną oś czasu na stronie widocznej dla niezalogowanych
         title: Podgląd osi czasu
       title: Ustawienia strony
+      trendable_by_default:
+        desc_html: Wpływa na hashtagi, które nie były wcześniej niedozwolone
+        title: Hashtagi mogą pojawiać się w trendach bez wcześniejszego zatwierdzenia
+      trends:
+        desc_html: Wyświetlaj publicznie wcześniej sprawdzone hashtagi, które są obecnie na czasie
+        title: Popularne hashtagi
+    site_uploads:
+      delete: Usuń przesłany plik
+      destroyed_msg: Pomyślnie usunięto przesłany plik!
     statuses:
       back_to_account: Wróć na konto
       batch:
         delete: Usuń
         nsfw_off: Cofnij NSFW
         nsfw_on: Oznacz jako NSFW
+      deleted: Usunięto
       failed_to_execute: Nie udało się wykonać
       media:
         title: Multimedia
@@ -535,13 +613,27 @@ pl:
       title: Wpisy konta
       with_media: Z zawartością multimedialną
     tags:
+      accounts_today: Unikalne wykorzystania dzisiaj
+      accounts_week: Unikalne wykorzystania w tym tygodniu
+      breakdown: Podział dzisiejszego wykorzystania według źródła
+      context: Kontekst
+      directory: W katalogu
+      in_directory: "%{count} w katalogu"
+      last_active: Ostatnia aktywność
+      most_popular: Najpopularniejsze
+      most_recent: Ostatnie
       name: Hasztag
+      review: Stan przeglądu
+      reviewed: Przejrzany
       title: Hashtagi
+      trending_right_now: Obecnie na czasie
+      unique_uses_today: "%{count} opublikowanych dzisiaj"
+      unreviewed: Nie przejrzano
+      updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
     title: Administracja
     warning_presets:
       add_new: Dodaj nowy
       delete: Usuń
-      edit: Edytuj
       edit_preset: Edytuj szablon ostrzeżenia
       title: Zarządzaj szablonami ostrzeżeń
   admin_mailer:
@@ -552,14 +644,27 @@ pl:
       body: Użytkownik %{reporter} zgłosił(a) %{target}
       body_remote: Użytkownik instancji %{domain} zgłosił(a) %{target}
       subject: Nowe zgłoszenie na %{instance} (#%{id})
+    new_trending_tag:
+      body: 'Hashtag #%{name} jest dziś popularny, ale nie został wcześniej zatwierdzony. Nie będzie wyświetlany publicznie zanim na to pozwolisz, możesz też zapisać, że nie chcesz o nim już słyszeć.'
+      subject: Nowy hashtag do zatwierdzenia na %{instance} (#%{name})
   aliases:
     add_new: Utwórz alias
+    created_msg: Pomyślnie utworzono nowy alias. Możesz teraz rozpocząć przenoszenie ze starego konta.
+    deleted_msg: Pomyślnie usunięto alias. Przenoszenie z tamtego konta na to nie będzie dłużej możliwe.
+    hint_html: Jeżeli chcesz przenieść się z innego konta na to, możesz utworzyć alias, który jest wymagany zanim zaczniesz przenoszenie obserwacji z poprzedniego konta na to. To działanie <strong>nie wyrządzi szkód i jest odwracalne</strong>. <strong>Migracja konta jest inicjowana ze starego konta</strong>.
+    remove: Odłącz alias
   appearance:
     advanced_web_interface: Zaawansowany interfejs użytkownika
     advanced_web_interface_hint: Jeśli chcesz użyć pełną szerokość swojego ekranu, zaawansowany interfejs użytkownika pozwala Ci skonfigurować wiele różnych kolumn, by zobaczyć jak najwięcej informacji kiedy tylko chcesz. Strona główna, Powiadomienia, Globalna oś czasu, dowolna ilość list i hasztagów.
     animations_and_accessibility: Animacje i dostępność
     confirmation_dialogs: Dialogi potwierdzenia
+    discovery: Odkrywanie
+    localization:
+      body: Mastodon jest tłumaczony przez wolontariuszy.
+      guide_link: https://pl.crowdin.com/project/mastodon
+      guide_link_text: Każdy może wnieść swój wkład.
     sensitive_content: Wrażliwa zawartość
+    toot_layout: Wygląd wpisów
   application_mailer:
     notification_preferences: Zmień ustawienia e-maili
     salutation: "%{name},"
@@ -579,8 +684,13 @@ pl:
     apply_for_account: Poproś o zaproszenie
     change_password: Hasło
     checkbox_agreement_html: Zgadzam się z <a href="%{rules_path}" target="_blank">regułami serwera</a> i <a href="%{terms_path}" target="_blank">zasadami korzystania z usługi</a>
+    checkbox_agreement_without_rules_html: Akceptuję <a href="%{terms_path}" target="_blank">warunki korzystania z usługi</a>
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
+    description:
+      prefix_invited_by_user: "@%{name} zaprasza Cię do dołączenia na ten serwer Mastodona!"
+      prefix_sign_up: Zarejestruj się na Mastodon już dziś!
+      suffix: Mając konto, możesz śledzić ludzi, publikować wpisy i wymieniać się wiadomościami z użytkownikami innych serwerów Mastodona i nie tylko!
     didnt_get_confirmation: Nie otrzymałeś(-aś) instrukcji weryfikacji?
     forgot_password: Nie pamiętasz hasła?
     invalid_reset_password_token: Token do resetowania hasła jest nieprawidłowy lub utracił ważność. Spróbuj uzyskać nowy.
@@ -598,9 +708,20 @@ pl:
     reset_password: Zresetuj hasło
     security: Bezpieczeństwo
     set_new_password: Ustaw nowe hasło
+    setup:
+      email_below_hint_html: Jeżeli poniższy adres e-mail jest nieprawidłowy, możesz zmienić go tutaj i otrzymać nowy e-mail potwierdzający.
+      email_settings_hint_html: E-mail potwierdzający został wysłany na %{email}. Jeżeli adres e-mail nie jest prawidłowy, możesz zmienić go w ustawieniach konta.
+      title: Konfiguracja
+    status:
+      account_status: Stan konta
+      confirming: Oczekiwanie na potwierdzenie adresu e-mail.
+      functional: Twoje konto całkowicie funkcjonuje.
+      pending: Twoje zgłoszenie czeka na zatwierdzenie przez nas. Może to trochę potrwać. Jeżeli zgłoszenie zostanie przyjęte, otrzymasz wiadomość e-mail.
+      redirecting_to: Twoje konto jest nieaktywne, ponieważ obecnie przekierowuje je na %{acct}.
     trouble_logging_in: Masz problem z zalogowaniem się?
   authorize_follow:
     already_following: Już śledzisz to konto
+    already_requested: Już wysłałeś(-aś) prośbę o możliwość śledzenia tego konta
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
     follow: Śledź
     follow_request: 'Wysłano prośbę o pozwolenie na śledzenie:'
@@ -612,6 +733,12 @@ pl:
     title: Śledź %{acct}
   challenge:
     confirm: Kontynuuj
+    hint_html: "<strong>Informacja:</strong> Nie będziemy prosić Cię o ponowne podanie hasła przez następną godzinę."
+    invalid_password: Nieprawidłowe hasło
+    prompt: Potwierdź hasło, aby kontynuować
+  date:
+    formats:
+      default: "%d. %b %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}g"
@@ -627,18 +754,33 @@ pl:
       x_months: "%{count} miesięcy"
       x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: Wprowadzone informacje za nieprawidłowe
     confirm_password: Wprowadź aktualne hasło, aby potwierdzić tożsamość
+    confirm_username: Wprowadź swoją nazwę użytkownika aby potwierdzić procedurę
     proceed: Usuń konto
     success_msg: Twoje konto zostało pomyślnie usunięte
+    warning:
+      before: 'Zanim kontynuujesz, przeczytać uważnie te uwagi:'
+      caches: Zawartość obecna w pamięci podręcznej innych serwerów może tam pozostać
+      data_removal: Twoje wpisy i inne dane zostaną bezpowrotnie usunięte
+      email_change_html: Możesz <a href="%{path}">zmienić swój adres e-mail</a> bez usunięcia konta
+      email_contact_html: Jeżeli wciąż nie dotarł, możesz wysłać wiadomość e-mail na <a href="mailto:%{email}">%{email}</a> aby uzyskać pomoc
+      email_reconfirmation_html: Jeżeli nie otrzymujesz potwierdzającego e-maila, możesz <a href="%{path}">poprosić o kolejny</a>
+      irreversible: Nie będziesz móc przywrócić lub reaktywować swojego konta
+      more_details_html: Aby uzyskać więcej szczegółów, przeczytaj naszą <a href="%{terms_path}">politykę prywatności</a>.
+      username_available: Twoja nazwa użytkownika będzie z powrotem dostępna
+      username_unavailable: Twoja nazwa użytkownika pozostanie niedostępna
   directories:
     directory: Katalog profilów
     explanation: Poznaj profile na podstawie zainteresowań
     explore_mastodon: Odkrywaj %{title}
+  domain_validator:
+    invalid_domain: nie jest prawidłową nazwą domeny
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Wysłane zgłoszenie jest nieprawidłowe lub uszkodzone.
     '403': Nie masz uprawnień, aby wyświetlić tę stronę.
     '404': Strona, którą próbujesz odwiedzić, nie istnieje.
-    '406': This page is not available in the requested format.
+    '406': Ta strona nie jest dostępna w zażądanym formacie.
     '410': Strona, którą próbujesz odwiedzić, przestała istnieć.
     '422':
       content: Sprawdzanie bezpieczeństwa nie powiodło się. Czy blokujesz pliki cookie?
@@ -647,7 +789,7 @@ pl:
     '500':
       content: Przepraszamy, coś poszło nie tak, po naszej stronie.
       title: Ta strona jest nieprawidłowa
-    '503': The page could not be served due to a temporary server failure.
+    '503': Strona nie może zostać wyświetlona z powodu tymczasowego niepowodzenia serwera.
     noscript_html: Aby korzystać z aplikacji Mastodon, włącz JavaScript. Możesz też skorzystać z jednej z <a href="%{apps_path}">natywnych aplikacji</a> obsługującej Twoje urządzenie.
   existing_username_validator:
     not_found: nie znaleziono lokalnego użytkownika o tej nazwie
@@ -670,8 +812,10 @@ pl:
     add_new: Dodaj nowy
     errors:
       limit: Już przekroczyłeś(-aś) maksymalną liczbę wyróżnionych hashtagów
+    hint_html: "<strong>Czym są wyróżnione hashtagi?</strong> Są one na stałe wyświetlane na Twoim profilu i pozwalają innym na przeglądanie Twoich wpisów używających tych hashtagów. Są doskonałym narzędziem do śledzenia kreatywnej twórczości czy długoterminowych projektów."
   filters:
     contexts:
+      account: Profile
       home: Strona główna
       notifications: Powiadomienia
       public: Publiczne osie czasu
@@ -683,6 +827,7 @@ pl:
       invalid_irreversible: Nieodwracalne filtrowanie działa tylko na stronie głównej i w powiadomieniach
     index:
       delete: Usuń
+      empty: Nie masz żadnych filtrów.
       title: Filtry
     new:
       title: Dodaj nowy filtr
@@ -690,10 +835,13 @@ pl:
     developers: Dla programistów
     more: Więcej…
     resources: Zasoby
+    trending_now: Obecnie na czasie
   generic:
     all: Wszystkie
     changes_saved_msg: Ustawienia zapisane!
     copy: Kopiuj
+    delete: Usuń
+    no_batch_actions_available: Brak akcji wsadowych dostępnych na tej stronie
     order_by: Uporządkuj według
     save_changes: Zapisz zmiany
     validation_errors:
@@ -766,9 +914,38 @@ pl:
   media_attachments:
     validations:
       images_and_video: Nie możesz załączyć pliku wideo do wpisu, który zawiera już zdjęcia
+      not_ready: Nie można załączyć plików których przetwarzanie nie zostało ukończone. Spróbuj ponownie za chwilę!
       too_many: Nie możesz załączyć więcej niż 4 plików
   migrations:
     acct: nazwa@domena nowego konta
+    cancel: Anuluj przekierowanie
+    cancel_explanation: Anulowanie przekierowania aktywuje Twoje obecne konto ponownie, ale nie przeniesie z powrotem śledzących, których przeniesiono na tamto konto.
+    cancelled_msg: Pomyślnie anulowano przekierowanie.
+    errors:
+      already_moved: jest tym samym kontem, na które już się przeniosłeś(-aś)
+      missing_also_known_as: nie odwołuje się do tego konta
+      move_to_self: nie może być bieżącym kontem
+      not_found: nie mogło zostać odnalezione
+      on_cooldown: Nie możesz teraz przenieść konta
+    followers_count: Śledzący w chwili przenoszenia
+    incoming_migrations: Przenoszenie z innego konta
+    incoming_migrations_html: Aby przenieść się z innego konta na to, musisz najpierw <a href="%{path}">utworzyć alias konta</a>.
+    moved_msg: Twoje konto przekierowuje teraz na %{acct}, a śledzący są przenoszeni.
+    not_redirecting: Twoje konto nie przekierowuje obecnie na żadne inne konto.
+    on_cooldown: Ostatnio przeniosłeś(-aś) swoje konto. Ta funkcja będzie dostępna ponownie za %{count} dni.
+    past_migrations: Poprzednie migracje
+    proceed_with_move: Przenieś obserwujących
+    redirecting_to: Twoje konto przekierowuje na %{acct}.
+    set_redirect: Ustaw przekierowanie
+    warning:
+      backreference_required: Nowe konto musi wcześniej zostać skonfigurowane tak, aby odwoływało się do tego
+      before: 'Zanim kontynuujesz, przeczytaj uważnie te uwagi:'
+      cooldown: Po przeniesieniu się, istnieje okres przez który nie możesz ponownie się przenieść
+      disabled_account: Twoje obecne konto nie będzie później całkowicie użyteczne. Możesz jednak uzyskać dostęp do eksportu danych i ponownie aktywować je.
+      followers: To działanie przeniesie wszystkich Twoich śledzących z obecnego konta na nowe
+      only_redirect_html: Możesz też <a href="%{path}">po prostu skonfigurować przekierowanie na swój profil</a>.
+      other_data: Żadne inne dane nie zostaną automatycznie przeniesione
+      redirect: Twoje obecne konto zostanie uaktualnione o informację o przeniesieniu i wyłączone z wyszukiwania
   moderation:
     title: Moderacja
   notification_mailer:
@@ -809,6 +986,10 @@ pl:
       body: 'Twój wpis został podbity przez %{name}:'
       subject: Twój wpis został podbity przez %{name}
       title: Nowe podbicie
+  notifications:
+    email_events: 'Powiadamiaj e-mailem o:'
+    email_events_hint: 'Wybierz wydarzenia, o których chcesz otrzymywać powiadomienia:'
+    other_settings: Inne ustawienia powiadomień
   number:
     human:
       decimal_units:
@@ -832,6 +1013,7 @@ pl:
       duration_too_long: jest zbyt odległa
       duration_too_short: jest zbyt bliska
       expired: To głosowanie już zakończyło się
+      invalid_choice: Wybrana opcja głosowania nie istnieje
       over_character_limit: nie może zawierać więcej niż %{max} znaków
       too_few_options: musi zawierać przynajmniej dwie opcje
       too_many_options: nie może zawierać więcej niż %{max} opcji
@@ -839,9 +1021,16 @@ pl:
     other: Pozostałe
     posting_defaults: Domyślne ustawienia wpisów
     public_timelines: Publiczne osie czasu
+  reactions:
+    errors:
+      limit_reached: Przekroczono limit różnych reakcji
+      unrecognized_emoji: nie jest znanym emoji
   relationships:
     activity: Aktywność konta
     dormant: Uśpione
+    followers: Śledzący
+    following: Śledzeni
+    invited: Zaproszeni
     last_active: Ostatnia aktywność
     most_recent: Ostatnie
     moved: Przeniesione
@@ -917,6 +1106,7 @@ pl:
   settings:
     account: Konto
     account_settings: Ustawienia konta
+    aliases: Aliasy konta
     appearance: Wygląd
     authorized_apps: Uwierzytelnione aplikacje
     back: Powrót do Mastodona
@@ -934,6 +1124,8 @@ pl:
     profile: Profil
     relationships: Śledzeni i śledzący
     two_factor_authentication: Uwierzytelnianie dwuetapowe
+  spam_check:
+    spam_detected: To zgłoszenie jest automatyczne. Został wykryty spam.
   statuses:
     attached:
       description: 'Załączono: %{attached}'
@@ -954,6 +1146,8 @@ pl:
       many: 'zawiera niedozwolone hashtagi: %{tags}'
       one: 'zawiera niedozwolony hashtag: %{tags}'
       other: 'zawiera niedozwolone hashtagi: %{tags}'
+    errors:
+      in_reply_not_found: Post, na który próbujesz odpowiedzieć, nie istnieje.
     language_detection: Automatycznie wykrywaj język
     open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
@@ -963,6 +1157,11 @@ pl:
       private: Nie możesz przypiąć niepublicznego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
     poll:
+      total_people:
+        few: "%{count} osoby"
+        many: "%{count} osób"
+        one: "%{count} osoba"
+        other: "%{count} osoby"
       total_votes:
         few: "%{count} głosy"
         many: "%{count} głosy"
@@ -970,6 +1169,7 @@ pl:
         other: "%{count} głosy"
       vote: Głosuj
     show_more: Pokaż więcej
+    show_thread: Pokaż wątek
     sign_in_to_participate: Zaloguj się, aby udzielić się w tej konwersacji
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -983,6 +1183,8 @@ pl:
     pinned: Przypięty wpis
     reblogged: podbił
     sensitive_content: Wrażliwa zawartość
+  tags:
+    does_not_match_previous_name: nie pasuje do poprzedniej nazwy
   terms:
     body_html: |
       <h2>Polityka prywatności</h2>
@@ -1100,7 +1302,9 @@ pl:
         disable: Kiedy Twoje konto jest wyłączone, Twoje dane pozostają na serwerze, ale nie możesz wykonywać żadnych działań, zanim zostanie odblokowane.
         silence: Kiedy Twoje konto jest ograniczone, tylko osoby które je śledzą będą widzieć Twoje wpisy. Może ono też przestać być widoczne na publicznych listach. Inni wciąż mogą zacząć Cię śledzić.
         suspend: Twoje konto zostało zawieszone i wszystkie Twoje wpisy wraz z zawartością multimedialną zostały nieodwracalnie usunięte z tego serwera i serwerów, których użytkownicy śledzili Cię.
+      get_in_touch: Możesz odpowiedzieć na ten e-mail aby pozostać w kontakcie z prowadzącymi %{instance}.
       review_server_policies: Przejrzyj zasady serwera
+      statuses: 'Szczególnie dla:'
       subject:
         disable: Twoje konto %{acct} zostało wyłączone
         none: Ostrzeżenie dla %{acct}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index abea40130..45f2b22d1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -92,6 +92,7 @@ pt-BR:
       delete: Excluir
       destroyed_msg: Nota de moderação excluída com sucesso!
     accounts:
+      add_email_domain_block: Adicionar o domínio de email à lista negra
       approve: Aprovar
       approve_all: Aprovar tudo
       are_you_sure: Você tem certeza?
@@ -172,6 +173,7 @@ pt-BR:
         staff: Equipe
         user: Usuário
       search: Pesquisar
+      search_same_email_domain: Outros usuários com o mesmo domínio de e-mail
       search_same_ip: Outros usuários com o mesmo IP
       shared_inbox_url: Link da caixa de entrada compartilhada
       show:
@@ -193,21 +195,57 @@ pt-BR:
       web: Web
       whitelisted: Permitido
     action_logs:
+      action_types:
+        assigned_to_self_report: Adicionar relatório
+        change_email_user: Editar e-mail do usuário
+        confirm_user: Confirmar Usuário
+        create_account_warning: Criar Aviso
+        create_announcement: Criar Anúncio
+        create_custom_emoji: Criar Emoji Personalizado
+        create_domain_allow: Adicionar domínio permitido
+        create_domain_block: Adicionar domínio bloqueado
+        create_email_domain_block: Adicionar domínio de e-mail bloqueado
+        demote_user: Despromover Utilizador
+        destroy_announcement: Excluir anúncio
+        destroy_custom_emoji: Excluir emoji personalizado
+        destroy_domain_allow: Excluir domínio permitido
+        destroy_domain_block: Excluir domínio bloqueado
+        destroy_email_domain_block: Excluir domínio de e-mail bloqueado
+        destroy_status: Excluir Status
+        disable_2fa_user: Desativar autenticação de dois fatores
+        disable_custom_emoji: Desativar Emoji Personalizado
+        disable_user: Desativar usuário
+        enable_custom_emoji: Ativar Emoji Personalizado
+        enable_user: Ativar usuário
+        memorialize_account: Memorizar Conta
+        promote_user: Promover usuário
+        remove_avatar_user: Remover Avatar
+        reopen_report: Reabrir Relatório
+        reset_password_user: Redefinir a senha
+        resolve_report: Resolver Relatório
+        silence_account: Silenciar conta
+        suspend_account: Suspender Conta
+        unassigned_report: Remover relatório
+        unsilence_account: Deixar de Silenciar Conta
+        unsuspend_account: Retirar Suspensão à Conta
+        update_announcement: Editar anúncio
+        update_custom_emoji: Editar Emoji Personalizado
+        update_status: Editar Status
       actions:
         assigned_to_self_report: "%{name} pegou a denúncia %{target}"
         change_email_user: "%{name} alterou o endereço de e-mail do usuário %{target}"
         confirm_user: "%{name} confirmou o endereço de e-mail do usuário %{target}"
         create_account_warning: "%{name} enviou um aviso para %{target}"
-        create_announcement: "%{name} criou um novo anúncio %{target}"
+        create_announcement: "%{name} criou o novo anúncio %{target}"
         create_custom_emoji: "%{name} enviou o novo emoji %{target}"
         create_domain_allow: "%{name} permitiu %{target}"
-        create_domain_block: "%{name} bloqueou o domínio %{target}"
+        create_domain_block: "%{name} bloqueou %{target}"
         create_email_domain_block: "%{name} bloqueou o domínio de e-mail %{target}"
         demote_user: "%{name} rebaixou o usuário %{target}"
         destroy_announcement: "%{name} excluiu o anúncio %{target}"
         destroy_custom_emoji: "%{name} excluiu emoji %{target}"
         destroy_domain_allow: "%{name} bloqueou %{target}"
-        destroy_domain_block: "%{name} desbloqueou o domínio %{target}"
+        destroy_domain_block: "%{name} desbloqueou %{target}"
         destroy_email_domain_block: "%{name} permitiu domínio de e-mail %{target}"
         destroy_status: "%{name} excluiu toot de %{target}"
         disable_2fa_user: "%{name} desativou a exigência de autenticação de dois fatores para o usuário %{target}"
@@ -230,13 +268,16 @@ pt-BR:
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
         update_status: "%{name} atualizou o status de %{target}"
       deleted_status: "(status excluído)"
+      empty: Nenhum registro encontrado.
+      filter_by_action: Filtrar por ação
+      filter_by_user: Filtrar por usuário
       title: Auditar histórico
     announcements:
       destroyed_msg: Anúncio excluído com sucesso!
       edit:
         title: Editar anúncio
-      empty: Nenhum anúncio encontrado.
-      live: Em exibição
+      empty: Sem anúncios.
+      live: Ao vivo
       new:
         create: Criar anúncio
         title: Novo anúncio
@@ -244,7 +285,7 @@ pt-BR:
       scheduled_for: Agendado para %{time}
       scheduled_msg: Anúncio agendado para publicação!
       title: Anúncios
-      unpublished_msg: Anúncio retirado de exibição com sucesso!
+      unpublished_msg: Anúncio despublicado com sucesso!
       updated_msg: Anúncio atualizado com sucesso!
     custom_emojis:
       assign_category: Atribuir categoria
@@ -307,12 +348,12 @@ pt-BR:
       week_users_new: usuários essa semana
       whitelist_mode: Modo lista de permitidos
     domain_allows:
-      add_new: Permitir
+      add_new: Permitir domínio
       created_msg: Domínio foi permitido
       destroyed_msg: Domínio foi bloqueado
       undo: Bloquear
     domain_blocks:
-      add_new: Bloquear outro domínio
+      add_new: Novo bloqueio de domínio
       created_msg: Domínio está sendo bloqueado
       destroyed_msg: Domínio desbloqueado
       domain: Domínio
@@ -358,6 +399,7 @@ pt-BR:
       destroyed_msg: Domínio de e-mail desbloqueado
       domain: Domínio
       empty: Sem domínios de e-mail bloqueados.
+      from_html: de %{domain}
       new:
         create: Adicionar domínio
         title: Novo domínio de e-mail bloqueado
@@ -421,7 +463,7 @@ pt-BR:
           other: "%{count} denúncias"
       action_taken_by: Atitude tomada por
       are_you_sure: Você tem certeza?
-      assign_to_self: Acatado por mim
+      assign_to_self: Pegar
       assigned: Moderador responsável
       by_target_domain: Domínio da conta denunciada
       comment:
@@ -537,6 +579,9 @@ pt-BR:
       trends:
         desc_html: Mostrar publicamente hashtags previamente revisadas que estão em alta
         title: Hashtags em alta
+    site_uploads:
+      delete: Excluir arquivo enviado
+      destroyed_msg: Upload do site excluído com sucesso!
     statuses:
       back_to_account: Voltar para página da conta
       batch:
@@ -573,7 +618,6 @@ pt-BR:
     warning_presets:
       add_new: Adicionar novo
       delete: Excluir
-      edit: Editar
       edit_preset: Editar o aviso pré-definido
       title: Gerenciar os avisos pré-definidos
   admin_mailer:
@@ -585,7 +629,7 @@ pt-BR:
       body_remote: Alguém da instância %{domain} reportou %{target}
       subject: Nova denúncia sobre %{instance} (#%{id})
     new_trending_tag:
-      body: 'A hashtag #%{name} está em alta hoje, mas não foi previamente revisada. Ela não estará visível publicamente a menos que você aprove, ou apenas salve o formulário do jeito que está para nunca mais ouvir falar dela.'
+      body: 'A hashtag #%{name} está em alta hoje, mas não foi previamente revisada. Ela não estará visível publicamente a menos que você aprove, ou salve o formulário do jeito que está para nunca mais ouvir falar dela.'
       subject: Nova hashtag disponível para revisão em %{instance} (#%{name})
   aliases:
     add_new: Criar alias
@@ -661,6 +705,7 @@ pt-BR:
     trouble_logging_in: Problemas para entrar?
   authorize_follow:
     already_following: Você já segue
+    already_requested: Você já enviou uma solicitação para seguir esta conta
     error: Infelizmente, ocorreu um erro ao buscar a conta remota
     follow: Seguir
     follow_request: 'Você mandou uma solicitação para seguir para:'
@@ -677,7 +722,7 @@ pt-BR:
     prompt: Confirme sua senha para continuar
   date:
     formats:
-      default: "%d %b %Y"
+      default: "%d %b, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -774,12 +819,12 @@ pt-BR:
     developers: Desenvolvedores
     more: Mais…
     resources: Recursos
-    trending_now: Em alta agora
+    trending_now: Em alta no momento
   generic:
     all: Tudo
     changes_saved_msg: Alterações foram salvas com sucesso!
     copy: Copiar
-    delete: Eliminar
+    delete: Excluir
     no_batch_actions_available: Nenhuma ação em lote disponível nesta página
     order_by: Ordenar por
     save_changes: Salvar alterações
@@ -849,6 +894,7 @@ pt-BR:
   media_attachments:
     validations:
       images_and_video: Não foi possível anexar um vídeo a um toot que já contém imagens
+      not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não foi possível anexar mais de 4 imagens
   migrations:
     acct: Mudou-se para
@@ -1070,6 +1116,8 @@ pt-BR:
     disallowed_hashtags:
       one: 'continha hashtag não permitida: %{tags}'
       other: 'continha hashtags não permitidas: %{tags}'
+    errors:
+      in_reply_not_found: O toot que você quer responder parece não existir.
     language_detection: Detectar idioma automaticamente
     open_in_web: Abrir no navegador
     over_character_limit: limite de caracteres de %{max} excedido
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 477c9d3a3..7bff3bf5c 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -92,6 +92,7 @@ pt-PT:
       delete: Eliminar
       destroyed_msg: Nota de moderação excluída com sucesso!
     accounts:
+      add_email_domain_block: Adicione o domínio de email à lista negra
       approve: Aprovar
       approve_all: Aprovar todos
       are_you_sure: Tens a certeza?
@@ -132,7 +133,7 @@ pt-PT:
         remote: Remoto
         title: Local
       login_status: Estado de início de sessão
-      media_attachments: Media anexa
+      media_attachments: Anexos de média
       memorialize: Converter em memorial
       moderation:
         active: Activo
@@ -172,6 +173,7 @@ pt-PT:
         staff: Equipa
         user: Utilizador
       search: Pesquisar
+      search_same_email_domain: Outros utilizadores com o mesmo domínio de email
       search_same_ip: Outros utilizadores com o mesmo IP
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
@@ -193,6 +195,42 @@ pt-PT:
       web: Web
       whitelisted: Está na lista branca
     action_logs:
+      action_types:
+        assigned_to_self_report: Atribuir Relatório
+        change_email_user: Alterar E-mail do Utilizador
+        confirm_user: Confirmar Utilizador
+        create_account_warning: Criar Aviso
+        create_announcement: Criar Anúncio
+        create_custom_emoji: Criar Emoji Personalizado
+        create_domain_allow: Criar Permissão de Domínio
+        create_domain_block: Criar Bloqueio de Domínio
+        create_email_domain_block: Criar Bloqueio de Domínio de E-mail
+        demote_user: Despromover Utilizador
+        destroy_announcement: Remover Anúncio
+        destroy_custom_emoji: Remover Emoji Personalizado
+        destroy_domain_allow: Remover Permissão de Domínio
+        destroy_domain_block: Remover Bloqueio de Domínio
+        destroy_email_domain_block: Remover Bloqueio de Domínio de E-mail
+        destroy_status: Remover Estado
+        disable_2fa_user: Desativar 2FA
+        disable_custom_emoji: Desativar Emoji Personalizado
+        disable_user: Desativar Utilizador
+        enable_custom_emoji: Ativar Emoji Personalizado
+        enable_user: Ativar Utilizador
+        memorialize_account: Memorizar Conta
+        promote_user: Promover Utilizador
+        remove_avatar_user: Remover Imagem de Perfil
+        reopen_report: Reabrir Relatório
+        reset_password_user: Repor Password
+        resolve_report: Resolver Relatório
+        silence_account: Silenciar Conta
+        suspend_account: Suspender Conta
+        unassigned_report: Desatribuir Relatório
+        unsilence_account: Deixar de Silenciar Conta
+        unsuspend_account: Retirar Suspensão à Conta
+        update_announcement: Atualizar Anúncio
+        update_custom_emoji: Atualizar Emoji Personalizado
+        update_status: Atualizar Estado
       actions:
         assigned_to_self_report: "%{name} atribuiu o relatório %{target} a si próprios"
         change_email_user: "%{name} alterou o endereço de e-mail do utilizador %{target}"
@@ -230,6 +268,9 @@ pt-PT:
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
         update_status: "%{name} atualizou o estado de %{target}"
       deleted_status: "(apagou a publicação)"
+      empty: Não foram encontrados registos.
+      filter_by_action: Filtrar por ação
+      filter_by_user: Filtrar por utilizador
       title: Registo de auditoria
     announcements:
       destroyed_msg: Anúncio excluído com sucesso!
@@ -322,7 +363,7 @@ pt-PT:
         create: Criar bloqueio
         hint: O bloqueio de dominio não vai previnir a criação de entradas na base de dados, mas irá retroativamente e automaticamente aplicar métodos de moderação específica nessas contas.
         severity:
-          desc_html: "<strong>Silenciar</strong> irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. <strong>Supender</strong> irá eliminar todo o conteúdo guardado dessa conta, media e informação de perfil.Usa <strong>Nenhum</strong> se  apenas desejas rejeitar arquivos de media."
+          desc_html: "<strong>Silenciar</strong> irá fazer com que as publicações dessa conta sejam invisíveis para quem não a segue. <strong>Supender</strong> irá eliminar todo o conteúdo guardado dessa conta, média e informação de perfil. Use <strong>Nenhum</strong> se apenas deseja rejeitar arquivos de média."
           noop: Nenhum
           silence: Silenciar
           suspend: Suspender
@@ -331,11 +372,11 @@ pt-PT:
       private_comment_hint: Comentário sobre essa limitação de domínio para uso interno pelos moderadores.
       public_comment: Comentário público
       public_comment_hint: Comentário sobre essa limitação de domínio para o público geral, se ativada a divulgação da lista de limitações de domínio.
-      reject_media: Rejeitar ficheiros de media
-      reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão
+      reject_media: Rejeitar ficheiros de média
+      reject_media_hint: Remove arquivos de média armazenados localmente e rejeita descarregar novos arquivos no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar relatórios
       reject_reports_hint: Ignorar todos os relatórios vindos deste domínio. Irrelevantes para efectuar suspensões
-      rejecting_media: a rejeitar ficheiros de media
+      rejecting_media: a rejeitar ficheiros de média
       rejecting_reports: a rejeitar relatórios
       severity:
         silence: silenciado
@@ -345,7 +386,7 @@ pt-PT:
           one: Uma conta na base de dados afectada
           other: "%{count} contas na base de dados afectadas"
         retroactive:
-          silence: Não silenciar todas as contas existentes nesse domínio
+          silence: Não silenciar contas afetadas existentes deste domínio
           suspend: Não suspender todas as contas existentes nesse domínio
         title: Remover o bloqueio de domínio de %{domain}
         undo: Anular
@@ -358,6 +399,7 @@ pt-PT:
       destroyed_msg: Bloqueio de domínio de email excluído com sucesso
       domain: Domínio
       empty: Nenhum domínio de e-mail atualmente na lista negra.
+      from_html: de %{domain}
       new:
         create: Adicionar domínio
         title: Novo bloqueio de domínio de email
@@ -379,7 +421,7 @@ pt-PT:
       total_followed_by_them: Seguidas por eles
       total_followed_by_us: Seguidas por nós
       total_reported: Relatórios sobre eles
-      total_storage: Anexos de media
+      total_storage: Anexos de média
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -395,7 +437,7 @@ pt-PT:
     relays:
       add_new: Adicionar novo repetidor
       delete: Apagar
-      description_html: Um <strong>repetidor da federação</strong> é um servidor intermediário que troca grandes volumes de publicações públicas entre servidores que o subscrevem e publicam. <strong>Ele pode ajudar pequenos e médios servidores a descobrir conteúdo do "fediverse"</strong>que, de outro modo, exigiria que os utilizadores locais seguissem manualmente outras pessoas em servidores remotos.
+      description_html: Um <strong>repetidor da federação</strong> é um servidor intermediário que troca grandes volumes de publicações públicas entre servidores que o subscrevem e publicam. <strong>Ele pode ajudar pequenos e médios servidores a descobrir conteúdo do "fediverse"</strong> que, de outro modo, exigiria que os utilizadores locais seguissem manualmente outras pessoas em servidores remotos.
       disable: Desactivar
       disabled: Desactivado
       enable: Activar
@@ -481,8 +523,8 @@ pt-PT:
         desc_html: Nomes de domínio que esta instância encontrou no fediverso
         title: Publicar lista de instâncias descobertas
       preview_sensitive_media:
-        desc_html: Previsualização de links noutros websites irá apresentar uma miniatura, mesmo que a media seja marcada como sensível
-        title: Mostrar media sensível em previsualizações OpenGraph
+        desc_html: A pre-visualização de links noutros sites irá apresentar uma miniatura, mesmo que a média seja marcada como sensível
+        title: Mostrar média sensível em pre-visualizações OpenGraph
       profile_directory:
         desc_html: Permite aos utilizadores serem descobertos
         title: Ativar directório do perfil
@@ -537,6 +579,9 @@ pt-PT:
       trends:
         desc_html: Exibir publicamente hashtags atualmente em destaque que já tenham sido revistas anteriormente
         title: Hashtags em destaque
+    site_uploads:
+      delete: Excluir arquivo carregado
+      destroyed_msg: Upload do site excluído com sucesso!
     statuses:
       back_to_account: Voltar para página da conta
       batch:
@@ -550,7 +595,7 @@ pt-PT:
       no_media: Não há média
       no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado
       title: Estado das contas
-      with_media: Com media
+      with_media: Com média
     tags:
       accounts_today: Usos únicos hoje
       accounts_week: Usos únicos desta semana
@@ -573,7 +618,6 @@ pt-PT:
     warning_presets:
       add_new: Adicionar novo
       delete: Apagar
-      edit: Editar
       edit_preset: Editar o aviso predefinido
       title: Gerir os avisos predefinidos
   admin_mailer:
@@ -661,6 +705,7 @@ pt-PT:
     trouble_logging_in: Problemas em iniciar sessão?
   authorize_follow:
     already_following: Tu já estás a seguir esta conta
+    already_requested: Já enviou anteriormente um pedido para seguir esta conta
     error: Infelizmente, ocorreu um erro ao buscar a conta remota
     follow: Seguir
     follow_request: 'Enviaste uma solicitação de seguidor para:'
@@ -737,7 +782,7 @@ pt-PT:
     archive_takeout:
       date: Data
       download: Descarregar o teu arquivo
-      hint_html: Podes pedir um arquivo das tuas <strong> publicações e ficheiros de media carregados</strong>. Os dados do ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer software compatível. Tu podes pedir um arquivo destes a cada 7 dias.
+      hint_html: Pode pedir um arquivo das suas <strong>publicações e ficheiros de média carregados</strong>. Os dados no ficheiro exportado estarão no formato ActivityPub, que pode ser lido com qualquer software compatível. Pode solicitar um arquivo a cada 7 dias.
       in_progress: A compilar o seu arquivo...
       request: Pede o teu arquivo
       size: Tamanho
@@ -849,6 +894,7 @@ pt-PT:
   media_attachments:
     validations:
       images_and_video: Não é possível anexar um vídeo a uma publicação que já contém imagens
+      not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não é possível anexar mais de 4 arquivos
   migrations:
     acct: username@domain da nova conta
@@ -1070,6 +1116,8 @@ pt-PT:
     disallowed_hashtags:
       one: 'continha uma hashtag proibida: %{tags}'
       other: 'continha as hashtags proibidas: %{tags}'
+    errors:
+      in_reply_not_found: A publicação a que está a tentar responder parece não existir.
     language_detection: Detectar automaticamente a língua
     open_in_web: Abrir no browser
     over_character_limit: limite de caracter excedeu %{max}
@@ -1109,9 +1157,9 @@ pt-PT:
       <h3 id="collect">Que informação nós recolhemos?</h3>
 
       <ul>
-      <li><em>Informação básica da conta</em>: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de e-mail e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.</li>
-      <li><em>Publicações, seguimento e outra informação pública</em>: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos multimédia, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A acção de republicar ou favoritar outra publicação é sempre pública.</li>
-      <li><em>Publicações directas e exclusivas para seguidores</em>: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações directas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objectivo.  Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes activar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. <em>Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-la</em>e que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. <em>Não partilhes qualquer informação perigosa no Mastodon.</em></li>
+      <li><em>Informação básica da conta</em>: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de email e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.</li>
+      <li><em>Publicações, seguimento e outra informação pública</em>: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos média, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A ação de republicar ou favoritar outra publicação é sempre pública.</li>
+      <li><em>Publicações diretas e exclusivas para seguidores</em>: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações diretas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objetivo. Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes ativar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. <em>Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-la</em> e que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. <em>Não partilhes qualquer informação perigosa no Mastodon.</em></li>
       <li><em>IPs e outros metadados</em>: Quando inicias sessão, nós guardamos o endereço de IP a partir do qual iniciaste a sessão, tal como o nome do teu navegador. Todas as sessões estão disponíveis para verificação e revogação nas configurações. O último endereço de IP usado é guardado até 12 meses. Nós também podemos guardar registos de servidor, os quais incluem o endereço de IP de cada pedido dirigido ao nosso servidor.</li>
       </ul>
 
@@ -1140,7 +1188,7 @@ pt-PT:
       <p>Nós envidaremos todos os esforços no sentido de:</p>
 
       <ul>
-      <li>Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este  servidor, considerando que estes registos não serão guardados por mais de 90 dias.</li>
+      <li>Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este servidor, considerando que estes registos não serão guardados por mais de 90 dias.</li>
       <li>Guardar os endereços de IP associados aos utilizadores registados durante um período que não ultrapassará os 12 meses.</li>
       </ul>
 
@@ -1246,7 +1294,7 @@ pt-PT:
       subject: Bem-vindo ao Mastodon
       tip_federated_timeline: A cronologia federativa é uma visão global da rede Mastodon. Mas só inclui pessoas que os teus vizinhos subscrevem, por isso não é uma visão completa.
       tip_following: Tu segues o(s) administrador(es) do teu servidor por defeito. Para encontrares mais pessoas interessantes, procura nas cronologias local e federativa.
-      tip_local_timeline: A cronologia local é uma visão global das pessoas em %{instance}. Estes são os teus vizinhos próximos!
+      tip_local_timeline: A cronologia local é uma visão global das pessoas em %{instance}. Estes são os teus vizinhos mais próximos!
       tip_mobile_webapp: Se o teu navegador móvel te oferecer a possibilidade de adicionar o Mastodon ao teu homescreen, tu podes receber notificações push. Ele age como uma aplicação nativa de vários modos!
       tips: Dicas
       title: Bem-vindo a bordo, %{name}!
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6196ac3eb..30f237780 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -100,6 +100,7 @@ ru:
       delete: Удалить
       destroyed_msg: Заметка модератора успешно удалена!
     accounts:
+      add_email_domain_block: Добавить домен электронной почты в чёрный список
       approve: Подтвердить
       approve_all: Подтвердить все
       are_you_sure: Вы уверены?
@@ -180,6 +181,7 @@ ru:
         staff: Персонал
         user: Пользователь
       search: Поиск
+      search_same_email_domain: Другие пользователи с тем же доменом электронной почты
       search_same_ip: Другие пользователи с таким же IP
       shared_inbox_url: URL общих входящих
       show:
@@ -201,6 +203,39 @@ ru:
       web: Веб
       whitelisted: В белом списке
     action_logs:
+      action_types:
+        assigned_to_self_report: Присвоение жалоб
+        change_email_user: Изменение e-mail пользователей
+        confirm_user: Подтверждение пользователей
+        create_account_warning: Выдача предупреждения
+        create_announcement: Создание объявлений
+        create_custom_emoji: Добавление эмодзи
+        create_domain_block: Блокировка доменов
+        create_email_domain_block: Блокировка e-mail доменов
+        demote_user: Разжалование пользователей
+        destroy_announcement: Удаление объявлений
+        destroy_custom_emoji: Удаление эмодзи
+        destroy_domain_block: Разблокировка доменов
+        destroy_email_domain_block: Разблокировка e-mail доменов
+        destroy_status: Удаление постов
+        disable_2fa_user: Отключение 2FA
+        disable_custom_emoji: Отключение эмодзи
+        disable_user: Заморозка пользователей
+        enable_custom_emoji: Включение эмодзи
+        enable_user: Разморозка пользователей
+        promote_user: Повышение пользователей
+        remove_avatar_user: Удаление аватаров
+        reopen_report: Возобновление жалоб
+        reset_password_user: Сброс пароля пользователей
+        resolve_report: Отметка жалоб «решёнными»
+        silence_account: Скрытие пользователей
+        suspend_account: Блокировка пользователей
+        unassigned_report: Снятие жалоб
+        unsilence_account: Отмена скрытия пользователей
+        unsuspend_account: Разблокировка пользователей
+        update_announcement: Обновление объявлений
+        update_custom_emoji: Обновление эмодзи
+        update_status: Изменение постов
       actions:
         assigned_to_self_report: "%{name} назначил(а) себя для решения жалобы %{target}"
         change_email_user: "%{name} сменил(а) e-mail пользователя %{target}"
@@ -218,7 +253,7 @@ ru:
         destroy_domain_block: "%{name} разблокировал(а) домен %{target}"
         destroy_email_domain_block: "%{name} добавил(а) e-mail домен %{target} в белый список"
         destroy_status: "%{name} удалил(а) пост пользователя %{target}"
-        disable_2fa_user: "%{name} отключил(а) двухэтапную авторизацию у пользователя %{target}"
+        disable_2fa_user: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
         disable_custom_emoji: "%{name} отключил(а) эмодзи %{target}"
         disable_user: "%{name} заморозил(а) пользователя %{target}"
         enable_custom_emoji: "%{name} включил(а) эмодзи %{target}"
@@ -238,6 +273,9 @@ ru:
         update_custom_emoji: "%{name} обновил(а) эмодзи %{target}"
         update_status: "%{name} изменил(а) пост пользователя %{target}"
       deleted_status: "(удалённый пост)"
+      empty: Журнал пуст.
+      filter_by_action: Фильтр по действию
+      filter_by_user: Фильтр по пользователю
       title: Журнал событий
     announcements:
       destroyed_msg: Объявление удалено.
@@ -373,6 +411,7 @@ ru:
       destroyed_msg: Домен убран из списка e-mail блокировки
       domain: Домен
       empty: Никакие e-mail домены не блокируются.
+      from_html: с %{domain}
       new:
         create: Создать блокировку
         title: Новая блокировка по домену
@@ -381,9 +420,9 @@ ru:
       by_domain: Домен
       delivery_available: Доставка возможна
       known_accounts:
-        few: "%{count} известных учётных записей"
+        few: "%{count} известные учётные записи"
         many: "%{count} известных учётных записей"
-        one: "%{count} известных учётных записей"
+        one: "%{count} известная учётная запись"
         other: "%{count} известных учётных записей"
       moderation:
         all: Все
@@ -434,12 +473,12 @@ ru:
           few: "%{count} заметки"
           many: "%{count} заметок"
           one: "%{count} заметка"
-          other: "%{count} заметки"
+          other: "%{count} заметок"
         reports:
           few: "%{count} жалобы"
           many: "%{count} жалоб"
           one: "%{count} жалоба"
-          other: "%{count} жалобы"
+          other: "%{count} жалоб"
       action_taken_by: 'Действие предпринято:'
       are_you_sure: Вы уверены?
       assign_to_self: Назначить себе
@@ -558,6 +597,9 @@ ru:
       trends:
         desc_html: Публично отобразить проверенные хэштеги, актуальные на данный момент
         title: Популярные хэштеги
+    site_uploads:
+      delete: Удалить загруженный файл
+      destroyed_msg: Файл успешно удалён.
     statuses:
       back_to_account: Назад к учётной записи
       batch:
@@ -594,7 +636,6 @@ ru:
     warning_presets:
       add_new: Добавить
       delete: Удалить
-      edit: Изменить
       edit_preset: Удалить шаблон предупреждения
       title: Управление шаблонами предупреждений
   admin_mailer:
@@ -678,16 +719,17 @@ ru:
       confirming: Ожидание подтверждения e-mail.
       functional: Ваша учётная запись в полном порядке.
       pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
-      redirecting_to: Ваша учётная запись признана неактивным, потому что она перенаправляется на %{acct}.
+      redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
     trouble_logging_in: Не удаётся войти?
   authorize_follow:
     already_following: Вы уже подписаны на эту учётную запись
+    already_requested: Вы уже отправили запрос на подписку на эту учётную запись
     error: К сожалению, при поиске удалённой учётной записи возникла ошибка
     follow: Подписаться
     follow_request: 'Вы отправили запрос на подписку:'
-    following: 'Ура! Теперь Вы подписаны на:'
+    following: 'Готово! Вы подписались на:'
     post_follow:
-      close: Или просто закрыть это окно.
+      close: Или просто закройте это окно.
       return: Вернуться к профилю пользователя
       web: Открыть в веб-версии
     title: Подписаться на %{acct}
@@ -723,7 +765,7 @@ ru:
       before: 'Внимательно прочитайте следующую информацию перед началом:'
       caches: Некоторые данные, обработанные другими узлами, однако, могут храниться ещё какое-то время
       data_removal: Все ваши золотые посты, шикарный профиль и прочие данные будут безвозвратно уничтожены
-      email_change_html: <a href="%{path}">Поменять свой e-mail</a> можно не удаляя учётной записи
+      email_change_html: <a href="%{path}">Поменять свой e-mail</a> можно не удаляя учётную запись
       email_contact_html: Если письмо не приходит, обратитесь за помощю на <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Если вы не получили письмо с подтверждением, его можно <a href="%{path}">запросить ещё раз</a>
       irreversible: После удаления восстановить или повторно активировать учётную запись не получится
@@ -874,6 +916,7 @@ ru:
   media_attachments:
     validations:
       images_and_video: Нельзя добавить видео к посту с изображениями
+      not_ready: Не удаётся прикрепить файлы, обработка которых не завершена. Повторите попытку чуть позже!
       too_many: Нельзя добавить более 4 файлов
   migrations:
     acct: имя@домен новой учётной записи
@@ -924,8 +967,8 @@ ru:
         other: "%{count} новых уведомлений с вашего последнего захода \U0001F418"
       title: В ваше отсутствие…
     favourite:
-      body: "%{name} добавил ваш пост в избранное:"
-      subject: "%{name} добавил ваш пост в избранное"
+      body: "%{name} добавил(а) ваш пост в избранное:"
+      subject: "%{name} добавил(а) ваш пост в избранное"
       title: Понравившийся статус
     follow:
       body: "%{name} теперь подписан(а) на вас!"
@@ -939,7 +982,7 @@ ru:
     mention:
       action: Ответить
       body: 'Вас упомянул(а) %{name} в:'
-      subject: Вы были упомянуты %{name}
+      subject: "%{name} упомянул(а) вас"
       title: Новое упоминание
     reblog:
       body: 'Ваш пост был продвинут %{name}:'
@@ -1010,7 +1053,7 @@ ru:
   remote_interaction:
     favourite:
       proceed: Добавить в избранное
-      prompt: 'Вы собираетесь поставить отметку "нравится" этому посту:'
+      prompt: 'Вы собираетесь добавить в избранное следующий пост:'
     reblog:
       proceed: Продвинуть пост
       prompt: 'Вы хотите продвинуть этот пост:'
@@ -1105,6 +1148,8 @@ ru:
       many: 'содержались запрещённые хэштеги: %{tags}'
       one: 'содержался запрещённый хэштег: %{tags}'
       other: 'содержались запрещённые хэштеги: %{tags}'
+    errors:
+      in_reply_not_found: Пост, на который вы пытаетесь ответить, не существует или удалён.
     language_detection: Определять язык автоматически
     open_in_web: Открыть в веб-версии
     over_character_limit: превышен лимит символов (%{max})
@@ -1115,7 +1160,7 @@ ru:
       reblog: Нельзя закрепить продвинутый пост
     poll:
       total_people:
-        few: "%{count} человек"
+        few: "%{count} человека"
         many: "%{count} человек"
         one: "%{count} человек"
         other: "%{count} человек"
@@ -1239,7 +1284,7 @@ ru:
     generate_recovery_codes: Сгенерировать коды восстановления
     instructions_html: "<strong>Отсканируйте этот QR-код с помощью Google Authenticator, Яндекс.Ключа или любого другого подобного приложения</strong>. После сканирования и добавления, приложение начнёт генерировать коды, которые потребуется вводить для завершения входа в учётную запись."
     lost_recovery_codes: Коды восстановления позволяются войти в учётную запись в случае утери смартфона. Если вы потеряли свои коды восстановления, вы можете создать новые здесь. Прошлые коды работать перестанут.
-    manual_instructions: 'Если Вы не можете отсканировать QR-код и хотите ввести его вручную, секрет представлен здесь открытым текстом:'
+    manual_instructions: 'Если отсканировать QR-код не получается или не представляется возможным, вы можете ввести его вручную:'
     recovery_codes: Коды восстановления
     recovery_codes_regenerated: Коды восстановления успешно сгенерированы
     recovery_instructions_html: 'Пожалуйста, сохраните коды ниже в надёжном месте: они понадобятся, чтобы войти в учётную запись, если вы потеряете доступ к своему смартфону. Вы можете вручную переписать их, распечатать и спрятать среди важных документов или, например, в любимой книжке. <strong>Каждый код действителен один раз</strong>.'
@@ -1260,8 +1305,8 @@ ru:
       statuses: 'В частности, для:'
       subject:
         disable: Ваша учётная запись %{acct} заморожена
-        none: "%{acct}, вам вынесено предупреждение"
-        silence: На вашу учётную запись, %{acct}, были наложены ограничения
+        none: "%{acct} вынесено предупреждение"
+        silence: На учётную запись %{acct} наложены ограничения
         suspend: Ваша учётная запись %{acct} была заблокирована
       title:
         disable: Учётная запись заморожена
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 52933da12..a4a77e20f 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -8,6 +8,7 @@ ar:
         acct: ادخِل عنون الحساب username@domain الذي تودّ الإنتقال إليه
       account_warning_preset:
         text: بإمكانك استخدام نفس القواعد التي نجدها في التبويقات كعناوين الروابط والوسوم والإشارات
+        title: اختياري. غير مرئي للمُستَلِم
       admin_account_action:
         send_email_notification: سوف يتلقى المستخدم رسالة تُفسِّر ما حدث على حسابه
         type_html: اختر ما تود إجراؤه على <strong>%{acct}</strong>
@@ -70,6 +71,7 @@ ar:
         acct: مُعرّف الحساب الجديد
       account_warning_preset:
         text: نموذج نصي
+        title: العنوان
       admin_account_action:
         include_statuses: أدرج التبويقات التي تم الإبلاغ عنها ضمن الرسالة الإلكترونية
         send_email_notification: إشعار المستخدِم عبر البريد الإلكتروني
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 39cfa32c4..1a62eb76b 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -28,6 +28,8 @@ ast:
         fields:
           name: Etiqueta
           value: Conteníu
+      account_warning_preset:
+        title: Títulu
       admin_account_action:
         type: Aición
         types:
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index c7677c850..b67db471f 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -1 +1,23 @@
+---
 br:
+  simple_form:
+    labels:
+      account_warning_preset:
+        title: Titl
+      announcement:
+        text: Kemenn
+      defaults:
+        display_name: Anv diskouezet
+        header: Talbenn
+        locale: Yezh ar c'hetal
+        new_password: Ger-tremen nevez
+        password: Ger-tremen
+        setting_display_media_default: Dre ziouer
+        setting_display_media_hide_all: Kuzhat pep tra
+        setting_display_media_show_all: Diskouez pep tra
+      tag:
+        name: Ger-klik
+    'no': Ket
+    required:
+      mark: "*"
+    'yes': Ya
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index e91b74f85..f912e2e9e 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -8,6 +8,7 @@ ca:
         acct: Especifica l'usuari@domini del compte al que et vols moure
       account_warning_preset:
         text: Pots utilitzar totes les sintaxi com ara URL, etiquetes i mencions
+        title: Opcional. No és visible per al destinatari
       admin_account_action:
         include_statuses: L'usuari veurà quins tuts han causat l'acció de moderació o avís
         send_email_notification: L'usuari rebrà una explicació del que ha passat amb el seu compte
@@ -53,6 +54,9 @@ ca:
         whole_word: Quan la paraula clau o la frase sigui només alfanumèrica, s'aplicarà si coincideix amb la paraula sencera
       domain_allow:
         domain: Aquest domini podrà obtenir dades d’aquest servidor i les dades entrants d’aquests seran processades i emmagatzemades
+      email_domain_block:
+        domain: Això pot ser el nom del domini que es veu en l’adreça de correu electrònic, el registre MX al que resol el domini o l’IP del servidor al que resol el registre MX. Es comprovaran amb el registre d’usuari i es rebutjarà la inscripció.
+        with_dns_records: Es procurarà resoldre els registres DNS del domini determinat i els resultats també es llistaran a la llista negra
       featured_tag:
         name: 'És possible que vulguis utilitzar un d''aquests:'
       form_challenge:
@@ -78,6 +82,7 @@ ca:
         acct: Nom del nou compte
       account_warning_preset:
         text: Text predefinit
+        title: Títol
       admin_account_action:
         include_statuses: Inclou tuts reportats en el correu electrònic
         send_email_notification: Notifica l'usuari per correu electrònic
@@ -150,6 +155,8 @@ ca:
         username: Nom d'usuari
         username_or_email: Nom d'usuari o adreça electrònica
         whole_word: Paraula sencera
+      email_domain_block:
+        with_dns_records: Incloure registres MX i IP del domini
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index f4737069b..9ea83a6e7 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -8,6 +8,7 @@ co:
         acct: Entrate u cugnome@duminiu di u contu induve vulete traslucà
       account_warning_preset:
         text: Pudete utilizà a sintassa di i statuti, per esempiu l'URL, hashtag, minzione
+        title: In uzzione. Micca visibile per u distinatariu
       admin_account_action:
         include_statuses: L'utilizatore viderà i statuti rispunsevuli di l'azzione o l'avertimentu di muderazione
         send_email_notification: L'utilizatore hà da riceve una spiegazione di cio chì hè accadutu à u so contu
@@ -53,6 +54,9 @@ co:
         whole_word: Quandu a parolla o a frasa sana hè alfanumerica, sarà applicata solu s'ella currisponde à a parolla sana
       domain_allow:
         domain: Stu duminiu puderà ricuperà i dati di stu servore è i dati ch'affaccanu da quallà saranu trattati è cunservati
+      email_domain_block:
+        domain: Pò esse u duminiu affissatu nant'à l'indirizzu e-mail, l'intrata MX assuciata à u duminiu, o l'IP di u servore assuciatu à l'intrata MX. Quessi anu da esse verificati durante l'arregistramente di l'utilizatore, chì sarà righjittatu.
+        with_dns_records: Un tintativu di cunsultà i dati DNS di u duminiu sarà fattu, è i risultati saranu ancu messi nant'à a lista nera
       featured_tag:
         name: 'Pudete vulè utilizà unu di quelli:'
       form_challenge:
@@ -78,6 +82,7 @@ co:
         acct: Cugnome di u novu contu
       account_warning_preset:
         text: Testu preselezziunatu
+        title: Titulu
       admin_account_action:
         include_statuses: Inchjude i statuti palisati indè l'e-mail
         send_email_notification: Nutificà l'utilizatore cù un'e-mail
@@ -150,6 +155,8 @@ co:
         username: Cugnome
         username_or_email: Cugnome o Email
         whole_word: Parolla sana
+      email_domain_block:
+        with_dns_records: Inchjude intrate MX è indirizze IP di u duminiu
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 19aca7334..d8e272c8b 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -8,6 +8,7 @@ cy:
         acct: Rhowch enwdefnyddiwr@parth y cyfrif rydych chi am symud iddo
       account_warning_preset:
         text: Gallwch defnyddio cystrawen tŵt, fel URLs, hashnodau a sôniadau
+        title: Yn ddewisiol. Ddim yn weladwy i'r derbynydd
       admin_account_action:
         include_statuses: Bydd y defnyddiwr yn gweld pa tŵtiau sydd wedi achosi'r weithred gymedroli neu'r rhybudd
         send_email_notification: Bydd y defnyddiwr yn derbyn esboniad o beth digwyddodd gyda'i cyfrif
@@ -78,6 +79,7 @@ cy:
         acct: Enw'r cyfrif newydd
       account_warning_preset:
         text: Testun rhagosodedig
+        title: Teitl
       admin_account_action:
         include_statuses: Cynhwyswch tŵtiau yr adroddwyd amdanynt yn yr e-bost
         send_email_notification: Hysbysu'r defnyddiwr trwy e-bost
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 0863cc4a8..02d8ffbaa 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -8,6 +8,7 @@ de:
         acct: Gib den benutzernamen@domain des Kontos an, zu dem du umziehen möchtest
       account_warning_preset:
         text: Du kannst Beitragssyntax benutzen, wie z.B. URLs, Hashtags und Erwähnungen
+        title: Optional. Für den Empfänger nicht sichtbar
       admin_account_action:
         include_statuses: Der Benutzer wird sehen, welche Beiträge diese Maßnahme verursacht haben
         send_email_notification: Benutzer_in wird Bescheid gegeben, was mit dem Konto geschehen ist
@@ -43,7 +44,7 @@ de:
         setting_default_sensitive: Heikle Medien werden erst nach einem Klick sichtbar
         setting_display_media_default: Verstecke Medien, die als sensibel markiert sind
         setting_display_media_hide_all: Alle Medien immer verstecken
-        setting_display_media_show_all: Medien, die als sensibel markiert sind, immer anzeigen
+        setting_display_media_show_all: Alle Medien immer anzeigen
         setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
         setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
         setting_show_application: Die Anwendung die du nutzst wird in der detaillierten Ansicht deiner Beiträge angezeigt
@@ -53,6 +54,9 @@ de:
         whole_word: Wenn das Schlagwort nur aus Buchstaben und Zahlen besteht, wird es nur angewendet, wenn es dem ganzen Wort entspricht
       domain_allow:
         domain: Diese Domain kann Daten von diesem Server abrufen und eingehende Daten werden verarbeitet und gespeichert
+      email_domain_block:
+        domain: Dies kann der Domainname sein, der in der E-Mail-Adresse angezeigt wird, den MX-Datensatz, der aufgelöst wird oder die IP des Servers, auf dem der MX-Eintrag aufgelöst wird. Diese werden bei der Registrierung überprüft und die Registrierung wird abgelehnt.
+        with_dns_records: Ein Versuch die DNS-Einträge der Domain aufzulösen wurde unternommen und diese Ergebnisse werden unter anderem auch geblacklistet
       featured_tag:
         name: 'Du möchtest vielleicht einen von diesen benutzen:'
       form_challenge:
@@ -78,6 +82,7 @@ de:
         acct: Adresse des neuen Kontos
       account_warning_preset:
         text: Vorlagentext
+        title: Titel
       admin_account_action:
         include_statuses: Meldungen der E-Mail beifügen
         send_email_notification: Benachrichtige den Nutzer per E-Mail
@@ -150,6 +155,8 @@ de:
         username: Profilname
         username_or_email: Profilname oder E-Mail
         whole_word: Ganzes Wort
+      email_domain_block:
+        with_dns_records: MX-Einträge und IPs der Domain einbeziehen
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 231c32959..bb9033085 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -7,7 +7,8 @@ el:
       account_migration:
         acct: Όρισε το username@domain του λογαριασμού στον οποίο θέλεις να μετακινηθείς
       account_warning_preset:
-        text: Μπορείς να χρησιμοποιήσεις το ίδιο συντακτικό των τουτ όπως URL, ταμπέλες και αναφορές
+        text: Μπορείς να χρησιμοποιήσεις το ίδιο συντακτικό των τουτ όπως URL, ετικέτες και αναφορές
+        title: Προαιρετικό. Δεν εμφανίζεται στον παραλήπτη
       admin_account_action:
         include_statuses: Ο χρήστης θα δει ποια τουτ προκάλεσαν την προειδοποίηση ή την ενέργεια των διαχειριστών
         send_email_notification: Ο χρήστης θα λάβει μια εξήγηση του τι συνέβη με τον λογαριασμό του
@@ -70,7 +71,7 @@ el:
     labels:
       account:
         fields:
-          name: Ταμπέλα
+          name: Περιγραφή
           value: Περιεχόμενο
       account_alias:
         acct: Διακριτικό του παλιού λογαριασμού
@@ -78,6 +79,7 @@ el:
         acct: Διακριτικό του νέου λογαριασμού
       account_warning_preset:
         text: Προκαθορισμένο κείμενο
+        title: Τίτλος
       admin_account_action:
         include_statuses: Συμπερίληψη των καταγγελλομένων τουτ στο email
         send_email_notification: Ενημέρωση χρήστη μέσω email
@@ -150,8 +152,10 @@ el:
         username: Όνομα χρηστη
         username_or_email: Όνομα ή διεύθυνση email χρήστη
         whole_word: Ολόκληρη λέξη
+      email_domain_block:
+        with_dns_records: Συμπερίληψη εγγραφών MX και διευθύνσεων IP του τομέα
       featured_tag:
-        name: Ταμπέλα
+        name: Ετικέτα
       interactions:
         must_be_follower: Μπλόκαρε τις ειδοποιήσεις από όσους δεν σε ακολουθούν
         must_be_following: Μπλόκαρε τις ειδοποιήσεις από όσους δεν ακολουθείς
@@ -169,12 +173,12 @@ el:
         pending_account: Αποστολή email όταν υπάρχει νέος λογαριασμός για επιθεώρηση
         reblog: Αποστολή email όταν κάποιος προωθεί τη δημοσίευση σου
         report: Αποστολή email όταν υποβάλλεται νέα καταγγελία
-        trending_tag: Αποστολή email όταν μια μη-εγκεκριμένη ταμπέλα γίνεται δημοφιλής
+        trending_tag: Αποστολή email όταν μια μη-εγκεκριμένη ετικέτα γίνεται δημοφιλής
       tag:
-        listable: Εμφάνιση αυτής της ταμπέλας στο δημόσιο κατάλογο
-        name: Ταμπέλα
-        trendable: Εμφάνιση της ταμπέλας στις τάσεις
-        usable: Χρήση της ταμπέλας σε τουτ
+        listable: Εμφάνιση αυτής της ετικέτας στο δημόσιο κατάλογο
+        name: Ετικέτα
+        trendable: Εμφάνιση της ετικέτας στις τάσεις
+        usable: Χρήση της ετικέτας σε τουτ
     'no': Όχι
     recommended: Προτείνεται
     required:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 37d5a82f5..fd56a35bf 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -8,6 +8,7 @@ en:
         acct: Specify the username@domain of the account you want to move to
       account_warning_preset:
         text: You can use toot syntax, such as URLs, hashtags and mentions
+        title: Optional. Not visible to the recipient
       admin_account_action:
         include_statuses: The user will see which toots have caused the moderation action or warning
         send_email_notification: The user will receive an explanation of what happened with their account
@@ -42,8 +43,8 @@ en:
         setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
-        setting_display_media_hide_all: Always hide all media
-        setting_display_media_show_all: Always show media marked as sensitive
+        setting_display_media_hide_all: Always hide media
+        setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will not be shown on your profile
         setting_noindex: Affects your public profile and status pages
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
@@ -53,6 +54,9 @@ en:
         whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       domain_allow:
         domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
+      email_domain_block:
+        domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
+        with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted
       featured_tag:
         name: 'You might want to use one of these:'
       form_challenge:
@@ -78,6 +82,7 @@ en:
         acct: Handle of the new account
       account_warning_preset:
         text: Preset text
+        title: Title
       admin_account_action:
         include_statuses: Include reported toots in the e-mail
         send_email_notification: Notify the user per e-mail
@@ -150,6 +155,8 @@ en:
         username: Username
         username_or_email: Username or Email
         whole_word: Whole word
+      email_domain_block:
+        with_dns_records: Include MX records and IPs of the domain
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index ee7ec769a..3bd77a8e8 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -35,6 +35,7 @@ eo:
         setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo
         setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn
         setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj mesaĝoj
+        setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
         username: Via uzantnomo estos unika ĉe %{domain}
         whole_word: Kiam la vorto aŭ frazo estas nur litera aŭ cifera, ĝi estos uzata nur se ĝi kongruas kun la tuta vorto
       featured_tag:
@@ -105,7 +106,8 @@ eo:
         setting_advanced_layout: Ebligi altnivelan retpaĝan interfacon
         setting_aggregate_reblogs: Grupigi diskonigojn en tempolinioj
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
-        setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi
+        setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi mesaĝon
+        setting_crop_images: Stuci bildojn en negrandigitaj mesaĝoj al 16x9
         setting_default_language: Publikada lingvo
         setting_default_privacy: Mesaĝa videbleco
         setting_default_sensitive: Ĉiam marki aŭdovidaĵojn tiklaj
@@ -114,7 +116,7 @@ eo:
         setting_display_media_default: Dekomenca
         setting_display_media_hide_all: Kaŝi ĉiujn
         setting_display_media_show_all: Montri ĉiujn
-        setting_expand_spoilers: Ĉiam grandigi mesaĝojn markitajn per avertoj pri enhavo
+        setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
         setting_noindex: Ellistiĝi de retserĉila indeksado
         setting_reduce_motion: Malrapidigi animaciojn
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 78bb3e275..ad35135e4 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -8,6 +8,7 @@ es-AR:
         acct: Especificá el nombredeusuario@dominio de la cuenta a la que querés mudarte
       account_warning_preset:
         text: Podés usar sintaxis de toots, como direcciones web, etiquetas y menciones
+        title: Opcional. No visible para el destinatario
       admin_account_action:
         include_statuses: El usuario verá qué toots causaron la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que sucedió con su cuenta
@@ -53,6 +54,9 @@ es-AR:
         whole_word: Cuando la palabra clave o frase es sólo alfanumérica, sólo será aplicado si coincide con toda la palabra
       domain_allow:
         domain: Este dominio podrá recolectar datos de este servidor, y los datos entrantes serán procesados y archivados
+      email_domain_block:
+        domain: Puede ser el nombre de dominio que aparece en la dirección de correo electrónico, el registro MX hacia el cual resuelve el dominio, o la dirección IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del registro del usuario, y el registro será rechazado.
+        with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en la lista de desaprobados
       featured_tag:
         name: 'Puede que quieras usar una de estas:'
       form_challenge:
@@ -78,6 +82,7 @@ es-AR:
         acct: Alias de la cuenta nueva
       account_warning_preset:
         text: Texto predefinido
+        title: Título
       admin_account_action:
         include_statuses: Incluir en el correo electrónico a los toots denunciados
         send_email_notification: Notificar al usuario por correo electrónico
@@ -150,6 +155,8 @@ es-AR:
         username: Nombre de usuario
         username_or_email: Nombre de usuario o correo electrónico
         whole_word: Palabra entera
+      email_domain_block:
+        with_dns_records: Incluir los registros MX y las direcciones IP del dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 745de3332..b114b1424 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -8,6 +8,7 @@ es:
         acct: Especifique el nombre de usuario@dominio de la cuenta a la cual se desea migrar
       account_warning_preset:
         text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
+        title: Opcional. No visible para el destinatario
       admin_account_action:
         include_statuses: El usuario verá qué toots han causado la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
@@ -53,6 +54,9 @@ es:
         whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra
       domain_allow:
         domain: Este dominio podrá obtener datos de este servidor y los datos entrantes serán procesados y archivados
+      email_domain_block:
+        domain: Puede ser el nombre de dominio que aparece en la dirección de correo, el registro MX hacia el cual resuelve el dominio, o la IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del alta del usuario y el alta se rechazará.
+        with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en lista negra
       featured_tag:
         name: 'Puede que quieras usar uno de estos:'
       form_challenge:
@@ -78,6 +82,7 @@ es:
         acct: Maneja la cuenta nueva
       account_warning_preset:
         text: Texto predefinido
+        title: Título
       admin_account_action:
         include_statuses: Incluir en el correo electrónico a los toots denunciados
         send_email_notification: Notificar al usuario por correo electrónico
@@ -150,6 +155,8 @@ es:
         username: Nombre de usuario
         username_or_email: Usuario o Email
         whole_word: Toda la palabra
+      email_domain_block:
+        with_dns_records: Incluye los registros MX y las IP del dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 9e45fb032..c0f36df77 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -8,8 +8,9 @@ eu:
         acct: Zehaztu migrazioaren xede den kontuaren erabiltzaile@domeinua
       account_warning_preset:
         text: Toot sintaxia erabili dezakezu, URLak, traolak eta aipamenak
+        title: Aukerakoa. Hartzaileak ez du ikusiko
       admin_account_action:
-        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten toot-ak ikusi ahal izango ditu
+        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten tootak ikusi ahal izango ditu
         send_email_notification: Erabiltzaileak bere kontuarekin gertatutakoaren azalpen bat jasoko du
         text_html: Aukerakoa. Toot sintaxia erabili dezakezu. <a href="%{path}">Abisu aurre-ezarpenak</a> gehitu ditzakezu denbora aurrezteko
         type_html: Erabaki zer egin <strong>%{acct}</strong> kontuarekin
@@ -19,7 +20,7 @@ eu:
         ends_at: Aukerakoa. Iragapena une honetan automatikoki desargitaratuko da
         scheduled_at: Laga hutsik iragarpena berehala argitaratzeko
         starts_at: Aukerakoa. Zure iragarpena denbora-tarte batera lotuta dagoenerako
-        text: Toot-etako sintaxia erabili dezakezu. Kontuan izan iragarpenak erabiltzailearen pantailan hartuko duen neurria
+        text: Tootetako sintaxia erabili dezakezu. Kontuan izan iragarpenak erabiltzailearen pantailan hartuko duen neurria
       defaults:
         autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
         avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
@@ -33,19 +34,19 @@ eu:
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
-        irreversible: Iragazitako Toot-ak betirako galduko dira, geroago iragazkia kentzen baduzu ere
+        irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
         locked: Jarraitzaileak eskuz onartu behar dituzu
         password: Erabili 8 karaktere gutxienez
         phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe
         scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar.
-        setting_aggregate_reblogs: Ez erakutsi bultzada berriak berriki bultzada jaso duten toot-entzat (berriki jasotako bultzadei eragiten die bakarrik)
+        setting_aggregate_reblogs: Ez erakutsi bultzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die bakarrik)
         setting_default_sensitive: Multimedia hunkigarria lehenetsita ezkutatzen da, eta sakatuz ikusi daiteke
         setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
         setting_display_media_hide_all: Ezkutatu multimedia guztia beti
         setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
         setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
-        setting_noindex: Zure profil publiko eta Toot-en orrietan eragina du
+        setting_noindex: Zure profil publiko eta tooten orrietan eragina du
         setting_show_application: Tootak bidaltzeko erabiltzen duzun aplikazioa zure tooten ikuspegi xehetsuan bistaratuko da
         setting_use_blurhash: Gradienteak ezkutatutakoaren koloreetan oinarritzen dira, baina xehetasunak ezkutatzen dituzte
         setting_use_pending_items: Ezkutatu denbora-lerroko eguneraketak klik baten atzean jarioa automatikoki korritu ordez
@@ -53,6 +54,9 @@ eu:
         whole_word: Hitz eta esaldi gakoa alfanumerikoa denean, hitz osoarekin bat datorrenean besterik ez da aplikatuko
       domain_allow:
         domain: Domeinu honek zerbitzari honetatik datuak hartu ahal izango ditu eta bertatik jasotako informazioa prozesatu eta gordeko da
+      email_domain_block:
+        domain: Hau e-mail helbidean agertzen den domeinua izan daiteke, honen MX erregistroa, edo MX erregistroaren IP helbidea. Hauek erabiltzaileak izena ematean egiaztatuko dira eta atzera botako da.
+        with_dns_records: Emandako domeinuaren DNS erregistroak ebazteko saiakera bat egingo da eta emaitzak ere zerrenda beltzean sartuko dira
       featured_tag:
         name: 'Hauetakoren bat erabili zenezake:'
       form_challenge:
@@ -66,7 +70,7 @@ eu:
       tag:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
-        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden toot-ak besterik ez dira erakutsiko
+        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden tootak besterik ez dira erakutsiko
     labels:
       account:
         fields:
@@ -78,8 +82,9 @@ eu:
         acct: Kontu berriaren helbidea
       account_warning_preset:
         text: Aurrez ezarritako testua
+        title: Izenburua
       admin_account_action:
-        include_statuses: Txertatu salatutako toot-ak e-mailean
+        include_statuses: Txertatu salatutako tootak e-mailean
         send_email_notification: Jakinarazi erabiltzaileari e-mail bidez
         text: Abisu pertsonalizatua
         type: Ekintza
@@ -125,7 +130,7 @@ eu:
         setting_aggregate_reblogs: Taldekatu bultzadak denbora-lerroetan
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
-        setting_crop_images: Moztu irudiak hedatu gabeko toot-etan 16x9 proportzioan
+        setting_crop_images: Moztu irudiak hedatu gabeko tootetan 16x9 proportzioan
         setting_default_language: Argitalpenen hizkuntza
         setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
@@ -150,6 +155,8 @@ eu:
         username: Erabiltzaile-izena
         username_or_email: Erabiltzaile-izena edo e-mail helbidea
         whole_word: Hitz osoa
+      email_domain_block:
+        with_dns_records: Sartu ere domeinuaren MX erregistroak eta IPak
       featured_tag:
         name: Traola
       interactions:
@@ -174,7 +181,7 @@ eu:
         listable: Baimendu traola hau bilaketetan agertzea eta profilen direktorioan
         name: Traola
         trendable: Baimendu traola hau joeretan agertzea
-        usable: Baimendu toot-ek traola hau erabiltzea
+        usable: Baimendu tootek traola hau erabiltzea
     'no': Ez
     recommended: Aholkatua
     required:
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 0001efaf5..dea53ddbb 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -8,6 +8,7 @@ fa:
         acct: نشانی username@domain را برای حسابی که می‌خواهید به آن منتقل شوید بنویسید
       account_warning_preset:
         text: می‌توانید مانند بوق‌های معمولی کاربران دیگر را نام ببرید یا پیوند و برچسب بگذارید
+        title: اختیاری. برای گیرنده قابل مشاهده نیست
       admin_account_action:
         include_statuses: این کاربر خواهد دید که کدام بوق او موجب اقدام مدیریتی یا هشدار شده است
         send_email_notification: توضیحی که کاربر می‌بینید که برای حسابش چه رخ داده است
@@ -24,7 +25,7 @@ fa:
         autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد
         avatar: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         bot: این حساب بیشتر به طور خودکار فعالیت می‌کند و نظارت پیوسته‌ای روی آن وجود ندارد
-        context: یک یا چند زمینه که فیلتر باید در آن‌ها اعمال شود
+        context: یک یا چند زمینه که پالایه باید در آن‌ها اعمال شود
         current_password: به دلایل امنیتی لطفاً رمز این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
@@ -33,7 +34,7 @@ fa:
         fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
-        irreversible: بوق‌های فیلترشده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتی اگر فیلتر را بعداً بردارید
+        irreversible: بوق‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
         locale: زبان محیط کاربری، ایمیل‌ها، و اعلان‌ها
         locked: باید پیگیران تازه را خودتان تأیید کنید
         password: دست‌کم باید ۸ نویسه داشته باشد
@@ -53,6 +54,9 @@ fa:
         whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا می‌شود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه
       domain_allow:
         domain: این دامین خواهد توانست داده‌ها از این سرور را دریافت کند و داده‌های از این دامین در این‌جا پردازش و ذخیره خواهند شد
+      email_domain_block:
+        domain: می‌تواند نام دامنه که در نشانی رایانامه ظاهر می‌شود، رکورد MX که دامنه به آن resolve می‌شود یا IP کارسازی که رکورد MX به آن resolve می‌شود باشد. این موارد هنگام ثبت‌نام کاربر بررسی شده و ثبت‌نام رد می‌شود.
+        with_dns_records: تلاشی برای resolve کردن رکوردهای ساناد دامنهٔ داده‌شده انجام شده و نتیجه نیز مسدود خواهد شد
       featured_tag:
         name: 'شاید بخواهید چنین چیزهایی را به کار ببرید:'
       form_challenge:
@@ -78,6 +82,7 @@ fa:
         acct: نشانی حساب تازه
       account_warning_preset:
         text: متن از پیش آماده‌شده
+        title: عنوان
       admin_account_action:
         include_statuses: بوق‌های گزارش‌شده را در ایمیل بگنجان
         send_email_notification: اطلاع‌رسانی به کاربر از راه ایمیل
@@ -102,7 +107,7 @@ fa:
         chosen_languages: جدا کردن زبان‌ها
         confirm_new_password: تأیید رمز تازه
         confirm_password: تأیید رمز
-        context: زمینه‌های فیلترکردن
+        context: زمینه‌های پالایش
         current_password: رمز فعلی
         data: داده‌ها
         discoverable: این حساب را در فهرست گزیدهٔ کاربران نشان بده
@@ -150,6 +155,8 @@ fa:
         username: نام کاربری (لاتین)
         username_or_email: نام کاربری یا ایمیل
         whole_word: تطابق واژهٔ کامل
+      email_domain_block:
+        with_dns_records: شامل رکوردهای MX و‌IPهای دامنه
       featured_tag:
         name: برچسب
       interactions:
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 0e5332f1e..77e91329a 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -8,6 +8,7 @@ fr:
         acct: Spécifiez le nom d’utilisateur@domaine du compte vers lequel vous souhaitez déménager
       account_warning_preset:
         text: Vous pouvez utiliser la syntaxe des pouets, comme les URLs, les hashtags et les mentions
+        title: Facultatif. Invisible pour le destinataire
       admin_account_action:
         include_statuses: L’utilisateur·rice verra quels sont les pouets qui ont provoqué l’action de modération ou l’avertissement
         send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
@@ -35,24 +36,27 @@ fr:
         inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
         irreversible: Les pouets filtrés disparaîtront irrémédiablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
-        locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es
+        locked: Vous devrez approuver chaque abonné·e et vos statuts ne s’afficheront qu’à vos abonné·e·s
         password: Utilisez au moins 8 caractères
-        phrase: Sera trouvé sans que la case ou l’avertissement de contenu du pouet soit pris en compte
+        phrase: Sera filtré sans que la casse ou l’avertissement sur le contenu du pouet soit pris en compte
         scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
         setting_aggregate_reblogs: Ne pas afficher de nouveaux partages pour les pouets qui ont été récemment partagés (n’affecte que les partages nouvellement reçus)
         setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic
         setting_display_media_default: Masquer les médias marqués comme sensibles
-        setting_display_media_hide_all: Toujours masquer tous les médias
+        setting_display_media_hide_all: Toujours cacher les médias
         setting_display_media_show_all: Toujours afficher les médias marqués comme sensibles
         setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
         setting_noindex: Affecte votre profil public ainsi que vos statuts
         setting_show_application: Le nom de l’application que vous utilisez afin d’envoyer des pouets sera affiché dans la vue détaillée de ceux-ci
-        setting_use_blurhash: Les dégradés sont basés sur les couleurs des visuels cachés mais ne divulgent pas les détails
-        setting_use_pending_items: Masquer les mises à jour chronologiques derrière un clic au lieu de les montrer automatiquement en faisant défiler le flux d'actualités
+        setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
+        setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
         username: Votre nom d’utilisateur sera unique sur %{domain}
-        whole_word: Lorsque le mot-clef ou la phrase-clef est uniquement alphanumérique, ça sera uniquement appliqué s’il correspond au mot entier
+        whole_word: Si le mot-clé ou la phrase est alphanumérique, alors le filtre ne sera appliqué que s’il correspond au mot entier
       domain_allow:
         domain: Ce domaine pourra récupérer des données de ce serveur et les données entrantes seront traitées et stockées
+      email_domain_block:
+        domain: Ceci peut être le nom de domaine qui apparaît dans le courriel, l’enregistrement MX que le domaine résout, ou l’IP du serveur auquel l’enregistrement MX résout. Celles-ci seront vérifiées lors de l’inscription de l’utilisateur et l’inscription sera rejetée.
+        with_dns_records: Une tentative de résolution des enregistrements DNS du domaine donné sera effectuée et les résultats seront également mis sur liste noire
       featured_tag:
         name: 'Vous pourriez vouloir utiliser l’un d’entre eux :'
       form_challenge:
@@ -78,6 +82,7 @@ fr:
         acct: L’identifiant du nouveau compte
       account_warning_preset:
         text: Texte de présélection
+        title: Titre
       admin_account_action:
         include_statuses: Inclure les pouets signalés dans le courriel
         send_email_notification: Notifier l’utilisateur par courriel
@@ -87,7 +92,7 @@ fr:
           disable: Désactiver
           none: Ne rien faire
           silence: Masquer
-          suspend: Suspendre et effacer les données du compte de manière irréversible
+          suspend: Suspendre et supprimer les données du compte de manière irréversible
         warning_preset_id: Utiliser un modèle d’avertissement
       announcement:
         all_day: Événement de toute la journée
@@ -112,7 +117,7 @@ fr:
         fields: Métadonnées du profil
         header: Image d’en-tête
         inbox_url: URL de la boîte de relais
-        irreversible: Supprimer plutôt que de cacher
+        irreversible: Supprimer plutôt que masquer
         locale: Langue de l’interface
         locked: Verrouiller le compte
         max_uses: Nombre maximum d’utilisations
@@ -122,10 +127,10 @@ fr:
         password: Mot de passe
         phrase: Mot-clé ou phrase
         setting_advanced_layout: Activer l’interface Web avancée
-        setting_aggregate_reblogs: Partages groupés dans les fils d’actualités
+        setting_aggregate_reblogs: Grouper les partages dans les fils d’actualités
         setting_auto_play_gif: Lire automatiquement les GIFs animés
-        setting_boost_modal: Afficher une fenêtre de confirmation avant de partager
-        setting_crop_images: Recadrer les images dans les pouets non-expansés à 16x9
+        setting_boost_modal: Afficher une fenêtre de confirmation avant de partager un pouet
+        setting_crop_images: Recadrer les images des pouets non-dépliés en 16x9
         setting_default_language: Langue de publication
         setting_default_privacy: Confidentialité des statuts
         setting_default_sensitive: Toujours marquer les médias comme sensibles
@@ -134,7 +139,7 @@ fr:
         setting_display_media_default: Défaut
         setting_display_media_hide_all: Masquer tout
         setting_display_media_show_all: Montrer tout
-        setting_expand_spoilers: Toujours développer les pouets marqués d’un avertissement de contenu
+        setting_expand_spoilers: Toujours déplier les pouets marqués d’un avertissement sur le contenu
         setting_hide_network: Cacher votre réseau
         setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
         setting_reduce_motion: Réduire la vitesse des animations
@@ -143,13 +148,15 @@ fr:
         setting_theme: Thème du site
         setting_trends: Afficher les tendances du jour
         setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte
-        setting_use_blurhash: Afficher les dégradés colorés pour les médias cachés
+        setting_use_blurhash: Afficher des dégradés colorés pour les médias cachés
         setting_use_pending_items: Mode lent
         severity: Sévérité
         type: Type d’import
         username: Identifiant
-        username_or_email: Nom d’utilisateur·ice ou courriel
+        username_or_email: Nom d’utilisateur·rice ou courriel
         whole_word: Mot entier
+      email_domain_block:
+        with_dns_records: Inclure les enregistrements MX et IP du domaine
       featured_tag:
         name: Hashtag
       interactions:
@@ -166,14 +173,14 @@ fr:
         follow: Envoyer un courriel lorsque quelqu’un me suit
         follow_request: Envoyer un courriel lorsque quelqu’un demande à me suivre
         mention: Envoyer un courriel lorsque quelqu’un me mentionne
-        pending_account: Envoyer un courriel lorsqu’un nouveau compte est en attente d’approbation
-        reblog: Quelqu’un a partagé votre statut
+        pending_account: Nouveau compte en attente d’approbation
+        reblog: Quelqu’un a partagé votre pouet
         report: Envoyer un courriel lorsqu’un nouveau rapport est soumis
-        trending_tag: Envoyer un e-mail quand un hashtag non contrôlé est en tendance actuelle
+        trending_tag: Un hashtag non approuvé est dans les tendances
       tag:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Hashtag
-        trendable: Autoriser ce hashtag à apparaître sous les tendances du jour
+        trendable: Autoriser ce hashtag à apparaitre dans les tendances
         usable: Autoriser les pouets à utiliser ce hashtag
     'no': Non
     recommended: Recommandé
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index d6768a17d..86d4bea5f 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -8,6 +8,7 @@ gl:
         acct: Indica o usuaria@servidor da conta a cal queres migrar
       account_warning_preset:
         text: Pódeslle dar formato ao toot, como URLs, etiquetas e mencións
+        title: Optativo. Non visible para a correspondente
       admin_account_action:
         include_statuses: A usuaria verá que toots causaron a acción da moderación ou aviso
         send_email_notification: A usuaria recibirá unha explicación sobre o que lle aconteceu a súa conta
@@ -53,6 +54,9 @@ gl:
         whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa
       domain_allow:
         domain: Este dominio estará en disposición de obter datos desde este servidor e datos de entrada a el poderán ser procesados e gardados
+      email_domain_block:
+        domain: Esto pode ser o nome de dominio que aparece no enderezo do correo, o rexistro MX que resolve o dominio, ou o IP do servidor que resolve o rexistro MX. Estos confrontaranse contra o rexistro da usuaria e o rexistro será rexeitado.
+        with_dns_records: Vaise facer un intento de resolver os rexistros DNS propocionados e os resultados tamén irán a lista negra
       featured_tag:
         name: 'Podería utilizar algunha de estas:'
       form_challenge:
@@ -78,6 +82,7 @@ gl:
         acct: Xestiona a nova conta
       account_warning_preset:
         text: Texto preestablecido
+        title: Título
       admin_account_action:
         include_statuses: Incluír toots reportados no correo
         send_email_notification: Notificar a usuaria por correo-e
@@ -150,6 +155,8 @@ gl:
         username: Nome de usuaria
         username_or_email: Nome de usuaria ou Correo-e
         whole_word: Palabra completa
+      email_domain_block:
+        with_dns_records: Incluír rexistros MX e IPs do dominio
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index cee6bdb45..2063446f1 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -8,6 +8,7 @@ hu:
         acct: Add meg a fióknév@domain fiókot, melybe költözni szeretnél
       account_warning_preset:
         text: Használhatod a tülkökben szokásos szintaxist, URL-eket, hashtageket, megemlítéseket
+        title: Opcionális. Címzett számára nem látható
       admin_account_action:
         include_statuses: A felhasználó látni fogja, melyik tülk okozta a moderációt vagy figyelmeztetést
         send_email_notification: A felhasználó magyarázatot kap arra, mi történt a fiókjával
@@ -53,6 +54,9 @@ hu:
         whole_word: Ha a kulcsszó alfanumerikus, csak akkor minősül majd találatnak, ha teljes szóra illeszkedik
       domain_allow:
         domain: Ez a domain adatot kérhet le a szerverünkről és az ettől érkező adatokat feldolgozzuk és mentjük
+      email_domain_block:
+        domain: Lehet domain név, mely az email címben szerepel, MX rekord, amire a domain hivatkozik vagy a szerver IP címe, amire az MX rekord hivatkozik. Ezeket regisztrációkor ellenőrizzük és visszautasítjuk a regisztrációt, ha szükséges.
+        with_dns_records: Megpróbáljuk a megadott domain DNS rekordjait lekérni, és az eredményeket hozzáadjuk a tiltólistához
       featured_tag:
         name: 'Ezeket esetleg használhatod:'
       form_challenge:
@@ -78,6 +82,7 @@ hu:
         acct: Új fiók kezelése
       account_warning_preset:
         text: Figyelmeztető szöveg
+        title: Cím
       admin_account_action:
         include_statuses: Helyezd az e-mailbe a jelentett tülköket
         send_email_notification: Figyelmeztessük a felhasználót e-mailben
@@ -150,6 +155,8 @@ hu:
         username: Felhasználónév
         username_or_email: Felhasználónév vagy E-mail
         whole_word: Teljes szó
+      email_domain_block:
+        with_dns_records: Domain MX rekordjainak és IP címeinek hozzávétele
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index ada83fc86..1717d0722 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -8,6 +8,7 @@ id:
         acct: Tentukan namapengguna@domain akun yang ingin Anda pindah
       account_warning_preset:
         text: Anda dapat memakai sintaks toot, seperti URL, tagar, dan sebutan
+        title: Opsional. Tidak terlihat penerima
       admin_account_action:
         include_statuses: Pengguna dapat melihat toot mana yang menyebabkan aksi atau peringatan moderasi
         send_email_notification: Pengguna akan menerima penjelasan tentang apa yang terjadi pada akun mereka
@@ -53,6 +54,9 @@ id:
         whole_word: Ketika kata kunci/frasa hanya alfanumerik, maka itu hanya akan diterapkan jika cocok dengan semua kata
       domain_allow:
         domain: Domain ini dapat mengambil data dari server ini dan data yang diterima akan diproses dan disimpan
+      email_domain_block:
+        domain: Ini bisa nama domain yang muncul di alamat surel, data MX yang sedang diselesaikan oleh domain, atau IP server yang dipecahkan oleh data MX. Mereka akan dicek saat pendaftaran pengguna dan pendaftaran akan ditolak.
+        with_dns_records: Usaha untuk menyelesaikan data DNS domain yang diberikan akan dilakukan dan hasilnya akan masuk daftar hitam
       featured_tag:
         name: 'Anda mungkin ingin pakai salah satu dari ini:'
       form_challenge:
@@ -78,6 +82,7 @@ id:
         acct: Menangani akun baru
       account_warning_preset:
         text: Teks preset
+        title: Judul
       admin_account_action:
         include_statuses: Sertakan toot terlapor pada surel
         send_email_notification: Beritahu pengguna per surel
@@ -150,6 +155,8 @@ id:
         username: Nama pengguna
         username_or_email: Nama pengguna atau Surel
         whole_word: Seluruh kata
+      email_domain_block:
+        with_dns_records: Termasuk data MX dan IP domain
       featured_tag:
         name: Tagar
       interactions:
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 65041f19c..3275b15f7 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -8,6 +8,7 @@ is:
         acct: Tilgreindu notandanafn@lén á notandaaðgangnum sem þú vilt flytjast til
       account_warning_preset:
         text: Þú getur notað sömu skilgreiningar og fyrir tíst, svo sem URL-slóðir, myllumerki og tilvísanir
+        title: Valkvætt. Ekki sýnilegt viðtakandanum
       admin_account_action:
         include_statuses: Notandinn mun sjá hvaða tíst hafa valdið viðbrögðum umsjónarmanns eða aðvörun kerfisins
         send_email_notification: Notandinn mun fá útskýringar á því hvað gerðist með notandaaðganginn hans
@@ -53,6 +54,9 @@ is:
         whole_word: Þegar stikkorð eða frasi er einungis tölur og bókstafir, verður það aðeins notað ef það samsvarar heilu orði
       domain_allow:
         domain: Þetta lén mun geta sótt gögn af þessum vefþjóni og tekið verður á móti innsendum gögnum frá léninu til vinnslu og geymslu
+      email_domain_block:
+        domain: Þetta getur verið heiti lénsins sem birtist í tölvupóstfanginu, MX-færslan sem það lén beinist að, eða IP-vistfang netþjónsins sem sú MX-færsla beinist að. Þetta verður athugað um leið og notandi skráir sig, og verður þá skráningunni hafnað.
+        with_dns_records: Tilraun verður gerð til að leysa DNS-færslur uppgefins léns og munu niðurstöðurnar einnig verða útilokaðar
       featured_tag:
         name: 'Þú gætir viljað nota eitt af þessum:'
       form_challenge:
@@ -78,6 +82,7 @@ is:
         acct: Auðkenni nýja aðgangsins
       account_warning_preset:
         text: Forstilltur texti
+        title: Titill
       admin_account_action:
         include_statuses: Innifela kærð tíst í tölvupóstinum
         send_email_notification: Láta notanda vita með tölvupósti
@@ -150,6 +155,8 @@ is:
         username: Notandanafn
         username_or_email: Notandanafn eða tölvupóstfang
         whole_word: Heil orð
+      email_domain_block:
+        with_dns_records: Hafa með MX-færslur og IP-vistföng lénsins
       featured_tag:
         name: Myllumerki
       interactions:
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 35c4f80cf..61128bb38 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -8,6 +8,7 @@ it:
         acct: Indica il nomeutente@dominio dell'account al quale vuoi trasferirti
       account_warning_preset:
         text: Puoi usare la sintassi dei toot, come URL, hashtag e menzioni
+        title: Opzionale. Non visibile al destinatario
       admin_account_action:
         include_statuses: L'utente vedrà quali toot hanno causato l'azione di moderazione o l'avviso
         send_email_notification: L'utente riceverà una spiegazione di ciò che è successo con suo account
@@ -53,6 +54,9 @@ it:
         whole_word: Quando la parola chiave o la frase è solo alfanumerica, si applica solo se corrisponde alla parola intera
       domain_allow:
         domain: Questo dominio potrà recuperare i dati da questo server e i dati in arrivo da esso verranno elaborati e memorizzati
+      email_domain_block:
+        domain: Questo può essere il nome del dominio che fa parte dell'indirizzo email, il record MX a cui il dominio si risolve o l'indirizzo IP del server a cui il record MX si risolve. Saranno verificati alla registrazione da parte dell'utente e la sua iscrizione sarà respinta.
+        with_dns_records: Sarà effettuato un tentativo di risolvere i record DNS del dominio in questione e i risultati saranno inseriti anche nella blacklist
       featured_tag:
         name: 'Eccone alcuni che potresti usare:'
       form_challenge:
@@ -78,6 +82,7 @@ it:
         acct: Handle del nuovo account
       account_warning_preset:
         text: Testo preimpostato
+        title: Titolo
       admin_account_action:
         include_statuses: Includi i toots segnalati nell'email
         send_email_notification: Informa l'utente via email
@@ -150,12 +155,16 @@ it:
         username: Nome utente
         username_or_email: Nome utente o email
         whole_word: Parola intera
+      email_domain_block:
+        with_dns_records: Includi record MX e indirizzi IP del dominio
       featured_tag:
         name: Etichetta
       interactions:
         must_be_follower: Blocca notifiche da chi non ti segue
         must_be_following: Blocca notifiche dalle persone che non segui
         must_be_following_dm: Blocca i messaggi diretti dalle persone che non segui
+      invite:
+        comment: Commento
       invite_request:
         text: Perché vuoi iscriverti?
       notification_emails:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a56990d3b..1e25419cf 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -8,6 +8,7 @@ ja:
         acct: 引っ越し先のユーザー名@ドメインを指定してください
       account_warning_preset:
         text: URL、ハッシュタグ、メンションなど、投稿に用いる構文が使用できます
+        title: オプションです。受信者には表示されません。
       admin_account_action:
         include_statuses: ユーザーは取られた制限や警告の原因となったトゥートを確認できるようになります
         send_email_notification: ユーザーは自分のアカウントに何が起こったのか説明を受け取ります
@@ -42,8 +43,8 @@ ja:
         setting_aggregate_reblogs: 最近ブーストされたトゥートが新たにブーストされても表示しません (設定後受信したものにのみ影響)
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
-        setting_display_media_hide_all: 全てのメディアを常に隠す
-        setting_display_media_show_all: 閲覧注意としてマークされたメディアも常に表示する
+        setting_display_media_hide_all: メディアを常に隠す
+        setting_display_media_show_all: メディアを常に表示する
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります
@@ -53,6 +54,9 @@ ja:
         whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります
       domain_allow:
         domain: 登録するとこのサーバーからデータを受信したり、このドメインから受信するデータを処理して保存できるようになります
+      email_domain_block:
+        domain: メールアドレスのドメイン名および、名前解決したMXレコード、IPアドレスを指定できます。ユーザー登録時にこれらをチェックし、該当する場合はユーザー登録を拒否します。
+        with_dns_records: 指定したドメインの名前解決ができない場合、ブラックリストに登録されます
       featured_tag:
         name: 'これらを使うといいかもしれません:'
       form_challenge:
@@ -78,13 +82,14 @@ ja:
         acct: 引っ越し先のユーザー ID
       account_warning_preset:
         text: プリセット警告文
+        title: タイトル
       admin_account_action:
         include_statuses: 通報されたトゥートをメールに含める
         send_email_notification: メールでユーザーに通知
         text: カスタム警告文
         type: アクション
         types:
-          disable: 無効化
+          disable: ログインを無効化
           none: 何もしない
           silence: サイレンス
           suspend: 停止しアカウントのデータを恒久的に削除する
@@ -150,6 +155,8 @@ ja:
         username: ユーザー名
         username_or_email: ユーザー名またはメールアドレス
         whole_word: 単語全体にマッチ
+      email_domain_block:
+        with_dns_records: ドメインのMXレコードとIPアドレスを含む
       featured_tag:
         name: ハッシュタグ
       interactions:
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index db4369e92..c9936c49a 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -3,7 +3,7 @@ kab:
   simple_form:
     hints:
       account_alias:
-        acct: Specify the username@domain of the account you want to move from
+        acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
       account_migration:
         acct: Sekcem isem n umseqdac@taγult n umiḍan anida itebγiḍ ad gujjeḍ
       admin_account_action:
@@ -15,7 +15,11 @@ kab:
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
+        locked: Isra asentem s wufus n ineḍfaren
         password: Seqdec ma drus 8 n yisekkilen
+        setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
+        setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
+        setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
         setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaγnu-inek
         username: Isem-ik n umseqdac ad yili d ayiwen, ulac am netta deg %{domain}
       featured_tag:
@@ -25,12 +29,19 @@ kab:
     labels:
       account:
         fields:
+          name: Tabzimt
           value: Agbur
       account_migration:
         acct: Tansa n umiḍan amaynut
       admin_account_action:
+        send_email_notification: Sileɣ aseqdac s imaylen
+        type: Tigawt
         types:
+          disable: Sens anekcum
+          none: Ur teg kra
           silence: Sgugem
+      announcement:
+        ends_at: Tagara n tedyant
       defaults:
         bot: Wagi d amiḍan aṛubut
         chosen_languages: Sizdeg tutlayin
@@ -43,7 +54,10 @@ kab:
         email: Tansa imayl
         header: Ixef
         locale: Tutlayt n ugrudem
+        locked: Rgel amiḍan
+        max_uses: Amḍan afellay n iseqdacen
         new_password: Awal uffir amaynut
+        otp_attempt: Tangalt n snat n tarayin
         password: Awal uffir
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
@@ -52,6 +66,7 @@ kab:
         setting_display_media_show_all: Sken kullec
         setting_hide_network: Ffer azetta-k·m
         setting_theme: Asental n wesmel
+        setting_use_pending_items: Askar aleγwayan
         username: Isem n useqdac
         username_or_email: Isem n useqdac neγ imal
         whole_word: Awal akk
@@ -61,7 +76,10 @@ kab:
         comment: Awennit
       invite_request:
         text: Acimi tebγiḍ ad ternuḍ iman-ik?
+      tag:
+        name: Ahacṭag
     'no': Ala
+    recommended: Yettuwelleh
     required:
       mark: "*"
       text: ilaq
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 028aa59d9..0bf46b0ff 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -8,6 +8,7 @@ ko:
         acct: 이동하고자 하는 목적지 계정의 사용자이름@도메인을 설정하세요
       account_warning_preset:
         text: URL, 해시태그, 멘션과 같은 툿 문법을 사용할 수 있습니다
+        title: 선택사항. 수신자에게는 보이지 않습니다
       admin_account_action:
         include_statuses: 사용자는 어떤 툿에 대해 경고나 조치가 취해졌는지 볼 수 있게 됩니다
         send_email_notification: 유저는 어떤 일이 일어났는 지에 대한 설명을 받게 됩니다
@@ -53,6 +54,9 @@ ko:
         whole_word: 키워드가 영문과 숫자로만 이루어 진 경우, 단어 전체에 매칭 되었을 때에만 작동하게 합니다
       domain_allow:
         domain: 이 도메인은 이 서버에서 데이터를 가져갈 수 있고 이 도메인에서 보내진 데이터는 처리되고 저장 됩니다
+      email_domain_block:
+        domain: 이것은 이메일 주소에 보이는 도메인 네임이거나, 도메인이 향하는 MX 레코드이거나, 또는 MX 레코드가 향하는 IP 주소일 수 있습니다. 이것들은 사용자가 가입 할 때 확인 되며 가입은 반려될 것입니다.
+        with_dns_records: 입력한 도메인의 DNS를 조회를 시도하여 나온 값도 차단됩니다
       featured_tag:
         name: '이것들을 사용하면 좋을 것 같습니다:'
       form_challenge:
@@ -78,6 +82,7 @@ ko:
         acct: 새 계정의 핸들
       account_warning_preset:
         text: 프리셋 텍스트
+        title: 제목
       admin_account_action:
         include_statuses: 신고된 툿을 이메일에 포함
         send_email_notification: 이메일로 유저에게 알리기
@@ -150,6 +155,8 @@ ko:
         username: 유저 이름
         username_or_email: 유저네임 또는 이메일
         whole_word: 단어 전체에 매칭
+      email_domain_block:
+        with_dns_records: 도메인의 IP와 MX 레코드 값을 포함
       featured_tag:
         name: 해시태그
       interactions:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index ec6ba52eb..c65608d95 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -43,7 +43,7 @@ nl:
         setting_default_sensitive: Gevoelige media wordt standaard verborgen en kan met één klik worden getoond
         setting_display_media_default: Als gevoelig gemarkeerde media verbergen
         setting_display_media_hide_all: Media altijd verbergen
-        setting_display_media_show_all: Als gevoelig gemarkeerde media altijd verbergen
+        setting_display_media_show_all: Media altijd tonen
         setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
         setting_noindex: Heeft invloed op jouw openbare profiel en toots
         setting_show_application: De toepassing de je gebruikt om te tooten wordt in de gedetailleerde weergave van de toot getoond
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index b7495c56d..f1daa0e6e 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -8,6 +8,7 @@ oc:
         acct: Donatz l’utilizaire@domeni del compte ont volètz anar
       account_warning_preset:
         text: Podètz utilizar la sintaxi dels tuts, coma las URL, las etiquetas e las mencions
+        title: Opcional. Pas visible pel destinari
       admin_account_action:
         include_statuses: L’utilizaire veiràs quals tuts a provocat l’accion de moderacion o avertiment
         send_email_notification: L’utilizaire recebrà una explicacion de çò qu’arribèt a son compte
@@ -78,6 +79,7 @@ oc:
         acct: Identificant del nòu compte
       account_warning_preset:
         text: Tèxt predefinit
+        title: Títol
       admin_account_action:
         include_statuses: Inclure los tuts senhalats dins lo corrièl
         send_email_notification: Avisar l’utilizaire per corrièl
@@ -150,6 +152,8 @@ oc:
         username: Nom d’utilizaire
         username_or_email: Nom d’utilizaire o corrièl
         whole_word: Mot complèt
+      email_domain_block:
+        with_dns_records: Inclure los enregistraments MX e las IP del domeni
       featured_tag:
         name: Etiqueta
       interactions:
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index e8e2251b0..77d02cf17 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -2,19 +2,34 @@
 pl:
   simple_form:
     hints:
+      account_alias:
+        acct: Określ nazwę@domenę konta z którego chcesz się przenieść
+      account_migration:
+        acct: Określ nazwę@domenę konta na które chcesz się przenieść
       account_warning_preset:
         text: Możesz korzystać ze składni której używasz we wpisach, takiej jak adresy URL, hashtagi i wspomnienia
+        title: Nieobowiązkowe. Niewidoczne dla odbiorcy
       admin_account_action:
+        include_statuses: Użytkownik zobaczy, których wpisów dotyczyło działanie moderacji lub ostrzeżenie
         send_email_notification: Użytkownik otrzyma informację, co stało się z jego kontem
         text_html: Możesz używać składni której używasz we wpisach. Możesz <a href="%{path}">dodać szablon ostrzeżenia</a> aby zaoszczędzić czas
         type_html: Wybierz co chcesz zrobić z <strong>%{acct}</strong>
         warning_preset_id: Nieobowiązkowe. Możesz dodać niestandardowy tekst do końcowki szablonu
+      announcement:
+        all_day: Jeżeli zaznaczone, tylko daty z przedziału czasu będą wyświetlane
+        ends_at: Nieobowiązkowe. Ogłoszenie zostanie automatycznie wycofane w tym czasie
+        scheduled_at: Pozostaw puste, aby opublikować ogłoszenie natychmiastowo
+        starts_at: Nieobowiązkowe. Jeżeli ogłoszenie jest związane z danym przedziałem czasu
+        text: Możesz używać składni wpisu. Pamiętaj o tym, ile miejsca zajmie ogłoszenie na ekranie użytkownika
       defaults:
         autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić
         avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany
+        current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
+        current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
+        discoverable: Katalog profilu jest jednym ze sposobów, dzięki którym Twoje konto dotrze do szerszego grona
         email: Otrzymasz e-mail potwierdzający
         fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
         header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
@@ -34,8 +49,14 @@ pl:
         setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
         setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany
         setting_use_blurhash: Gradienty są oparte na kolorach ukrywanej zawartości, ale uniewidaczniają wszystkie szczegóły
+        setting_use_pending_items: Ukryj aktualizacje osi czasu za kliknięciem, zamiast automatycznego przewijania strumienia
         username: Twoja nazwa użytkownika będzie niepowtarzalna na %{domain}
         whole_word: Jeśli słowo lub fraza składa się jedynie z liter lub cyfr, filtr będzie zastosowany tylko do pełnych wystąpień
+      domain_allow:
+        domain: Ta domena będzie mogła pobierać dane z serwera, a dane przychodzące z niej będą przetwarzane i przechowywane
+      email_domain_block:
+        domain: Może to być nazwa domeny pojawiająca się w adresu e-mail, rekord MX na który rozwiązuje domena lub IP serwera na który rozwiązuje rekord MX. Będą one wykrywane i odrzucane przy rejestracji.
+        with_dns_records: Zostanie wykonana próba rozwiązania rekordów DNS podanej domeny, a wyniki również zostaną dodane na czarną listę
       featured_tag:
         name: 'Sugerujemy użycie jednego z następujących:'
       form_challenge:
@@ -61,6 +82,7 @@ pl:
         acct: Nazwa nowego konta
       account_warning_preset:
         text: Tekst szablonu
+        title: Tytuł
       admin_account_action:
         include_statuses: Uwzględniaj zgłoszone wpisy w wiadomości e-mail
         send_email_notification: Powiadom użytkownika mailem
@@ -133,6 +155,8 @@ pl:
         username: Nazwa użytkownika
         username_or_email: Nazwa użytkownika lub adres e-mail
         whole_word: Całe słowo
+      email_domain_block:
+        with_dns_records: Uwzględnij rekordy MX i adresy IP domeny
       featured_tag:
         name: Hasztag
       interactions:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 503b48d83..1f72f278d 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -8,6 +8,7 @@ pt-BR:
         acct: Especifique o usuário@domínio da conta para a qual você deseja se mudar
       account_warning_preset:
         text: Você pode usar a sintaxe do toot, como links, hashtags e menções
+        title: Opcional. Não visível para o destinatário
       admin_account_action:
         include_statuses: O usuário verá quais toots causaram o aviso ou ação da moderação
         send_email_notification: O usuário receberá uma explicação do que aconteceu com a própria conta
@@ -15,7 +16,7 @@ pt-BR:
         type_html: Decida o que fazer com <strong>%{acct}</strong>
         warning_preset_id: Opcional. Você ainda pode adicionar texto personalizado no final do aviso pré-definido
       announcement:
-        all_day: Quando marcado, apenas as datas do período serão exibidas
+        all_day: Quando marcada, apenas as datas do período serão mostradas
         ends_at: Opcional. O anúncio será automaticamente não publicado no momento
         scheduled_at: Deixe em branco para publicar o anúncio imediatamente
         starts_at: Opcional. Caso seu anúncio esteja vinculado a um período específico
@@ -53,6 +54,9 @@ pt-BR:
         whole_word: Quando a palavra-chave ou frase é inteiramente alfanumérica, ela será aplicada somente se corresponder a palavra inteira
       domain_allow:
         domain: Este domínio poderá obter dados deste servidor e os dados recebidos dele serão processados e armazenados
+      email_domain_block:
+        domain: Este pode ser o nome de domínio que aparece no endereço de email, o registro MX para o qual o domínio resolve, ou o IP do servidor para o qual o registro MX resolve. Estes serão verificados no momento da inscrição do usuário e a inscrição será rejeitada.
+        with_dns_records: Será feita uma tentativa de resolver os registros DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
         name: 'Você pode querer usar um destes:'
       form_challenge:
@@ -78,6 +82,7 @@ pt-BR:
         acct: Nome de usuário da nova conta
       account_warning_preset:
         text: Aviso pré-definido
+        title: Título
       admin_account_action:
         include_statuses: Incluir toots denunciados no e-mail
         send_email_notification: Notificar o usuário por e-mail
@@ -150,6 +155,8 @@ pt-BR:
         username: Nome de usuário
         username_or_email: Nome de usuário ou e-mail
         whole_word: Palavra inteira
+      email_domain_block:
+        with_dns_records: Incluir registros MX e IPs do domínio
       featured_tag:
         name: Hashtag
       interactions:
@@ -169,11 +176,11 @@ pt-BR:
         pending_account: Enviar e-mail quando uma nova conta precisar ser revisada
         reblog: Enviar e-mail quando alguém der boost nos seus toots
         report: Enviar e-mail quando uma nova denúncia for enviada
-        trending_tag: Enviar e-mail quando uma hashtag não revisada estiver em alta
+        trending_tag: Uma hashtag não-revisada está em alta
       tag:
         listable: Permitir que esta hashtag apareça em pesquisas e no diretório de perfis
         name: Hashtag
-        trendable: Permitir que esta hashtag apareça em alta
+        trendable: Permitir que esta hashtag fique em alta
         usable: Permitir que toots usem esta hashtag
     'no': Não
     recommended: Recomendado
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index f346005f7..3bec60f38 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -8,6 +8,7 @@ pt-PT:
         acct: Especifique o nome de usuário@domínio da conta para onde você deseja mover
       account_warning_preset:
         text: Tu podes usar sintaxe de escrita, como URLs, hashtags e referências
+        title: Opcional. Não visível para o destinatário
       admin_account_action:
         include_statuses: O usuário verá quais ferramentas causaram a ação de moderação ou aviso
         send_email_notification: O utilizador receberá uma explicação sobre o que aconteceu com a sua conta
@@ -41,9 +42,9 @@ pt-PT:
         scopes: Quais as APIs a que será concedido acesso. Se escolheres uma abrangência de nível superior, não precisarás de as seleccionar individualmente.
         setting_aggregate_reblogs: Não mostrar novas partilhas que foram partilhadas recentemente (só afecta as novas partilhas)
         setting_default_sensitive: Média sensível está oculta por padrão e pode ser revelada com um clique
-        setting_display_media_default: Esconder media marcada como sensível
-        setting_display_media_hide_all: Esconder sempre toda a media
-        setting_display_media_show_all: Mostrar sempre a media marcada como sensível
+        setting_display_media_default: Esconder média marcada como sensível
+        setting_display_media_hide_all: Esconder sempre toda a média
+        setting_display_media_show_all: Mostrar sempre a média marcada como sensível
         setting_hide_network: Quem tu segues e quem te segue não será mostrado no teu perfil
         setting_noindex: Afecta o teu perfil público e as páginas das tuas publicações
         setting_show_application: A aplicação que tu usas para publicar será mostrada na vista detalhada das tuas publicações
@@ -53,6 +54,9 @@ pt-PT:
         whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
       domain_allow:
         domain: Este domínio será capaz de obter dados deste servidor e os dados dele recebidos serão processados e armazenados
+      email_domain_block:
+        domain: Este pode ser o nome de domínio que aparece no endereço de email, o registro MX para o qual o domínio resolve, ou o IP do servidor para o qual o registro MX resolve. Estes serão verificados no momento da inscrição do utilizador e a inscrição será rejeitada.
+        with_dns_records: Será feita uma tentativa de resolver os registros DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
         name: 'Poderás querer usar um destes:'
       form_challenge:
@@ -78,6 +82,7 @@ pt-PT:
         acct: Nome de utilizador da nova conta
       account_warning_preset:
         text: Texto pré-definido
+        title: Título
       admin_account_action:
         include_statuses: Incluir no e-mail os toots reportados
         send_email_notification: Notificar o utilizador por e-mail
@@ -128,9 +133,9 @@ pt-PT:
         setting_crop_images: Cortar imagens em toots não expandidos para o formato 16x9
         setting_default_language: Língua de publicação
         setting_default_privacy: Privacidade da publicação
-        setting_default_sensitive: Sempre marcar media como sensível
+        setting_default_sensitive: Sempre marcar média como sensível
         setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
-        setting_display_media: Exposição de media
+        setting_display_media: Exposição de média
         setting_display_media_default: Pré-definição
         setting_display_media_hide_all: Esconder todos
         setting_display_media_show_all: Mostrar todos
@@ -150,6 +155,8 @@ pt-PT:
         username: Nome de utilizador
         username_or_email: Nome de utilizador ou e-mail
         whole_word: Palavra completa
+      email_domain_block:
+        with_dns_records: Incluir registros MX e IPs do domínio
       featured_tag:
         name: Hashtag
       interactions:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 0ec9d0d6b..7bc585c64 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -8,6 +8,7 @@ ru:
         acct: Укажите имя_пользователя@домен учётной записи, на которую вы собираетесь мигрировать
       account_warning_preset:
         text: Вы можете использовать всё, что в обычных постах — ссылки, хэштеги, упоминания и т.д.
+        title: Необязательно. Не видно получателю
       admin_account_action:
         include_statuses: Пользователь будет видеть к каким постами применялись модераторские действия и выносились предупреждения
         send_email_notification: Пользователь получит сообщение о том, что случилось с его/её учётной записью
@@ -53,6 +54,9 @@ ru:
         whole_word: Если слово или фраза состоит только из букв и цифр, сопоставление произойдёт только по полному совпадению
       domain_allow:
         domain: Этот домен сможет получать данные с этого сервера и его входящие данные будут обрабатываться и сохранены
+      email_domain_block:
+        domain: Это может быть домен, отображаемый в адресе электронной почты, MX-запись, на которую разрешается домен или IP сервера, на который разрешается MX-запись. Они будут проверены при регистрации пользователя, и регистрация будет отклонена.
+        with_dns_records: Будет сделана попытка разрешить DNS-записи данного домена и результаты также будут внесены в чёрный список
       featured_tag:
         name: 'Возможно, вы захотите добавить что-то из этого:'
       form_challenge:
@@ -78,6 +82,7 @@ ru:
         acct: Имя новой учётной записи
       account_warning_preset:
         text: Текст шаблона
+        title: Заголовок
       admin_account_action:
         include_statuses: Включать в письмо жалобы на посты
         send_email_notification: Уведомить пользователя по e-mail
@@ -118,7 +123,7 @@ ru:
         max_uses: Максимальное число использований
         new_password: Новый пароль
         note: О себе
-        otp_attempt: Двухфакторный код
+        otp_attempt: Код из приложения-аутентификатора
         password: Пароль
         phrase: Слово или фраза
         setting_advanced_layout: Включить многоколоночный интерфейс
@@ -150,6 +155,8 @@ ru:
         username: Имя пользователя
         username_or_email: Имя пользователя или e-mail
         whole_word: Слово целиком
+      email_domain_block:
+        with_dns_records: Включить MX-записи и IP-адреса домена
       featured_tag:
         name: Хэштег
       interactions:
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index c10df08d0..9e03d7254 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -72,6 +72,7 @@ sk:
         acct: Adresa nového účtu
       account_warning_preset:
         text: Text predlohy
+        title: Názov
       admin_account_action:
         include_statuses: Zahrnúť nahlásené príspevky v emaile
         send_email_notification: Oznam užívateľovi cez email
@@ -83,6 +84,11 @@ sk:
           silence: Utíš
           suspend: Vylúč a nenávratne vymaž dáta na účte
         warning_preset_id: Použi varovnú predlohu
+      announcement:
+        all_day: Celodenná udalosť
+        ends_at: Koniec udalosti
+        starts_at: Začiatok udalosti
+        text: Oboznámenie
       defaults:
         autofollow: Pozvi k následovaniu tvojho profilu
         avatar: Maskot
@@ -141,7 +147,7 @@ sk:
       featured_tag:
         name: Haštag
       interactions:
-        must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenásledujú
+        must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenasledujú
         must_be_following: Blokuj oboznámenia od ľudí, ktorých nesledujem
         must_be_following_dm: Blokuj priame správy od ľudí, ktorých nesleduješ
       invite:
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index de0a14bd7..80b699c28 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -8,6 +8,7 @@ sv:
         acct: Ange användarnamn@domän för kontot du flyttar till
       account_warning_preset:
         text: Du kan använda inläggssyntax som webbadresser, hashtaggar och omnämnanden
+        title: Valfri. Inte synlig för mottagaren
       admin_account_action:
         include_statuses: Användaren ser de toots som orsakat moderering eller varning
         send_email_notification: Användaren kommer att få en förklaring av vad som hände med sitt konto
@@ -45,6 +46,8 @@ sv:
         fields:
           name: Etikett
           value: Innehåll
+      account_warning_preset:
+        title: Rubrik
       admin_account_action:
         types:
           none: Gör ingenting
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index bac29f158..74c641901 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -6,6 +6,8 @@ ta:
         acct: நீங்கள் இங்கே நகர்த்த விரும்பும் கணக்கின் பயனர் பெயர்
       account_migration:
         acct: நீங்கள் இங்கே நகர்த்த விரும்பும் கணக்கின் பயனர் பெயர் username@domain
+      account_warning_preset:
+        title: விருப்பத் தேர்வு. பெறுநரால் பார்க்கமுடியாது
       admin_account_action:
         send_email_notification: தங்கள் கணக்கிற்கு என்ன நேர்ந்தது என்ற விவரம் பயனரால் பெறப்படும்
       announcement:
@@ -23,10 +25,15 @@ ta:
         password: குறைந்தது 8 எழுத்துக்களைப் பயன்படுத்தவும்
         setting_display_media_hide_all: எப்போதும் எல்லா ஊடகங்களையும் மறைக்கவும்
         setting_display_media_show_all: உணர்ச்சி வயப்படு (Sensitive) குறிக்கப்பட்ட மீடியாவை எப்போதும் காட்டுங்கள்
+      email_domain_block:
+        domain: இது மின்னஞ்சலில் காணப்படும் களத்தின் பெயராக இருக்கலாம், அல்லது அக்களம் சார்ந்திருக்கும் MX record-ஆக இருக்கலாம், அல்லது அந்த MX record சார்ந்திருக்கும் சர்வரின் IP முகவரியாக இருக்கலாம். பயனர் கணக்கைத் துவங்கும்போது அவை கண்காணிக்கப்பட்டு, கணக்குத் துவக்கம் நிராகரிக்கப்படும்.
+        with_dns_records: இக்களத்தின் DNS record-களை சரிசெய்யும் முயற்சி மேற்கொள்ளப்படும், மற்றும் அதன் முடிவுகள் தடுப்புப்பட்டியலில் சேர்க்கப்படும்
     labels:
       account:
         fields:
           name: லேபிள்
+      account_warning_preset:
+        title: தலைப்பு
       admin_account_action:
         types:
           disable: உள்நுழைவை முடக்கு
@@ -59,6 +66,8 @@ ta:
         setting_use_pending_items: மெதுவான பயன்முறை
         username: பயனர்பெயர்
         username_or_email: பயனர் பெயர் அல்லது மின்னஞ்சல்
+      email_domain_block:
+        with_dns_records: களத்தின் IP மற்றும் MX records-ஐ உள்ளடக்கு
     required:
       text: தேவை
     'yes': ஆம்
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 33a255e8d..22a2647a3 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -8,6 +8,7 @@ th:
         acct: ระบุ username@domain ของบัญชีที่คุณต้องการย้ายไป
       account_warning_preset:
         text: คุณสามารถใช้ไวยากรณ์โพสต์ เช่น URL, แฮชแท็ก และการกล่าวถึง
+        title: ตัวเลือกเพิ่มเติม ไม่ปรากฏแก่ผู้รับ
       admin_account_action:
         include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการควบคุมหรือคำเตือน
         send_email_notification: ผู้ใช้จะได้รับคำอธิบายว่าเกิดอะไรขึ้นกับบัญชีของเขา
@@ -42,8 +43,8 @@ th:
         setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น)
         setting_default_sensitive: ซ่อนสื่อที่ละเอียดอ่อนโดยค่าเริ่มต้นและสามารถเปิดเผยได้ด้วยการคลิก
         setting_display_media_default: ซ่อนสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อน
-        setting_display_media_hide_all: ซ่อนสื่อทั้งหมดเสมอ
-        setting_display_media_show_all: แสดงสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อนเสมอ
+        setting_display_media_hide_all: ซ่อนสื่อเสมอ
+        setting_display_media_show_all: แสดงสื่อเสมอ
         setting_hide_network: จะไม่แสดงผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ
         setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าสถานะของคุณ
         setting_show_application: จะแสดงแอปพลิเคชันที่คุณใช้เพื่อโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ
@@ -78,6 +79,7 @@ th:
         acct: การจัดการบัญชีใหม่
       account_warning_preset:
         text: ข้อความที่ตั้งไว้ล่วงหน้า
+        title: ชื่อเรื่อง
       admin_account_action:
         include_statuses: รวมโพสต์ที่รายงานไว้ในอีเมล
         send_email_notification: แจ้งเตือนผู้ใช้ทางอีเมล
@@ -86,7 +88,7 @@ th:
         types:
           disable: ปิดใช้งานการเข้าสู่ระบบ
           none: ไม่ทำสิ่งใด
-          silence: เงียบ
+          silence: ทำให้เงียบ
           suspend: ระงับและลบข้อมูลบัญชีอย่างถาวร
         warning_preset_id: ใช้คำเตือนที่ตั้งไว้ล่วงหน้า
       announcement:
@@ -126,8 +128,8 @@ th:
         setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
         setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
         setting_crop_images: ครอบตัดภาพในโพสต์ที่ไม่ได้ขยายเป็น 16x9
-        setting_default_language: ภาษาที่โพสต์
-        setting_default_privacy: ความเป็นส่วนตัวของโพสต์
+        setting_default_language: ภาษาของการโพสต์
+        setting_default_privacy: ความเป็นส่วนตัวของการโพสต์
         setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
         setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
         setting_display_media: การแสดงสื่อ
@@ -150,6 +152,8 @@ th:
         username: ชื่อผู้ใช้
         username_or_email: ชื่อผู้ใช้หรืออีเมล
         whole_word: ทั้งคำ
+      email_domain_block:
+        with_dns_records: รวมระเบียน MX และ IP ของโดเมน
       featured_tag:
         name: แฮชแท็ก
       interactions:
@@ -166,10 +170,10 @@ th:
         follow: ใครสักคนได้ติดตามคุณ
         follow_request: ใครสักคนได้ขอติดตามคุณ
         mention: ใครสักคนได้กล่าวถึงคุณ
-        pending_account: ส่งอีเมลเมื่อบัญชีใหม่ต้องการการตรวจทาน
+        pending_account: บัญชีใหม่ต้องมีการตรวจทาน
         reblog: ใครสักคนได้ดันสถานะของคุณ
-        report: ส่งอีเมลเมื่อมีการส่งรายงานใหม่
-        trending_tag: ส่งอีเมลเมื่อแฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม
+        report: มีการส่งรายงานใหม่
+        trending_tag: แฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม
       tag:
         listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและในไดเรกทอรีโปรไฟล์
         name: แฮชแท็ก
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 1a7b7de99..a617df62e 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -8,6 +8,7 @@ zh-CN:
         acct: 指定你想迁移过去的帐号的 用户名@站点域名
       account_warning_preset:
         text: 你可以使用嘟文格式，在嘟文中加入 URL、话题标签和提及“@”
+        title: 可选。对接收者不可见
       admin_account_action:
         include_statuses: 用户将会看到哪些嘟文导致了审核行为或警告
         send_email_notification: 用户将收到对其账号上发生的事的解释
@@ -53,6 +54,9 @@ zh-CN:
         whole_word: 如果关键词只包含字母和数字，就只会在整个词被匹配时才会套用
       domain_allow:
         domain: 该站点将能够从该服务器上拉取数据，并且从那里发过来的数据也会被处理和存储。
+      email_domain_block:
+        domain: 这里可以是邮箱地址中的域名部分、域名解析到的 MX 记录，或者 MX 记录解析到的域名。这些检查会在用户注册时进行，如果在黑名单中，那么注册会被拒绝。
+        with_dns_records: Mastodon 会尝试解析所给域名的 DNS 记录，然后把解析结果一并加入黑名单
       featured_tag:
         name: 你可能想要使用以下之一：
       form_challenge:
@@ -78,6 +82,7 @@ zh-CN:
         acct: 处理新账号
       account_warning_preset:
         text: 预置文本
+        title: 标题
       admin_account_action:
         include_statuses: 在电子邮件中包括已举报的嘟文
         send_email_notification: 通过邮件提醒此用户
@@ -150,6 +155,8 @@ zh-CN:
         username: 用户名
         username_or_email: 用户名或电子邮件地址
         whole_word: 整个词条
+      email_domain_block:
+        with_dns_records: 包括改域名的 MX 记录和 IP 地址
       featured_tag:
         name: 话题标签
       interactions:
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 235d9c764..57befb139 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -13,11 +13,16 @@ zh-HK:
         text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
+      announcement:
+        all_day: 核取後，只會顯示出時間範圍中的日期部分
+        scheduled_at: 空白則立即發布公告
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
         bot: 提醒用戶本帳號是機械人
         context: 應該套用過濾器的一項或多項內容
+        current_password: 因安全因素，請輸入目前帳戶的密碼
+        current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
         email: 您將收到一封確認電子郵件
         fields: 個人資料頁可顯示多至 4 個項目
@@ -30,6 +35,7 @@ zh-HK:
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
+        setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
@@ -40,10 +46,16 @@ zh-HK:
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
       featured_tag:
         name: 您可能想使用其中一個：
+      form_challenge:
+        current_password: 您正要進入安全區域
       imports:
         data: 自其他服務站匯出的 CSV 檔案
+      invite_request:
+        text: 這會協助我們審核您的應用程式
       sessions:
         otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼：
+      tag:
+        name: 您只能變更大小寫，例如，以使其更易讀。
       user:
         chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
     labels:
@@ -54,6 +66,7 @@ zh-HK:
       account_warning_preset:
         text: 預設文字
       admin_account_action:
+        include_statuses: 在電子郵件中加入檢舉的嘟文
         send_email_notification: 透過電子信件通知使用者
         text: 自訂警告
         type: 動作
@@ -63,6 +76,12 @@ zh-HK:
           silence: 安靜
           suspend: 停權並不可逆的刪除帳戶資料
         warning_preset_id: 使用警告預設
+      announcement:
+        all_day: 全天活動
+        ends_at: 活動結束時間
+        scheduled_at: 排程發佈
+        starts_at: 活動開始時間
+        text: 公告
       defaults:
         autofollow: 邀請別人關注你的賬號
         avatar: 個人頭像
@@ -89,6 +108,7 @@ zh-HK:
         otp_attempt: 雙重認證碼
         password: 密碼
         phrase: 關鍵字或片語
+        setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉嘟
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
@@ -107,7 +127,9 @@ zh-HK:
         setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 網站主題
+        setting_trends: 顯示本日趨勢
         setting_unfollow_modal: 取消關注前跳出詢問我
+        setting_use_pending_items: 限速模式
         severity: 等級
         type: 匯入資料類型
         username: 用戶名稱
@@ -119,15 +141,26 @@ zh-HK:
         must_be_follower: 隱藏沒有關注你的用戶的通知
         must_be_following: 隱藏你不關注的用戶的通知
         must_be_following_dm: 隱藏你不關注的用戶的私信
+      invite:
+        comment: 備註
+      invite_request:
+        text: 加入的原因
       notification_emails:
         digest: 定期電郵摘要
         favourite: 當有用戶喜歡你的文章時，發電郵通知
         follow: 當有用戶關注你時，發電郵通知
         follow_request: 當有用戶要求關注你時，發電郵通知
         mention: 當有用戶在文章提及你時，發電郵通知
+        pending_account: 需要審核的新帳戶
         reblog: 當有用戶轉推你的文章時，發電郵通知
         report: 當提交新檢舉時傳送電子郵件
+      tag:
+        listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
+        name: 主題標籤
+        trendable: 允許此主題標籤在趨勢下顯示
+        usable: 允許嘟文使用此主題標籤
     'no': 否
+    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 7de349ee3..6efebbe6d 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -13,11 +13,16 @@ zh-TW:
         text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
+      announcement:
+        all_day: 核取後，只會顯示出時間範圍中的日期部分
+        scheduled_at: 空白則立即發布公告
       defaults:
         autofollow: 通過邀請網址註冊的使用者將自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會等比例縮減成 %{dimensions} 像素
         bot: 此帳戶主要執行自動操作且可能未被監控
         context: 應該套用過濾器的一項或多項內容
+        current_password: 因安全因素，請輸入目前帳戶的密碼
+        current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登入且在未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
         fields: 您可在個人資料上有至多 4 個以表格形式顯示的項目
@@ -30,6 +35,7 @@ zh-TW:
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
+        setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
@@ -40,10 +46,16 @@ zh-TW:
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
       featured_tag:
         name: 您可能想使用其中一個：
+      form_challenge:
+        current_password: 您正要進入安全區域
       imports:
         data: 從其他 Mastodon 伺服器匯出的 CSV 檔案
+      invite_request:
+        text: 這會協助我們審核您的應用程式
       sessions:
         otp: 請輸入產生自您手機 App 的兩步驟驗證碼，或輸入其中一個復原代碼：
+      tag:
+        name: 您只能變更大小寫，例如，以使其更易讀。
       user:
         chosen_languages: 當核取時，只有選取語言的嘟文會在公開時間軸中顯示
     labels:
@@ -54,6 +66,7 @@ zh-TW:
       account_warning_preset:
         text: 預設文字
       admin_account_action:
+        include_statuses: 在電子郵件中加入檢舉的嘟文
         send_email_notification: 透過電子信件通知使用者
         text: 自訂警告
         type: 動作
@@ -63,6 +76,12 @@ zh-TW:
           silence: 安靜
           suspend: 停權並不可逆的刪除帳戶資料
         warning_preset_id: 使用警告預設
+      announcement:
+        all_day: 全天活動
+        ends_at: 活動結束時間
+        scheduled_at: 排程發佈
+        starts_at: 活動開始時間
+        text: 公告
       defaults:
         autofollow: 邀請別人關注你的帳戶
         avatar: 大頭貼
@@ -89,6 +108,7 @@ zh-TW:
         otp_attempt: 兩步驟驗證碼
         password: 密碼
         phrase: 關鍵字或片語
+        setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉嘟
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 在轉嘟前先詢問我
@@ -107,7 +127,9 @@ zh-TW:
         setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 站點主題
+        setting_trends: 顯示本日趨勢
         setting_unfollow_modal: 取消關注某人前先詢問我
+        setting_use_pending_items: 限速模式
         severity: 優先級
         type: 匯入類型
         username: 使用者名稱
@@ -119,15 +141,26 @@ zh-TW:
         must_be_follower: 封鎖非關注者的通知
         must_be_following: 封鎖您未關注之使用者的通知
         must_be_following_dm: 封鎖您未關注之使用者的私訊
+      invite:
+        comment: 備註
+      invite_request:
+        text: 加入的原因
       notification_emails:
         digest: 傳送摘要信件
         favourite: 當有使用者喜歡你的嘟文時，傳送電子信件通知
         follow: 當有使用者關注你時，傳送電子信件通知
         follow_request: 當有使用者請求關注你時，傳送電子信件通知
         mention: 當有使用者在嘟文提及你時，傳送電子信件通知
+        pending_account: 需要審核的新帳戶
         reblog: 當有使用者轉嘟你的嘟文時，傳送電子信件通知
         report: 當提交新檢舉時傳送電子郵件
+      tag:
+        listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
+        name: 主題標籤
+        trendable: 允許此主題標籤在趨勢下顯示
+        usable: 允許嘟文使用此主題標籤
     'no': 否
+    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index dbee6bb12..3a327c1d0 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -35,7 +35,7 @@ sk:
       one: príspevok
       other: príspevky
     status_count_before: Ktorí napísali
-    tagline: Následuj kamarátov, a objavuj nových
+    tagline: Nasleduj kamarátov, a objavuj nových
     terms: Podmienky užitia
     unavailable_content: Nedostupný obsah
     unavailable_content_description:
@@ -43,6 +43,7 @@ sk:
       reason: 'Dôvod:'
       rejecting_media: 'Mediálne súbory z týchto serverov nebudú spracované, alebo ukladané, a nebudú z nich zobrazované žiadne náhľady, vyžadujúc ručné prekliknutie priamo až k pôvodnému súboru:'
       silenced: 'Príspevky z týchto serverov budú skryté z verejných osí a z konverzácií, a nebudú vytvorené žiadné oboznámena ohľadom aktivity ich užívateľov, pokiaľ ich nenásleduješ:'
+    unavailable_content_html: Vo všeobecnosti, Mastodon ti dovoľuje vidieť obsah, a komunikovať s užívateľmi akéhokoľvek iného serveru v rámci fediversa. Toto sú výnimky, ktoré boli vytvorené na tomto konkrétnom serveri.
     user_count_after:
       few: užívateľov
       many: užívatelia
@@ -98,6 +99,7 @@ sk:
       delete: Vymaž
       destroyed_msg: Moderátorska poznámka bola úspešne zmazaná!
     accounts:
+      add_email_domain_block: Pridaj e-mailovú doménu na zoznam zakázaných
       approve: Schváľ
       approve_all: Schváľ všetky
       are_you_sure: Si si istý/á?
@@ -178,6 +180,7 @@ sk:
         staff: Člen
         user: Užívateľ
       search: Hľadaj
+      search_same_email_domain: Iní užívatelia s tou istou emailovou doménou
       search_same_ip: Ostatní užívatelia s rovnakou IP adresou
       shared_inbox_url: URL zdieľanej schránky
       show:
@@ -244,6 +247,8 @@ sk:
         create: Vytvor oznam
         title: Nové oznámenie
       published_msg: Oboznámenie úspešne zverejnené!
+      scheduled_for: Načasované na %{time}
+      scheduled_msg: Oboznámenie bolo naplánované na zverejnenie!
       title: Oboznámenia
     custom_emojis:
       assign_category: Priraď kategóriu
@@ -358,6 +363,7 @@ sk:
       destroyed_msg: Emailová doména bola úspešne vymazaná zo zoznamu zakázaných
       domain: Doména
       empty: Žiadné emailové domény niesú v súčasnosti na čiernej listine.
+      from_html: z %{domain}
       new:
         create: Pridaj doménu
         title: Nový email na zablokovanie
@@ -538,6 +544,9 @@ sk:
       trends:
         desc_html: Verejne zobraz už schválené haštagy, ktoré práve trendujú
         title: Populárne haštagy
+    site_uploads:
+      delete: Vymaž nahratý súbor
+      destroyed_msg: Nahratie bolo zo stránky úspešne vymazané!
     statuses:
       back_to_account: Späť na účet
       batch:
@@ -574,7 +583,6 @@ sk:
     warning_presets:
       add_new: Pridaj nové
       delete: Vymaž
-      edit: Uprav
       edit_preset: Uprav varovnú predlohu
       title: Spravuj varovné predlohy
   admin_mailer:
@@ -657,9 +665,9 @@ sk:
   authorize_follow:
     already_following: Tento účet už následuješ
     error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu
-    follow: Následuj
+    follow: Nasleduj
     follow_request: 'Poslal/a si žiadosť následovať užívateľa:'
-    following: 'Podarilo sa! Teraz už následuješ užívateľa:'
+    following: 'Podarilo sa! Teraz nasleduješ užívateľa:'
     post_follow:
       close: Alebo môžeš iba zatvoriť toto okno.
       return: Ukáž užívateľov profil
@@ -686,7 +694,7 @@ sk:
       x_seconds: "%{count}sek"
   deletes:
     challenge_not_passed: Údaje, ktoré si zadal/a, sú nesprávne
-    confirm_password: Napíšte svoje terajšie heslo pre overenie vašej identity
+    confirm_password: Napíš svoje terajšie heslo pre overenie tvojej identity
     confirm_username: Zadaj svoju prezývku, na potvrdenie úkonu
     proceed: Vymaž účet
     success_msg: Tvoj účet bol úspešne vymazaný
@@ -745,6 +753,7 @@ sk:
       limit: Už si si predvolil/a najvyšší možný počet obľúbených haštagov
   filters:
     contexts:
+      account: Profily
       home: Domáca os
       notifications: Oznámenia
       public: Verejné osi
@@ -769,6 +778,7 @@ sk:
     all: Všetko
     changes_saved_msg: Zmeny boli úspešne uložené!
     copy: Kopíruj
+    delete: Vymaž
     no_batch_actions_available: Na tejto stránke niesú k dispozícii žiadne hromadné akcie
     order_by: Zoraď podľa
     save_changes: Ulož zmeny
@@ -899,7 +909,7 @@ sk:
       title: Nové obľúbené
     follow:
       body: "%{name} ťa teraz následuje!"
-      subject: "%{name} ťa teraz následuje"
+      subject: "%{name} ťa teraz nasleduje"
       title: Nový sledovateľ
     follow_request:
       action: Spravuj žiadosti o sledovanie
@@ -939,6 +949,10 @@ sk:
     other: Ostatné
     posting_defaults: Východiskové nastavenia príspevkov
     public_timelines: Verejné časové osi
+  reactions:
+    errors:
+      limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
+      unrecognized_emoji: je neznámy smajlík
   relationships:
     activity: Aktivita účtu
     dormant: Spiace
@@ -1046,6 +1060,8 @@ sk:
       many: 'obsah nepovolených haštagov: %{tags}'
       one: 'obsahoval nepovolený haštag: %{tags}'
       other: 'obsahoval nepovolené haštagy: %{tags}'
+    errors:
+      in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, už pravdepodobne neexistuje.
     language_detection: Zisti automaticky
     open_in_web: Otvor v okne na webe
     over_character_limit: limit %{max} znakov bol presiahnutý
@@ -1067,6 +1083,7 @@ sk:
         other: "%{count} hlasy"
       vote: Hlasuj
     show_more: Ukáž viac
+    show_thread: Ukáž diskusné vlákno
     sign_in_to_participate: Prihlás sa pre zapojenie do diskusie
     title: '%{name}: „%{quote}"'
     visibilities:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index afb928f11..91720c602 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -485,7 +485,6 @@ sl:
     warning_presets:
       add_new: Dodaj novo
       delete: Izbriši
-      edit: Uredi
       edit_preset: Uredi prednastavitev opozoril
       title: Upravljaj prednastavitev opozoril
   admin_mailer:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 6a7a945c4..0e20902ff 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -415,7 +415,6 @@ sq:
     warning_presets:
       add_new: Shtoni të ri
       delete: Fshije
-      edit: Përpunoni
       edit_preset: Përpunoni sinjalizim të paracaktuar
       title: Administroni sinjalizime të paracaktuara
   admin_mailer:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c68681215..d7fb6f74d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -431,7 +431,6 @@ sr:
     warning_presets:
       add_new: Додај нови
       delete: Избриши
-      edit: Уреди
       edit_preset: Уреди пресет упозорења
       title: Управљај пресетима упозорења
   admin_mailer:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0094ff06b..3f06878f8 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -219,6 +219,8 @@ sv:
         update_status: "%{name} uppdaterade status för %{target}"
       deleted_status: "(raderad status)"
       title: Revisionslogg
+    announcements:
+      scheduled_for: Schemalagd för %{time}
     custom_emojis:
       assign_category: Ange kategori
       by_domain: Domän
@@ -430,6 +432,8 @@ sv:
         desc_html: Visa offentlig tidslinje på landingsidan
         title: Förhandsgranska tidslinje
       title: Sidans inställningar
+    site_uploads:
+      delete: Radera uppladdad fil
     statuses:
       back_to_account: Tillbaka till kontosidan
       batch:
@@ -448,7 +452,6 @@ sv:
     warning_presets:
       add_new: Lägg till ny
       delete: Radera
-      edit: Redigera
   admin_mailer:
     new_report:
       body: "%{reporter} har rapporterat %{target}"
@@ -505,6 +508,7 @@ sv:
       account_status: Kontostatus
   authorize_follow:
     already_following: Du följer redan detta konto
+    already_requested: Du har redan skickat en vänförfrågan till det kontot
     error: Tyvärr inträffade ett fel när vi kontrollerade fjärrkontot
     follow: Följ
     follow_request: 'Du har skickat en följaförfrågan till:'
@@ -751,6 +755,8 @@ sv:
     disallowed_hashtags:
       one: 'innehöll en otillåten hashtag: %{tags}'
       other: 'innehöll de otillåtna hashtagarna: %{tags}'
+    errors:
+      in_reply_not_found: Statusen du försöker svara på existerar inte.
     language_detection: Lista ut språk automatiskt
     open_in_web: Öppna på webben
     over_character_limit: teckengräns på %{max} har överskridits
@@ -760,6 +766,7 @@ sv:
       private: Icke-offentliga toot kan inte fästas
       reblog: Knuffar kan inte fästas
     show_more: Visa mer
+    show_thread: Visa tråd
     visibilities:
       private: Endast följare
       private_long: Visa endast till följare
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c3da99c48..b4fc2ffac 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -78,6 +78,7 @@ ta:
       delete: அகற்று
       destroyed_msg: நடுநிலை குறிப்பு வெற்றிகரமாக அகற்றப்பட்டது!
     accounts:
+      add_email_domain_block: இம்மின்னஞ்சல் களத்தைத் தடுப்புப்பட்டியலில் சேர்
       approve: அங்கீகரி
       approve_all: அனைத்தும் அங்கீகரி
       are_you_sure: நிச்சயமா?
@@ -149,6 +150,7 @@ ta:
         staff: பணியாளர்
         user: பயனர்
       search: தேடு
+      search_same_email_domain: இம்மின்னஞ்சல் களத்தில் உள்ள மற்ற பயனர்கள்
       shared_inbox_url: குழு மின்னஞ்சல் முகவரி
       show:
         created_reports: உறுவாக்கிய அறிக்கைகள்
@@ -200,6 +202,7 @@ ta:
           suspend: தற்காலீகமாக நீக்குக
     email_domain_blocks:
       empty: மின்னஞ்சற் களங்கள் எதுவும் தடுக்கப்படவில்லை.
+      from_html: "%{domain} -இலிருந்து"
     invites:
       filter:
         all: அனைத்தும்
@@ -221,10 +224,15 @@ ta:
           other: "%{count} புகார்கள்"
       comment:
         none: எதுவுமில்லை
+    site_uploads:
+      delete: பதிவேற்றப்பட்டப் படம் அழிக்கப்பட்டது
+      destroyed_msg: பதிவேற்றப்பட்ட வலைதளம் வெற்றிக்கரமாக அழிக்கப்பட்டது!
   appearance:
     localization:
       body: மாஸ்டோடான் தன்னார்வலர்களால் மொழிபெயர்க்கப்படுகிறது.
       guide_link_text: அனைவரும் பங்களிக்கலாம்.
+  authorize_follow:
+    already_requested: இக்கணக்கைப் பின்தொடரும் கோரிக்கையை நீங்கள் ஏற்கனவே அனுப்பிவிட்டீர்கள்
   date:
     formats:
       default: "%b %d, %Y"
@@ -235,7 +243,7 @@ ta:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   filters:
@@ -251,6 +259,9 @@ ta:
       '43200': 12 hours
       '604800': 1 week
       '86400': 1 day
+  media_attachments:
+    validations:
+      not_ready: பதிவேற்றம் முடிவடையாத கோப்புகளை இணைக்க முடியாது. சிறிது நேரம் கழித்து மீண்டும் முயற்சி செய்யவும்!
   notifications:
     email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
@@ -263,4 +274,6 @@ ta:
       limit_reached: எதிர்வினைகளுக்கான உச்சவரம்பு எட்டப்பட்டது
       unrecognized_emoji: அங்கீகரிக்கப்பட்ட ஈமோஜி அல்ல
   statuses:
+    errors:
+      in_reply_not_found: நீங்கள் மறுமொழி அளிக்க முயலும் பதிவு இருப்பதுபோல் தெரியவில்லை.
     show_thread: தொடரைக் காட்டு
diff --git a/config/locales/te.yml b/config/locales/te.yml
index dd6c878e7..79415b1d1 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -113,7 +113,7 @@ te:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7d6ec0b13..10f25549b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -34,7 +34,7 @@ th:
     unavailable_content: เนื้อหาไม่พร้อมใช้งาน
     unavailable_content_description:
       domain: เซิร์ฟเวอร์
-      reason: 'เหตุผล:'
+      reason: เหตุผล
       rejecting_media: 'ไฟล์สื่อจากเซิร์ฟเวอร์เหล่านี้จะไม่ได้รับการประมวลผลหรือจัดเก็บ และจะไม่แสดงภาพขนาดย่อ ต้องมีการคลิกไปยังไฟล์ต้นฉบับด้วยตนเอง:'
     user_count_after:
       other: ผู้ใช้
@@ -113,12 +113,12 @@ th:
       joined: เข้าร่วมเมื่อ
       location:
         all: ทั้งหมด
-        local: ในเว็บ
+        local: ในเซิร์ฟเวอร์
         remote: ระยะไกล
         title: ตำแหน่งที่ตั้ง
       login_status: สถานะการเข้าสู่ระบบ
       media_attachments: ไฟล์แนบสื่อ
-      memorialize: เปลี่ยนเป็นระลึกถึง
+      memorialize: เปลี่ยนเป็นอนุสรณ์
       moderation:
         active: ใช้งานอยู่
         all: ทั้งหมด
@@ -159,7 +159,7 @@ th:
       show:
         created_reports: รายงานที่สร้าง
         targeted_reports: รายงานโดยผู้อื่น
-      silence: เงียบ
+      silence: ทำให้เงียบ
       silenced: เงียบอยู่
       statuses: สถานะ
       subscribe: บอกรับ
@@ -167,7 +167,7 @@ th:
       time_in_queue: กำลังรออยู่ในคิว %{time}
       title: บัญชี
       unconfirmed_email: อีเมลที่ยังไม่ได้ยืนยัน
-      undo_silenced: เลิกทำการเงียบ
+      undo_silenced: เลิกทำการทำให้เงียบ
       undo_suspension: เลิกทำการระงับ
       unsubscribe: เลิกบอกรับ
       username: ชื่อผู้ใช้
@@ -175,6 +175,42 @@ th:
       web: เว็บ
       whitelisted: ขึ้นบัญชีขาวแล้ว
     action_logs:
+      action_types:
+        assigned_to_self_report: มอบหมายรายงาน
+        change_email_user: เปลี่ยนอีเมลสำหรับผู้ใช้
+        confirm_user: ยืนยันผู้ใช้
+        create_account_warning: สร้างคำเตือน
+        create_announcement: สร้างประกาศ
+        create_custom_emoji: สร้างอีโมจิที่กำหนดเอง
+        create_domain_allow: สร้างการอนุญาตโดเมน
+        create_domain_block: สร้างการปิดกั้นโดเมน
+        create_email_domain_block: สร้างการปิดกั้นโดเมนอีเมล
+        demote_user: ลดขั้นผู้ใช้
+        destroy_announcement: ลบประกาศ
+        destroy_custom_emoji: ลบอีโมจิที่กำหนดเอง
+        destroy_domain_allow: ลบการอนุญาตโดเมน
+        destroy_domain_block: ลบการปิดกั้นโดเมน
+        destroy_email_domain_block: ลบการปิดกั้นโดเมนอีเมล
+        destroy_status: ลบสถานะ
+        disable_2fa_user: ปิดใช้งาน 2FA
+        disable_custom_emoji: ปิดใช้งานอีโมจิที่กำหนดเอง
+        disable_user: ปิดใช้งานผู้ใช้
+        enable_custom_emoji: เปิดใช้งานอีโมจิที่กำหนดเอง
+        enable_user: เปิดใช้งานผู้ใช้
+        memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
+        promote_user: เลื่อนขั้นผู้ใช้
+        remove_avatar_user: เอาภาพประจำตัวออก
+        reopen_report: เปิดรายงานใหม่
+        reset_password_user: ตั้งรหัสผ่านใหม่
+        resolve_report: แก้ปัญหารายงาน
+        silence_account: ทำให้บัญชีเงียบ
+        suspend_account: ระงับบัญชี
+        unassigned_report: เลิกมอบหมายรายงาน
+        unsilence_account: เลิกทำให้บัญชีเงียบ
+        unsuspend_account: เลิกระงับบัญชี
+        update_announcement: อัปเดตประกาศ
+        update_custom_emoji: อัปเดตอีโมจิที่กำหนดเอง
+        update_status: อัปเดตสถานะ
       actions:
         change_email_user: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
         confirm_user: "%{name} ได้ยืนยันที่อยู่อีเมลของผู้ใช้ %{target}"
@@ -196,17 +232,23 @@ th:
         disable_user: "%{name} ได้ปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         enable_custom_emoji: "%{name} ได้เปิดใช้งานอีโมจิ %{target}"
         enable_user: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
+        memorialize_account: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
         remove_avatar_user: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report: "%{name} ได้เปิดรายงาน %{target} ใหม่"
         resolve_report: "%{name} ได้แก้ปัญหารายงาน %{target}"
+        silence_account: "%{name} ได้ทำให้บัญชีของ %{target} เงียบ"
         suspend_account: "%{name} ได้ระงับบัญชีของ %{target}"
         unassigned_report: "%{name} ได้เลิกมอบหมายรายงาน %{target}"
+        unsilence_account: "%{name} ได้เลิกทำให้บัญชีของ %{target} เงียบ"
         unsuspend_account: "%{name} ได้เลิกระงับบัญชีของ %{target}"
         update_announcement: "%{name} ได้อัปเดตประกาศ %{target}"
         update_custom_emoji: "%{name} ได้อัปเดตอีโมจิ %{target}"
         update_status: "%{name} ได้อัปเดตสถานะโดย %{target}"
       deleted_status: "(สถานะที่ลบแล้ว)"
+      empty: ไม่พบรายการบันทึก
+      filter_by_action: กรองตามการกระทำ
+      filter_by_user: กรองตามผู้ใช้
       title: รายการบันทึกการตรวจสอบ
     announcements:
       destroyed_msg: ลบประกาศสำเร็จ!
@@ -259,6 +301,7 @@ th:
       feature_invites: ลิงก์เชิญ
       feature_profile_directory: ไดเรกทอรีโปรไฟล์
       feature_registrations: การลงทะเบียน
+      feature_relay: รีเลย์การติดต่อกับภายนอก
       feature_spam_check: การป้องกันสแปม
       feature_timeline_preview: ตัวอย่างเส้นเวลา
       features: คุณลักษณะ
@@ -292,15 +335,15 @@ th:
         create: สร้างการปิดกั้น
         hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะใช้วิธีการควบคุมเฉพาะกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
         severity:
-          desc_html: "<strong>เงียบ</strong> จะทำให้โพสต์ของบัญชีมองไม่เห็นกับใครก็ตามที่ไม่ได้กำลังติดตามบัญชี <strong>ระงับ</strong> จะเอาเนื้อหา, สื่อ และข้อมูลโปรไฟล์ทั้งหมดของบัญชีออก ใช้ <strong>ไม่มี</strong> หากคุณเพียงแค่ต้องการปฏิเสธไฟล์สื่อ"
+          desc_html: "<strong>ทำให้เงียบ</strong> จะทำให้โพสต์ของบัญชีไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามบัญชี <strong>ระงับ</strong> จะเอาเนื้อหา, สื่อ และข้อมูลโปรไฟล์ทั้งหมดของบัญชีออก ใช้ <strong>ไม่มี</strong> หากคุณเพียงแค่ต้องการปฏิเสธไฟล์สื่อ"
           noop: ไม่มี
-          silence: เงียบ
+          silence: ทำให้เงียบ
           suspend: ระงับ
         title: การปิดกั้นโดเมนใหม่
       private_comment: ความคิดเห็นส่วนตัว
       public_comment: ความคิดเห็นสาธารณะ
       reject_media: ปฏิเสธไฟล์สื่อ
-      reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเว็บออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
+      reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเซิร์ฟเวอร์ออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
       reject_reports: ปฏิเสธรายงาน
       severity:
         silence: เงียบอยู่
@@ -309,7 +352,7 @@ th:
         affected_accounts:
           other: มีผลต่อ %{count} บัญชีในฐานข้อมูล
         retroactive:
-          silence: เลิกเงียบบัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้
+          silence: เลิกทำให้บัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้เงียบ
           suspend: เลิกระงับบัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้
         title: เลิกทำการปิดกั้นโดเมนสำหรับ %{domain}
         undo: เลิกทำ
@@ -322,6 +365,7 @@ th:
       destroyed_msg: ลบโดเมนอีเมลออกจากบัญชีดำสำเร็จ
       domain: โดเมน
       empty: ไม่มีโดเมนอีเมลที่ขึ้นบัญชีดำอยู่
+      from_html: จาก %{domain}
       new:
         create: เพิ่มโดเมน
         title: รายการบัญชีดำอีเมลใหม่
@@ -408,7 +452,7 @@ th:
         all: ให้กับทุกคน
         disabled: ให้กับไม่มีใคร
         title: แสดงการปิดกั้นโดเมน
-        users: ให้กับผู้ใช้ในเว็บที่เข้าสู่ระบบ
+        users: ให้กับผู้ใช้ในเซิร์ฟเวอร์ที่เข้าสู่ระบบ
       domain_blocks_rationale:
         title: แสดงคำชี้แจงเหตุผล
       enable_bootstrap_timeline_accounts:
@@ -488,7 +532,6 @@ th:
     warning_presets:
       add_new: เพิ่มใหม่
       delete: ลบ
-      edit: แก้ไข
       edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
       title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
   admin_mailer:
@@ -603,7 +646,7 @@ th:
     '422':
       content: การตรวจสอบความปลอดภัยล้มเหลว คุณกำลังปิดกั้นคุกกี้หรือไม่?
       title: การตรวจสอบความปลอดภัยล้มเหลว
-    '429': Throttled
+    '429': Too many requests
     '500':
       title: หน้านี้ไม่ถูกต้อง
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index cde7f1c83..1dcf9ccea 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -573,7 +573,6 @@ tr:
     warning_presets:
       add_new: Yeni ekle
       delete: Sil
-      edit: Düzenle
       edit_preset: Uyarı ön-ayarını düzenle
       title: Uyarı ön-ayarlarını yönet
   admin_mailer:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 967a02717..3df83e756 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -591,7 +591,6 @@ uk:
     warning_presets:
       add_new: Додати новий
       delete: Видалити
-      edit: Редагувати
       edit_preset: Редагувати шаблон попередження
       title: Управління шаблонами попереджень
   admin_mailer:
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 114261859..2aa72a8f8 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -7,7 +7,7 @@ ur:
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
     '422': 
-    '429': Throttled
+    '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
   invites:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index ec8e853fe..cba773417 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -534,7 +534,6 @@ vi:
     warning_presets:
       add_new: Thêm mới
       delete: Xóa bỏ
-      edit: Biên tập
       edit_preset: Chỉnh sửa cảnh báo đặt trước
       title: Quản lý cài đặt trước cảnh báo
   admin_mailer:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d6618dbbe..33f25eaa6 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -41,7 +41,7 @@ zh-CN:
       rejecting_media: 来自这些服务器的媒体文件将不会被处理或存储，缩略图也不会显示，需要手动点击打开原始文件。
       silenced: 来自这些服务器上的帖子将不会出现在公共时间线和会话中；此外，除非你关注了这些服务器上的用户，否则他们的互动不会产生通知。
       suspended: 这些服务器的数据将不会被处理、存储或者交换，本站也将无法和来自这些服务器的用户互动或者交流。
-    unavailable_content_html: 通常来说，在Mastodon上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但是这台服务器上会有一些挟制。
+    unavailable_content_html: 通常来说，在Mastodon上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但是某些站点上不排除会有例外。
     user_count_after:
       other: 位用户
     user_count_before: 这里共注册有
@@ -88,6 +88,7 @@ zh-CN:
       delete: 删除
       destroyed_msg: 管理备忘删除成功！
     accounts:
+      add_email_domain_block: 把电子邮箱域名加入黑名单
       approve: 批准
       approve_all: 批准全部
       are_you_sure: 你确定吗？
@@ -168,6 +169,7 @@ zh-CN:
         staff: 管理人员
         user: 普通用户
       search: 搜索
+      search_same_email_domain: 其他具有相同电子邮箱域名的用户
       search_same_ip: 具有相同IP的其他用户
       shared_inbox_url: 公用收件箱（Shared Inbox）URL
       show:
@@ -353,6 +355,7 @@ zh-CN:
       destroyed_msg: 电子邮件域名屏蔽删除成功
       domain: 域名
       empty: 当前没有邮件域名黑名单。
+      from_html: 来自 %{domain}
       new:
         create: 添加域名
         title: 添加电子邮件域名屏蔽
@@ -495,8 +498,8 @@ zh-CN:
           open: 开放注册
         title: 注册模式
       show_known_fediverse_at_about_page:
-        desc_html: 启用此选项将会在预览中显示来自已知实例的嘟文，否则只会显示本站时间轴的内容.
-        title: 在时间轴预览中显示已知实例
+        desc_html: 如果开启，就会在时间轴预览显示其他站点嘟文，否则就只会只显示本站嘟文。
+        title: 在时间轴预览中显示其他站点嘟文
       show_staff_badge:
         desc_html: 在个人资料页上显示管理人员标志
         title: 显示管理人员标志
@@ -529,6 +532,9 @@ zh-CN:
       trends:
         desc_html: 公开显示先前已通过审核的当前热门话题
         title: 热门标签
+    site_uploads:
+      delete: 删除已上传的文件
+      destroyed_msg: 站点上传的文件已经成功删除！
     statuses:
       back_to_account: 返回帐户信息页
       batch:
@@ -565,7 +571,6 @@ zh-CN:
     warning_presets:
       add_new: 添加新条目
       delete: 删除
-      edit: 编辑
       edit_preset: 编辑预置警告
       title: 管理预设警告
   admin_mailer:
@@ -653,6 +658,7 @@ zh-CN:
     trouble_logging_in: 登录有问题？
   authorize_follow:
     already_following: 你已经在关注此用户了
+    already_requested: 你已经向那个账户发送过关注请求了
     error: 对不起，寻找这个跨站用户时出错
     follow: 关注
     follow_request: 关注请求已发送给：
@@ -839,6 +845,7 @@ zh-CN:
   media_attachments:
     validations:
       images_and_video: 无法在嘟文中同时插入视频和图片
+      not_ready: 不能附加还在处理中的文件。请稍后再试！
       too_many: 最多只能添加 4 张图片
   migrations:
     acct: 新帐户的 用户名@域名
@@ -1055,6 +1062,8 @@ zh-CN:
     content_warning: 内容警告：%{warning}
     disallowed_hashtags:
       other: 包含了这些禁止的话题标签：%{tags}
+    errors:
+      in_reply_not_found: 你回复的嘟文似乎不存在
     language_detection: 自动检测语言
     open_in_web: 在站内打开
     over_character_limit: 超过了 %{max} 字的限制
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ffd5ba5e9..92233dcc6 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -11,12 +11,14 @@ zh-HK:
     apps: 行動應用程式
     apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
     browse_directory: 依興趣瀏覽個人資料目錄和過濾器
+    browse_local_posts: 瀏覽這台伺服器中公開嘟文的直播串流
     browse_public_posts: 在 Mastodon 瀏覽公開嘟文的即時串流
     contact: 聯絡
     contact_missing: 未設定
     contact_unavailable: 未公開
     discover_users: 探索使用者
     documentation: 文件
+    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
     get_apps: 嘗試行動應用程式
     hosted_on: 在 %{domain} 運作的 Mastodon 服務站
     learn_more: 了解更多
@@ -29,6 +31,7 @@ zh-HK:
     status_count_before: 他們共發佈了
     tagline: 關注朋友並探索新朋友
     terms: 使用條款
+    unavailable_content: 無法取得的內容
     unavailable_content_description:
       domain: 伺服器
       reason: 原因
@@ -60,7 +63,9 @@ zh-HK:
     roles:
       admin: 管理員
       bot: 機械人
+      group: 群組
       moderator: 監察員
+    unavailable: 無法取得個人檔案
     unfollow: 取消關注
   admin:
     account_actions:
@@ -72,6 +77,7 @@ zh-HK:
       delete: 刪除
       destroyed_msg: 管理記錄已被刪除
     accounts:
+      add_email_domain_block: 將電子郵件網域加入黑名單
       approve: 核准
       approve_all: 全部批准
       are_you_sure: 你確定嗎？
@@ -151,6 +157,8 @@ zh-HK:
         staff: 管理人員
         user: 普通用戶
       search: 搜索
+      search_same_email_domain: 其他有同個電子郵件網域的使用者
+      search_same_ip: 其他有同個 IP 的使用者
       shared_inbox_url: 公共收件箱（Shared Inbox）URL
       show:
         created_reports: 此用戶所提舉報的紀錄
@@ -160,6 +168,7 @@ zh-HK:
       statuses: 文章
       subscribe: 訂閱
       suspended: 已停權
+      time_in_queue: 正在佇列等待 %{time}
       title: 用戶
       unconfirmed_email: 未確認的電郵
       undo_silenced: 解除靜音
@@ -168,17 +177,22 @@ zh-HK:
       username: 用戶名稱
       warn: 警告
       web: 用戶頁面
+      whitelisted: 已加入白名單
     action_logs:
       actions:
         assigned_to_self_report: "%{name} 指派了 %{target} 的舉報給自己"
         change_email_user: "%{name} 改變了用戶 %{target} 的電郵地址"
         confirm_user: "%{name} 確認了用戶 %{target} 的電郵地址"
         create_account_warning: "%{name} 已對 %{target} 送出警告"
+        create_announcement: "%{name} 建立了新公告 %{target}"
         create_custom_emoji: "%{name} 加入自訂表情符號 %{target}"
+        create_domain_allow: "%{name} 將 %{target} 網域加入黑名單了"
         create_domain_block: "%{name} 阻隔了網域 %{target}"
         create_email_domain_block: "%{name} 阻隔了電郵網域 %{target}"
         demote_user: "%{name} 把用戶 %{target} 降任"
+        destroy_announcement: "%{name} 刪除了公告 %{target}"
         destroy_custom_emoji: "%{name} 破壞了 %{target} 表情符號"
+        destroy_domain_allow: "%{name} 從白名單中移除了 %{target} 網域"
         destroy_domain_block: "%{name} 取消了對網域 %{target} 的阻隔"
         destroy_email_domain_block: "%{name} 取消了對電郵網域 %{target} 的阻隔"
         destroy_status: "%{name} 刪除了 %{target} 的文章"
@@ -198,15 +212,33 @@ zh-HK:
         unassigned_report: "%{name} 取消指派 %{target} 的舉報"
         unsilence_account: "%{name} 取消了用戶 %{target} 的靜音狀態"
         unsuspend_account: "%{name} 取消了用戶 %{target} 的停權狀態"
+        update_announcement: "%{name} 更新了公告 %{target}"
         update_custom_emoji: "%{name} 更新了自訂表情符號 %{target}"
         update_status: "%{name} 刷新了 %{target} 的文章"
       deleted_status: "（已刪除嘟文）"
       title: 營運日誌
+    announcements:
+      destroyed_msg: 成功刪除公告！
+      edit:
+        title: 編輯公告
+      empty: 找不到公告。
+      live: 直播
+      new:
+        create: 建立公告
+        title: 新增公告
+      published_msg: 成功發布公告！
+      scheduled_for: 排定 %{time}
+      scheduled_msg: 公告已排定公開！
+      title: 公告
+      unpublished_msg: 成功取消發布公告！
+      updated_msg: 成功更新公告！
     custom_emojis:
+      assign_category: 指定分類
       by_domain: 網域
       copied_msg: 成功將表情複製到本地
       copy: 複製
       copy_failed_msg: 無法將表情複製到本地
+      create_new_category: 建立新分類
       created_msg: 已新增表情符號
       delete: 刪除
       destroyed_msg: 已刪除表情符號
@@ -226,11 +258,13 @@ zh-HK:
       shortcode: 短代碼
       shortcode_hint: 至少 2 個字元，只能使用字母、數字和下劃線
       title: 自訂 emoji
+      uncategorized: 未分類
       unlisted: 已隱藏
       update_failed_msg: 無法更新表情符號
       updated_msg: 已更新表情符號
       upload: 上傳新的表情符號
     dashboard:
+      authorized_fetch_mode: 安全模式
       backlog: 未處理工作數
       config: 設定
       feature_deletions: 帳戶刪除
@@ -238,9 +272,13 @@ zh-HK:
       feature_profile_directory: 個人資料目錄
       feature_registrations: 註冊
       feature_relay: 聯邦中繼站
+      feature_spam_check: 防垃圾訊息
+      feature_timeline_preview: 時間軸預覽
       features: 功能
       hidden_service: 與隱密服務互連
       open_reports: 待處理檢舉數
+      pending_tags: 等待審核的主題標籤
+      pending_users: 等待審核的使用者
       recent_users: 最近加入的使用者
       search: 全文搜尋
       single_user_mode: 單一使用者模式
@@ -252,6 +290,12 @@ zh-HK:
       week_interactions: 本週互動次數
       week_users_active: 本週活躍使用者數
       week_users_new: 本週新使用者數
+      whitelist_mode: 白名單模式
+    domain_allows:
+      add_new: 將網域加入白名單
+      created_msg: 網域已成功加入白名單
+      destroyed_msg: 網域已成功從白名單移除
+      undo: 從白名單移除
     domain_blocks:
       add_new: 新增
       created_msg: 正處理域名阻隔
@@ -352,12 +396,23 @@ zh-HK:
       contact_information:
         email: 輸入一個公開的電郵地址
         username: 輸入用戶名稱
+      domain_blocks:
+        all: 給任何人
+        disabled: 給沒有人
+        title: 顯示封鎖的網域
+      enable_bootstrap_timeline_accounts:
+        title: 啟用新使用者的預設追蹤
       hero:
         desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會默認為服務站縮圖
         title: 主題圖片
       peers_api_enabled:
         desc_html: 現時本服務站在網絡中已發現的域名
         title: 公開已知服務站的列表
+      preview_sensitive_media:
+        title: 在 OpenGraph 預覽中顯示敏感媒體
+      profile_directory:
+        desc_html: 允許能探索使用者
+        title: 啟用個人資料目錄
       registrations:
         closed_message:
           desc_html: 當本站暫停接受註冊時，會顯示這個訊息。<br/> 可使用 HTML
@@ -368,6 +423,12 @@ zh-HK:
         min_invite_role:
           disabled: 沒有人
           title: 允許發送邀請的身份
+      registrations_mode:
+        modes:
+          approved: 註冊需要核准
+          none: 沒有人可註冊
+          open: 任何人皆能註冊
+        title: 註冊模式
       show_known_fediverse_at_about_page:
         desc_html: 如果開啟，就會在時間軸預覽顯示跨站文章，否則就只會顯示本站文章。
         title: 在時間軸預覽顯示跨站文章
@@ -380,10 +441,14 @@ zh-HK:
       site_description_extended:
         desc_html: 本站詳細資訊頁的內文<br/>你可以在此使用 HTML
         title: 本站詳細資訊
+      site_short_description:
+        title: 伺服器短描述
       site_terms:
         desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
         title: 自訂使用條款
       site_title: 本站名稱
+      spam_check_enabled:
+        title: 自動防廣告訊息
       thumbnail:
         desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
         title: 本站縮圖
@@ -391,25 +456,44 @@ zh-HK:
         desc_html: 在主頁顯示本站時間軸
         title: 時間軸預覽
       title: 網站設定
+      trends:
+        title: 趨勢主題標籤
+    site_uploads:
+      delete: 刪除上傳的檔案
+      destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
       back_to_account: 返回帳戶信息頁
       batch:
         delete: 刪除
         nsfw_off: 取消 NSFW 標記
         nsfw_on: 添加 NSFW 標記
+      deleted: 已刪除
       failed_to_execute: 執行失敗
       media:
         title: 媒體檔案
       no_media: 不含媒體檔案
+      no_status_selected: 因未選擇嘟文而未變更。
       title: 帳戶文章
       with_media: 含有媒體檔案
     tags:
+      context: 上下文
+      directory: 在目錄中
+      in_directory: 目錄中有 %{count} 個
+      last_active: 上次活躍
+      most_popular: 最熱門
+      most_recent: 最近
       name: Hashtag
+      review: 審核嘟文
+      reviewed: 已審核
+      title: 主題標籤
+      trending_right_now: 最新趨勢
+      unique_uses_today: 今天嘟了 %{count} 則
+      unreviewed: 未審核
+      updated_msg: 成功更新主題標籤設定
     title: 管理
     warning_presets:
       add_new: 新增
       delete: 刪除
-      edit: 編輯
   admin_mailer:
     new_report:
       body: "%{reporter} 舉報了用戶 %{target}"
@@ -456,6 +540,7 @@ zh-HK:
     set_new_password: 設定新密碼
   authorize_follow:
     already_following: 你已經關注了這個帳號
+    already_requested: 您早已向該帳戶寄送追蹤請求
     error: 對不起，尋找這個跨站用戶的過程發生錯誤
     follow: 關注
     follow_request: 關注請求已發送给：
@@ -673,6 +758,8 @@ zh-HK:
     content_warning: 內容警告： %{warning}
     disallowed_hashtags:
       other: 包含不允許的標籤： %{tags}
+    errors:
+      in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
     language_detection: 自動偵測語言
     open_in_web: 開啟網頁
     over_character_limit: 超過了 %{max} 字的限制
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5b25688ed..3f82428de 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -11,12 +11,14 @@ zh-TW:
     apps: 行動應用程式
     apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
     browse_directory: 依興趣瀏覽個人資料目錄和過濾器
+    browse_local_posts: 瀏覽這台伺服器中公開嘟文的直播串流
     browse_public_posts: 在 Mastodon 瀏覽公開嘟文的即時串流
     contact: 聯絡我們
     contact_missing: 未設定
     contact_unavailable: 未公開
     discover_users: 探索使用者
     documentation: 文件
+    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
     get_apps: 嘗試行動應用程式
     hosted_on: 在 %{domain} 運作的 Mastodon 站點
     learn_more: 了解詳細
@@ -29,6 +31,7 @@ zh-TW:
     status_count_before: 他們共嘟出了
     tagline: 關注朋友並探索新朋友
     terms: 使用條款
+    unavailable_content: 無法取得的內容
     unavailable_content_description:
       domain: 伺服器
       reason: 原因
@@ -60,7 +63,9 @@ zh-TW:
     roles:
       admin: 管理員
       bot: 機器人
+      group: 群組
       moderator: 版主
+    unavailable: 無法取得個人檔案
     unfollow: 取消關注
   admin:
     account_actions:
@@ -72,6 +77,7 @@ zh-TW:
       delete: 刪除
       destroyed_msg: 成功刪除管理備忘!
     accounts:
+      add_email_domain_block: 將電子郵件網域加入黑名單
       approve: 核准
       approve_all: 全部批准
       are_you_sure: 您確定嗎?
@@ -151,6 +157,8 @@ zh-TW:
         staff: 管理人員
         user: 普通使用者
       search: 搜尋
+      search_same_email_domain: 其他有同個電子郵件網域的使用者
+      search_same_ip: 其他有同個 IP 的使用者
       shared_inbox_url: 共享收件箱網址
       show:
         created_reports: 建立檢舉
@@ -160,6 +168,7 @@ zh-TW:
       statuses: 嘟文
       subscribe: 訂閱
       suspended: 已停權
+      time_in_queue: 正在佇列等待 %{time}
       title: 帳戶
       unconfirmed_email: 未確認的電子信箱位址
       undo_silenced: 取消靜音
@@ -168,17 +177,22 @@ zh-TW:
       username: 使用者名稱
       warn: 警告
       web: 頁面
+      whitelisted: 已加入白名單
     action_logs:
       actions:
         assigned_to_self_report: "%{name} 接受了檢舉 %{target}"
         change_email_user: "%{name} 變更了使用者 %{target} 的電子信箱位址"
         confirm_user: "%{name} 確認了使用者 %{target} 的電子信箱位址"
         create_account_warning: "%{name} 已對 %{target} 送出警告"
+        create_announcement: "%{name} 建立了新公告 %{target}"
         create_custom_emoji: "%{name} 加入自訂表情符號 %{target}"
+        create_domain_allow: "%{name} 將 %{target} 網域加入黑名單了"
         create_domain_block: "%{name} 封鎖了站點 %{target}"
         create_email_domain_block: "%{name} 封鎖了電子信箱網域 %{target}"
         demote_user: "%{name} 把使用者 %{target} 降級"
+        destroy_announcement: "%{name} 刪除了公告 %{target}"
         destroy_custom_emoji: "%{name} 破壞了 %{target} 表情符號"
+        destroy_domain_allow: "%{name} 從白名單中移除了 %{target} 網域"
         destroy_domain_block: "%{name} 取消了對站點 %{target} 的封鎖"
         destroy_email_domain_block: "%{name} 取消了對電子信箱網域 %{target} 的封鎖"
         destroy_status: "%{name} 刪除了 %{target} 的嘟文"
@@ -198,15 +212,33 @@ zh-TW:
         unassigned_report: "%{name} 取消指派 %{target} 的檢舉"
         unsilence_account: "%{name} 取消了使用者 %{target} 的靜音狀態"
         unsuspend_account: "%{name} 取消了使用者 %{target} 的停權狀態"
+        update_announcement: "%{name} 更新了公告 %{target}"
         update_custom_emoji: "%{name} 更新了自訂表情符號 %{target}"
         update_status: "%{name} 重整了 %{target} 的嘟文"
       deleted_status: "（已刪除嘟文）"
       title: 營運日誌
+    announcements:
+      destroyed_msg: 成功刪除公告！
+      edit:
+        title: 編輯公告
+      empty: 找不到公告。
+      live: 直播
+      new:
+        create: 建立公告
+        title: 新增公告
+      published_msg: 成功發布公告！
+      scheduled_for: 排定 %{time}
+      scheduled_msg: 公告已排定公開！
+      title: 公告
+      unpublished_msg: 成功取消發布公告！
+      updated_msg: 成功更新公告！
     custom_emojis:
+      assign_category: 指定分類
       by_domain: 站點
       copied_msg: 成功將表情複製到本地
       copy: 複製
       copy_failed_msg: 無法將表情複製到本地
+      create_new_category: 建立新分類
       created_msg: 已新增表情符號!
       delete: 刪除
       destroyed_msg: 已刪除表情符號!
@@ -226,11 +258,13 @@ zh-TW:
       shortcode: 短代碼
       shortcode_hint: 至少 2 個字元，只能使用字母、數字和下劃線
       title: 自訂表情符號
+      uncategorized: 未分類
       unlisted: 已隱藏
       update_failed_msg: 無法更新表情符號
       updated_msg: 已更新表情符號!
       upload: 上傳新的表情符號
     dashboard:
+      authorized_fetch_mode: 安全模式
       backlog: 未處理工作數
       config: 設定
       feature_deletions: 帳戶刪除
@@ -238,9 +272,13 @@ zh-TW:
       feature_profile_directory: 個人資料目錄
       feature_registrations: 註冊
       feature_relay: 聯邦中繼站
+      feature_spam_check: 防垃圾訊息
+      feature_timeline_preview: 時間軸預覽
       features: 功能
       hidden_service: 與隱密服務互連
       open_reports: 待處理檢舉數
+      pending_tags: 等待審核的主題標籤
+      pending_users: 等待審核的使用者
       recent_users: 最近加入的使用者
       search: 全文搜尋
       single_user_mode: 單一使用者模式
@@ -252,6 +290,12 @@ zh-TW:
       week_interactions: 本週互動次數
       week_users_active: 本週活躍使用者數
       week_users_new: 本週新使用者數
+      whitelist_mode: 白名單模式
+    domain_allows:
+      add_new: 將網域加入白名單
+      created_msg: 網域已成功加入白名單
+      destroyed_msg: 網域已成功從白名單移除
+      undo: 從白名單移除
     domain_blocks:
       add_new: 新增欲封鎖域名
       created_msg: 正在進行站點封鎖
@@ -351,12 +395,23 @@ zh-TW:
       contact_information:
         email: 用於聯絡的公開電子信箱位址
         username: 請輸入使用者名稱
+      domain_blocks:
+        all: 給任何人
+        disabled: 給沒有人
+        title: 顯示封鎖的網域
+      enable_bootstrap_timeline_accounts:
+        title: 啟用新使用者的預設追蹤
       hero:
         desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會重設回伺服器預覽圖
         title: 主題圖片
       peers_api_enabled:
         desc_html: 本伺服器在聯邦中發現的站點
         title: 發布已知伺服器的列表
+      preview_sensitive_media:
+        title: 在 OpenGraph 預覽中顯示敏感媒體
+      profile_directory:
+        desc_html: 允許能探索使用者
+        title: 啟用個人資料目錄
       registrations:
         closed_message:
           desc_html: 關閉註冊時顯示在首頁的內容，可使用 HTML 標籤
@@ -367,6 +422,12 @@ zh-TW:
         min_invite_role:
           disabled: 沒有人
           title: 允許發送邀請的身份
+      registrations_mode:
+        modes:
+          approved: 註冊需要核准
+          none: 沒有人可註冊
+          open: 任何人皆能註冊
+        title: 註冊模式
       show_known_fediverse_at_about_page:
         desc_html: 如果開啟，就會在時間軸預覽顯示其他站點嘟文，否則就只會顯示本站點嘟文。
         title: 在時間軸預覽顯示其他站點嘟文
@@ -379,10 +440,14 @@ zh-TW:
       site_description_extended:
         desc_html: 可放置行為準則、規定以及其他此伺服器特有的內容。可使用 HTML 標籤
         title: 本站詳細資訊
+      site_short_description:
+        title: 伺服器短描述
       site_terms:
         desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
         title: 自訂使用條款
       site_title: 伺服器名稱
+      spam_check_enabled:
+        title: 自動防廣告訊息
       thumbnail:
         desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
         title: 伺服器縮圖
@@ -390,25 +455,44 @@ zh-TW:
         desc_html: 在主頁顯示本站時間軸
         title: 時間軸預覽
       title: 網站設定
+      trends:
+        title: 趨勢主題標籤
+    site_uploads:
+      delete: 刪除上傳的檔案
+      destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
       back_to_account: 返回帳戶訊息頁
       batch:
         delete: 刪除
         nsfw_off: 標記為非敏感內容
         nsfw_on: 標記為敏感內容
+      deleted: 已刪除
       failed_to_execute: 執行失敗
       media:
         title: 媒體檔案
       no_media: 不含媒體檔案
+      no_status_selected: 因未選擇嘟文而未變更。
       title: 帳戶嘟文
       with_media: 含有媒體檔案
     tags:
+      context: 上下文
+      directory: 在目錄中
+      in_directory: 目錄中有 %{count} 個
+      last_active: 上次活躍
+      most_popular: 最熱門
+      most_recent: 最近
       name: Hashtag
+      review: 審核嘟文
+      reviewed: 已審核
+      title: 主題標籤
+      trending_right_now: 最新趨勢
+      unique_uses_today: 今天嘟了 %{count} 則
+      unreviewed: 未審核
+      updated_msg: 成功更新主題標籤設定
     title: 管理介面
     warning_presets:
       add_new: 新增
       delete: 刪除
-      edit: 編輯
   admin_mailer:
     new_report:
       body: "%{reporter} 檢舉了使用者 %{target}"
@@ -455,6 +539,7 @@ zh-TW:
     set_new_password: 設定新密碼
   authorize_follow:
     already_following: 你已經關注了這個使用者
+    already_requested: 您早已向該帳戶寄送追蹤請求
     error: 對不起，搜尋其他站點使用者出現錯誤
     follow: 關注
     follow_request: 關注請求已經發送給：
@@ -655,6 +740,8 @@ zh-TW:
       description: 附件： %{attached}
     boosted_from_html: 轉嘟自 %{acct_link}
     content_warning: 內容警告： %{warning}
+    errors:
+      in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
     language_detection: 自動偵測語言
     open_in_web: 以網頁開啟
     over_character_limit: 超過了 %{max} 字的限制
diff --git a/config/routes.rb b/config/routes.rb
index c22efc1e1..49ab851e2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq/web'
+require 'sidekiq_unique_jobs/web'
 require 'sidekiq-scheduler/web'
 
 Sidekiq::Web.set :session_secret, Rails.application.secrets[:secret_key_base]
@@ -186,6 +186,7 @@ Rails.application.routes.draw do
     end
 
     resource :settings, only: [:edit, :update]
+    resources :site_uploads, only: [:destroy]
 
     resources :invites, only: [:index, :create, :destroy] do
       collection do
@@ -342,7 +343,7 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :media,        only: [:create, :update]
+      resources :media,        only: [:create, :update, :show]
       resources :blocks,       only: [:index]
       resources :mutes,        only: [:index]
       resources :favourites,   only: [:index]
@@ -454,6 +455,7 @@ Rails.application.routes.draw do
     end
 
     namespace :v2 do
+      resources :media, only: [:create]
       get '/search', to: 'search#index', as: :search
     end
 
diff --git a/config/webpack/development.js b/config/webpack/development.js
index 56f6e43f0..774ecbc07 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -54,7 +54,7 @@ module.exports = merge(sharedConfig, {
     watchOptions: Object.assign(
       {},
       settings.dev_server.watch_options,
-      watchOptions
+      watchOptions,
     ),
     writeToDisk: filePath => /ocr/.test(filePath),
   },
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index d5e399ced..81c02acd4 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -31,7 +31,7 @@ module.exports = {
     Object.keys(themes).reduce((themePaths, name) => {
       themePaths[name] = resolve(join(settings.source_path, themes[name]));
       return themePaths;
-    }, {})
+    }, {}),
   ),
 
   output: {
@@ -73,7 +73,7 @@ module.exports = {
         // temporary fix for https://github.com/ReactTraining/react-router/issues/5576
         // to reduce bundle size
         resource.request = resource.request.replace(/^history/, 'history/es');
-      }
+      },
     ),
     new MiniCssExtractPlugin({
       filename: 'css/[name]-[contenthash:8].css',
diff --git a/db/migrate/20191212163405_add_hide_collections_to_accounts.rb b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
new file mode 100644
index 000000000..fa99b32e5
--- /dev/null
+++ b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddHideCollectionsToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :hide_collections, :boolean
+  end
+end
diff --git a/db/migrate/20200306035625_add_processing_to_media_attachments.rb b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
new file mode 100644
index 000000000..131ffa52a
--- /dev/null
+++ b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
@@ -0,0 +1,5 @@
+class AddProcessingToMediaAttachments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :media_attachments, :processing, :integer
+  end
+end
diff --git a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
new file mode 100644
index 000000000..46a5350e7
--- /dev/null
+++ b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
@@ -0,0 +1,15 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddTitleToAccountWarningPresets < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :account_warning_presets, :title, :string, default: '', allow_null: false }
+  end
+
+  def down
+    remove_column :account_warning_presets, :title
+  end
+end
diff --git a/db/migrate/20200312162302_add_status_ids_to_announcements.rb b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
new file mode 100644
index 000000000..42aa6513d
--- /dev/null
+++ b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
@@ -0,0 +1,6 @@
+class AddStatusIdsToAnnouncements < ActiveRecord::Migration[5.2]
+  def change
+    add_column :announcements, :status_ids, :bigint, array: true
+  end
+end
+
diff --git a/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
new file mode 100644
index 000000000..03915040c
--- /dev/null
+++ b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
@@ -0,0 +1,5 @@
+class AddParentIdToEmailDomainBlocks < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :email_domain_blocks, :parent, null: true, default: nil, foreign_key: { on_delete: :cascade, to_table: :email_domain_blocks }, index: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b09ee0e76..021ddac89 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_01_26_203551) do
+ActiveRecord::Schema.define(version: 2020_03_12_185443) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -114,6 +114,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.text "text", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "title", default: "", null: false
   end
 
   create_table "account_warnings", force: :cascade do |t|
@@ -170,6 +171,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.datetime "silenced_at"
     t.datetime "suspended_at"
     t.integer "trust_level"
+    t.boolean "hide_collections"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
@@ -229,6 +231,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "published_at"
+    t.bigint "status_ids", array: true
   end
 
   create_table "backups", force: :cascade do |t|
@@ -334,6 +337,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.string "domain", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "parent_id"
     t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true
   end
 
@@ -459,6 +463,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
     t.text "description"
     t.bigint "scheduled_status_id"
     t.string "blurhash"
+    t.integer "processing"
     t.index ["account_id"], name: "index_media_attachments_on_account_id"
     t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id"
     t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true
@@ -866,6 +871,7 @@ ActiveRecord::Schema.define(version: 2020_01_26_203551) do
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
   add_foreign_key "custom_filters", "accounts", on_delete: :cascade
+  add_foreign_key "email_domain_blocks", "email_domain_blocks", column: "parent_id", on_delete: :cascade
   add_foreign_key "favourites", "accounts", name: "fk_5eb6c2b873", on_delete: :cascade
   add_foreign_key "favourites", "statuses", name: "fk_b0e856845e", on_delete: :cascade
   add_foreign_key "featured_tags", "accounts", on_delete: :cascade
diff --git a/dist/nginx.conf b/dist/nginx.conf
index b6591e897..2d5f3a389 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -3,6 +3,14 @@ map $http_upgrade $connection_upgrade {
   ''      close;
 }
 
+upstream backend {
+    server 127.0.0.1:3000 fail_timeout=0;
+}
+
+upstream streaming {
+    server 127.0.0.1:4000 fail_timeout=0;
+}
+
 proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
 
 server {
@@ -69,7 +77,7 @@ server {
     proxy_set_header Proxy "";
     proxy_pass_header Server;
 
-    proxy_pass http://127.0.0.1:3000;
+    proxy_pass http://backend;
     proxy_buffering on;
     proxy_redirect off;
     proxy_http_version 1.1;
@@ -93,7 +101,7 @@ server {
     proxy_set_header X-Forwarded-Proto https;
     proxy_set_header Proxy "";
 
-    proxy_pass http://127.0.0.1:4000;
+    proxy_pass http://streaming;
     proxy_buffering off;
     proxy_redirect off;
     proxy_http_version 1.1;
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index d842b986f..08a8f1093 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -45,6 +45,7 @@ module Mastodon
     end
 
     option :start_after
+    option :prefix
     option :dry_run, type: :boolean, default: false
     desc 'remove-orphans', 'Scan storage and check for files that do not belong to existing media attachments'
     long_desc <<~LONG_DESC
@@ -58,6 +59,7 @@ module Mastodon
       reclaimed_bytes = 0
       removed         = 0
       dry_run         = options[:dry_run] ? ' (DRY RUN)' : ''
+      prefix          = options[:prefix]
 
       case Paperclip::Attachment.default_options[:storage]
       when :s3
@@ -69,7 +71,7 @@ module Mastodon
         loop do
           objects = begin
             begin
-              bucket.objects(start_after: last_key, prefix: 'media_attachments/files/').limit(1000).map { |x| x }
+              bucket.objects(start_after: last_key, prefix: prefix).limit(1000).map { |x| x }
             rescue => e
               progress.log(pastel.red("Error fetching list of files: #{e}"))
               progress.log("If you want to continue from this point, add --start-after=#{last_key} to your command") if last_key
@@ -79,16 +81,21 @@ module Mastodon
 
           break if objects.empty?
 
-          last_key        = objects.last.key
-          attachments_map = MediaAttachment.where(id: objects.map { |object| object.key.split('/')[2..-2].join.to_i }).each_with_object({}) { |attachment, map| map[attachment.id] = attachment }
+          last_key   = objects.last.key
+          record_map = preload_records_from_mixed_objects(objects)
 
           objects.each do |object|
-            attachment_id = object.key.split('/')[2..-2].join.to_i
-            filename      = object.key.split('/').last
+            path_segments   = object.key.split('/')
+            model_name      = path_segments.first.classify
+            attachment_name = path_segments[1].singularize
+            record_id       = path_segments[2..-2].join.to_i
+            file_name       = path_segments.last
+            record          = record_map.dig(model_name, record_id)
+            attachment      = record&.public_send(attachment_name)
 
             progress.increment
 
-            next unless attachments_map[attachment_id].nil? || !attachments_map[attachment_id].variant?(filename)
+            next unless attachment.blank? || !attachment.variant?(file_name)
 
             begin
               object.delete unless options[:dry_run]
@@ -108,19 +115,26 @@ module Mastodon
       when :filesystem
         require 'find'
 
-        root_path = ENV.fetch('RAILS_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
+        root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
 
-        Find.find(File.join(root_path, 'media_attachments', 'files')) do |path|
+        Find.find(File.join(*[root_path, prefix].compact)) do |path|
           next if File.directory?(path)
 
-          key           = path.gsub("#{root_path}#{File::SEPARATOR}", '')
-          attachment_id = key.split(File::SEPARATOR)[2..-2].join.to_i
-          filename      = key.split(File::SEPARATOR).last
-          attachment    = MediaAttachment.find_by(id: attachment_id)
+          key             = path.gsub("#{root_path}#{File::SEPARATOR}", '')
+          path_segments   = key.split(File::SEPARATOR)
+          model_name      = path_segments.first.classify
+          record_id       = path_segments[2..-2].join.to_i
+          attachment_name = path_segments[1].singularize
+          file_name       = path_segments.last
+
+          next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+
+          record     = model_name.constantize.find_by(id: record_id)
+          attachment = record&.public_send(attachment_name)
 
           progress.increment
 
-          next unless attachment.nil? || !attachment.variant?(filename)
+          next unless attachment.blank? || !attachment.variant?(file_name)
 
           begin
             size = File.size(path)
@@ -213,25 +227,66 @@ module Mastodon
       say("Settings:\t#{number_to_human_size(SiteUpload.sum(:file_file_size))}")
     end
 
-    desc 'lookup', 'Lookup where media is displayed by passing a media URL'
-    def lookup
-      prompt = TTY::Prompt.new
+    desc 'lookup URL', 'Lookup where media is displayed by passing a media URL'
+    def lookup(url)
+      path          = Addressable::URI.parse(url).path
+      path_segments = path.split('/')[2..-1]
+      model_name    = path_segments.first.classify
+      record_id     = path_segments[2..-2].join.to_i
 
-      url = prompt.ask('Please enter a URL to the media to lookup:', required: true)
+      unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+        say("Cannot find corresponding model: #{model_name}", :red)
+        exit(1)
+      end
 
-      attachment_id = url
-                      .split('/')[0..-2]
-                      .grep(/\A\d+\z/)
-                      .join('')
+      record = model_name.constantize.find_by(id: record_id)
+      record = record.status if record.respond_to?(:status)
 
-      if url.split('/')[0..-2].include? 'media_attachments'
-        model = MediaAttachment.find(attachment_id).status
-        prompt.say(ActivityPub::TagManager.instance.url_for(model))
-      elsif url.split('/')[0..-2].include? 'accounts'
-        model = Account.find(attachment_id)
-        prompt.say(ActivityPub::TagManager.instance.url_for(model))
-      else
-        prompt.say('Not found')
+      unless record
+        say('Cannot find corresponding record', :red)
+        exit(1)
+      end
+
+      display_url = ActivityPub::TagManager.instance.url_for(record)
+
+      if display_url.blank?
+        say('No public URL for this type of record', :red)
+        exit(1)
+      end
+
+      say(display_url, :blue)
+    rescue Addressable::URI::InvalidURIError
+      say('Invalid URL', :red)
+      exit(1)
+    end
+
+    private
+
+    PRELOAD_MODEL_WHITELIST = %w(
+      Account
+      Backup
+      CustomEmoji
+      Import
+      MediaAttachment
+      PreviewCard
+      SiteUpload
+    ).freeze
+
+    def preload_records_from_mixed_objects(objects)
+      preload_map = Hash.new { |hash, key| hash[key] = [] }
+
+      objects.map do |object|
+        segments   = object.key.split('/').first
+        model_name = segments.first.classify
+        record_id  = segments[2..-2].join.to_i
+
+        next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
+
+        preload_map[model_name] << record_id
+      end
+
+      preload_map.each_with_object({}) do |(model_name, record_ids), model_map|
+        model_map[model_name] = model_name.constantize.where(id: record_ids).each_with_object({}) { |record, record_map| record_map[record.id] = record }
       end
     end
   end
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index f11d94a45..e9db9122f 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -14,7 +14,9 @@ def setup_redis_env_url(prefix = nil, defaults = true)
   ENV[prefix + 'REDIS_URL'] = if [password, host, port, db].all?(&:nil?)
                                 ENV['REDIS_URL']
                               else
-                                "redis://#{password.blank? ? '' : ":#{password}@"}#{host}:#{port}/#{db}"
+                                Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+                                  uri.password = password if password.present?
+                                end.normalize.to_str
                               end
 end
 
diff --git a/lib/mastodon/statuses_cli.rb b/lib/mastodon/statuses_cli.rb
index ecaac17e3..b9dccdd8a 100644
--- a/lib/mastodon/statuses_cli.rb
+++ b/lib/mastodon/statuses_cli.rb
@@ -14,6 +14,7 @@ module Mastodon
 
     option :days, type: :numeric, default: 90
     option :clean_followed, type: :boolean
+    option :skip_media_remove, type: :boolean
     desc 'remove', 'Remove unreferenced statuses'
     long_desc <<~LONG_DESC
       Remove statuses that are not referenced by local user activity, such as
@@ -58,9 +59,10 @@ module Mastodon
 
       scope.in_batches.delete_all
 
-      say('Beginning removal of now-orphaned media attachments to free up disk space...')
-
-      Scheduler::MediaCleanupScheduler.new.perform
+      unless options[:skip_media_remove]
+        say('Beginning removal of now-orphaned media attachments to free up disk space...')
+        Scheduler::MediaCleanupScheduler.new.perform
+      end
 
       say("Done after #{Time.now.to_f - start_at}s", :green)
     ensure
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index ed8bc96cd..00ac7753f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      2
+      3
     end
 
     def flags
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
new file mode 100644
index 000000000..d9ec0159a
--- /dev/null
+++ b/lib/paperclip/attachment_extensions.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Paperclip
+  module AttachmentExtensions
+    # We overwrite this method to support delayed processing in
+    # Sidekiq. Since we process the original file to reduce disk
+    # usage, and we still want to generate thumbnails straight
+    # away, it's the only style we need to exclude
+    def process_style?(style_name, style_args)
+      if style_name == :original && instance.respond_to?(:delay_processing?) && instance.delay_processing?
+        false
+      else
+        style_args.empty? || style_args.include?(style_name)
+      end
+    end
+
+    def reprocess_original!
+      old_original_path = path(:original)
+      reprocess!(:original)
+      new_original_path = path(:original)
+
+      if new_original_path != old_original_path
+        @queued_for_delete << old_original_path
+        flush_deletes
+      end
+    end
+
+    def variant?(other_filename)
+      return true  if original_filename == other_filename
+      return false if original_filename.nil?
+
+      formats = styles.values.map(&:format).compact
+
+      return false if formats.empty?
+
+      other_extension = File.extname(other_filename)
+
+      formats.include?(other_extension.delete('.')) && File.basename(other_filename, other_extension) == File.basename(original_filename, File.extname(original_filename))
+    end
+  end
+end
+
+Paperclip::Attachment.prepend(Paperclip::AttachmentExtensions)
diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb
new file mode 100644
index 000000000..1079efdbc
--- /dev/null
+++ b/lib/paperclip/url_generator_extensions.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Paperclip
+  module UrlGeneratorExtensions
+    # Monkey-patch Paperclip to use Addressable::URI's normalization instead
+    # of the long-deprecated URI.esacpe
+    def escape_url(url)
+      if url.respond_to?(:escape)
+        url.escape
+      else
+        Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
+      end
+    end
+  end
+end
+
+Paperclip::UrlGenerator.prepend(Paperclip::UrlGeneratorExtensions)
diff --git a/lib/paperclip/video_transcoder.rb b/lib/paperclip/video_transcoder.rb
index 66f7feda5..4d9544231 100644
--- a/lib/paperclip/video_transcoder.rb
+++ b/lib/paperclip/video_transcoder.rb
@@ -5,12 +5,22 @@ module Paperclip
   # to check when uploaded videos are actually gifv's
   class VideoTranscoder < Paperclip::Processor
     def make
-      meta = ::Av.cli.identify(@file.path)
+      movie = FFMPEG::Movie.new(@file.path)
 
-      attachment.instance.type = MediaAttachment.types[:gifv] unless meta[:audio_encode]
-      options[:format] = File.extname(attachment.instance.file_file_name)[1..-1] if options[:keep_same_format]
+      attachment.instance.type = MediaAttachment.types[:gifv] unless movie.audio_codec
 
-      Paperclip::Transcoder.make(file, options, attachment)
+      Paperclip::Transcoder.make(file, actual_options(movie), attachment)
+    end
+
+    private
+
+    def actual_options(movie)
+      opts = options[:passthrough_options]
+      if opts && opts[:video_codecs].include?(movie.video_codec) && opts[:audio_codecs].include?(movie.audio_codec) && opts[:colorspaces].include?(movie.colorspace)
+        opts[:options]
+      else
+        options
+      end
     end
   end
 end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 2e92e8ded..a873335d4 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -336,7 +336,20 @@ namespace :mastodon do
       if prompt.yes?('Save configuration?')
         cmd = TTY::Command.new(printer: :quiet)
 
-        File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env.each_pair.map { |key, value| "#{key}=#{value}" }.join("\n") + "\n")
+        env_contents = env.each_pair.map do |key, value|
+          if value.is_a?(String) && value =~ /[\s\#\\"]/
+            if value =~ /[']/
+              value = value.to_s.gsub(/[\\"\$]/) { |x| "\\#{x}" }
+              "#{key}=\"#{value}\""
+            else
+              "#{key}='#{value}'"
+            end
+          else
+            "#{key}=#{value}"
+          end
+        end.join("\n")
+
+        File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env_contents + "\n")
 
         if using_docker
           prompt.ok 'Below is your configuration, save it to an .env.production file outside Docker:'
diff --git a/package.json b/package.json
index 1a873615d..c9927bb47 100644
--- a/package.json
+++ b/package.json
@@ -59,23 +59,24 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.8.4",
+    "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-transform-react-inline-elements": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "@babel/runtime": "^7.8.3",
+    "@babel/plugin-transform-react-inline-elements": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.9.4",
+    "@babel/runtime": "^7.8.4",
     "@clusterws/cws": "^0.17.3",
     "@gamestdio/websocket": "^0.3.2",
+    "@rails/ujs": "^6.0.2",
     "array-includes": "^3.1.1",
     "arrow-key-navigation": "^1.1.0",
-    "autoprefixer": "^9.7.4",
+    "autoprefixer": "^9.7.5",
     "axios": "^0.19.2",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.1.0",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^4.0.0",
+    "babel-plugin-preval": "^5.0.0",
     "babel-plugin-react-intl": "^3.4.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
@@ -83,7 +84,7 @@
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^3.1.0",
     "copy-webpack-plugin": "^5.1.1",
-    "cross-env": "^6.0.3",
+    "cross-env": "^7.0.2",
     "css-loader": "^3.4.2",
     "cssnano": "^4.1.10",
     "detect-passive-events": "^1.0.2",
@@ -93,7 +94,7 @@
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
     "express": "^4.17.1",
-    "file-loader": "^5.0.2",
+    "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.6",
     "history": "^4.10.1",
@@ -110,7 +111,7 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.1",
     "mini-css-extract-plugin": "^0.9.0",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.3",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
@@ -123,11 +124,10 @@
     "promise.prototype.finally": "^3.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "rails-ujs": "^5.2.4",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.0",
     "react-hotkeys": "^1.1.4",
-    "react-immutable-proptypes": "^2.1.0",
+    "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.9.0",
     "react-masonry-infinite": "^1.2.2",
@@ -138,12 +138,12 @@
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^3.0.8",
+    "react-select": "^3.1.0",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.9",
     "react-textarea-autosize": "^7.1.2",
     "react-toggle": "^4.1.1",
-    "redis": "^2.7.1",
+    "redis": "^3.0.2",
     "redux": "^4.0.5",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
@@ -151,40 +151,43 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.25.0",
+    "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "stacktrace-js": "^2.0.2",
-    "stringz": "^2.0.0",
+    "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
     "terser-webpack-plugin": "^2.3.5",
     "tesseract.js": "^2.0.0-alpha.16",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^3.4.0",
+    "uuid": "^7.0.2",
     "wavesurfer.js": "^3.3.1",
-    "webpack": "^4.41.5",
+    "webpack": "^4.42.1",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.6.0",
+    "webpack-bundle-analyzer": "^3.6.1",
     "webpack-cli": "^3.3.11",
     "webpack-merge": "^4.2.1",
-    "wicg-inert": "^3.0.0"
+    "wicg-inert": "^3.0.2"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^25.2.4",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
     "eslint-plugin-import": "~2.20.1",
     "eslint-plugin-jsx-a11y": "~6.2.3",
     "eslint-plugin-promise": "~4.2.1",
-    "eslint-plugin-react": "~7.17.0",
+    "eslint-plugin-react": "~7.19.0",
     "jest": "^24.9.0",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.13.0",
     "sass-lint": "^1.13.1",
-    "webpack-dev-server": "^3.10.1",
-    "yargs": "^15.1.0"
+    "webpack-dev-server": "^3.10.3",
+    "yargs": "^15.3.1"
+  },
+  "resolutions": {
+    "kind-of": "^6.0.3"
   }
 }
diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb
index ac15499be..9a93e1ebe 100644
--- a/spec/controllers/account_follow_controller_spec.rb
+++ b/spec/controllers/account_follow_controller_spec.rb
@@ -25,7 +25,7 @@ describe AccountFollowController do
       sign_in(user)
       subject
 
-      expect(service).to have_received(:call).with(user.account, 'alice')
+      expect(service).to have_received(:call).with(user.account, alice, with_rate_limit: true)
       expect(response).to redirect_to(account_path(alice))
     end
   end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index b428299ee..49d3e9707 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -46,6 +46,26 @@ describe Admin::ReportsController do
     end
   end
 
+  describe 'POST #resolve' do
+    it 'resolves the report' do
+      report = Fabricate(:report)
+
+      put :resolve, params: { id: report }
+      expect(response).to redirect_to(admin_reports_path)
+      report.reload
+      expect(report.action_taken_by_account).to eq user.account
+      expect(report.action_taken).to eq true
+    end
+
+    it 'sets trust level when the report is an antispam one' do
+      report = Fabricate(:report, account: Account.representative)
+
+      put :resolve, params: { id: report }
+      report.reload
+      expect(report.target_account.trust_level).to eq Account::TRUST_LEVELS[:trusted]
+    end
+  end
+
   describe 'POST #reopen' do
     it 'reopens the report' do
       report = Fabricate(:report)
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index 9ff5fcd3b..df8037038 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -39,12 +39,50 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
     describe 'POST #create' do
       let(:scopes) { 'write:statuses' }
 
-      before do
-        post :create, params: { status: 'Hello world' }
+      context do
+        before do
+          post :create, params: { status: 'Hello world' }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
       end
 
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
+      context 'with missing parameters' do
+        before do
+          post :create, params: {}
+        end
+
+        it 'returns http unprocessable entity' do
+          expect(response).to have_http_status(422)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+        end
+      end
+
+      context 'when exceeding rate limit' do
+        before do
+          rate_limiter = RateLimiter.new(user.account, family: :statuses)
+          300.times { rate_limiter.record! }
+          post :create, params: { status: 'Hello world' }
+        end
+
+        it 'returns http too many requests' do
+          expect(response).to have_http_status(429)
+        end
+
+        it 'returns rate limit headers' do
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq '0'
+        end
       end
     end
 
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index 3202167ca..b6de3e9d1 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -39,7 +39,7 @@ feature 'Profile' do
     visit settings_profile_path
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
-    click_on 'Save changes'
+    first('.btn[type=submit]').click
     is_expected.to have_content 'Changes successfully saved!'
 
     # View my own public profile and see the changes
diff --git a/spec/helpers/admin/action_log_helper_spec.rb b/spec/helpers/admin/action_log_helper_spec.rb
index d7af6b939..60f5ecdcc 100644
--- a/spec/helpers/admin/action_log_helper_spec.rb
+++ b/spec/helpers/admin/action_log_helper_spec.rb
@@ -31,242 +31,4 @@ RSpec.describe Admin::ActionLogsHelper, type: :helper do
       end
     end
   end
-
-  describe '#relevant_log_changes' do
-    let(:log) { double(target_type: target_type, action: log_action, recorded_changes: recorded_changes) }
-    let(:recorded_changes) { double }
-
-    after do
-      hoge.relevant_log_changes(log)
-    end
-
-    context "log.target_type == 'CustomEmoji' && [:enable, :disable, :destroy].include?(log.action)" do
-      let(:target_type) { 'CustomEmoji' }
-      let(:log_action)  { :enable }
-
-      it "calls log.recorded_changes.slice('domain')" do
-        expect(recorded_changes).to receive(:slice).with('domain')
-      end
-    end
-
-    context "log.target_type == 'CustomEmoji' && log.action == :update" do
-      let(:target_type) { 'CustomEmoji' }
-      let(:log_action)  { :update }
-
-      it "calls log.recorded_changes.slice('domain', 'visible_in_picker')" do
-        expect(recorded_changes).to receive(:slice).with('domain', 'visible_in_picker')
-      end
-    end
-
-    context "log.target_type == 'User' && [:promote, :demote].include?(log.action)" do
-      let(:target_type) { 'User' }
-      let(:log_action)  { :promote }
-
-      it "calls log.recorded_changes.slice('moderator', 'admin')" do
-        expect(recorded_changes).to receive(:slice).with('moderator', 'admin')
-      end
-    end
-
-    context "log.target_type == 'User' && [:change_email].include?(log.action)" do
-      let(:target_type) { 'User' }
-      let(:log_action)  { :change_email }
-
-      it "calls log.recorded_changes.slice('email', 'unconfirmed_email')" do
-        expect(recorded_changes).to receive(:slice).with('email', 'unconfirmed_email')
-      end
-    end
-
-    context "log.target_type == 'DomainBlock'" do
-      let(:target_type) { 'DomainBlock' }
-      let(:log_action)  { nil }
-
-      it "calls log.recorded_changes.slice('severity', 'reject_media')" do
-        expect(recorded_changes).to receive(:slice).with('severity', 'reject_media')
-      end
-    end
-
-    context "log.target_type == 'Status' && log.action == :update" do
-      let(:target_type) { 'Status' }
-      let(:log_action)  { :update }
-
-      it "log.recorded_changes.slice('sensitive')" do
-        expect(recorded_changes).to receive(:slice).with('sensitive')
-      end
-    end
-  end
-
-  describe '#log_extra_attributes' do
-    after do
-      hoge.log_extra_attributes(hoge: 'hoge')
-    end
-
-    it "calls content_tag(:span, key, class: 'diff-key')" do
-      allow(hoge).to receive(:log_change).with(anything)
-      expect(hoge).to receive(:content_tag).with(:span, :hoge, class: 'diff-key')
-    end
-
-    it 'calls safe_join twice' do
-      expect(hoge).to receive(:safe_join).with(
-        ['<span class="diff-key">hoge</span>',
-         '=',
-         '<span class="diff-neutral">hoge</span>']
-      )
-
-      expect(hoge).to receive(:safe_join).with([nil], ' ')
-    end
-  end
-
-  describe '#log_change' do
-    after do
-      hoge.log_change(val)
-    end
-
-    context '!val.is_a?(Array)' do
-      let(:val) { 'hoge' }
-
-      it "calls content_tag(:span, val, class: 'diff-neutral')" do
-        expect(hoge).to receive(:content_tag).with(:span, val, class: 'diff-neutral')
-      end
-    end
-
-    context 'val.is_a?(Array)' do
-      let(:val) { %w(foo bar) }
-
-      it 'calls #content_tag twice and #safe_join' do
-        expect(hoge).to receive(:content_tag).with(:span, 'foo', class: 'diff-old')
-        expect(hoge).to receive(:content_tag).with(:span, 'bar', class: 'diff-new')
-        expect(hoge).to receive(:safe_join).with([nil, nil], '→')
-      end
-    end
-  end
-
-  describe '#icon_for_log' do
-    subject   { hoge.icon_for_log(log) }
-
-    context "log.target_type == 'Account'" do
-      let(:log) { double(target_type: 'Account') }
-
-      it 'returns "user"' do
-        expect(subject).to be 'user'
-      end
-    end
-
-    context "log.target_type == 'User'" do
-      let(:log) { double(target_type: 'User') }
-
-      it 'returns "user"' do
-        expect(subject).to be 'user'
-      end
-    end
-
-    context "log.target_type == 'CustomEmoji'" do
-      let(:log) { double(target_type: 'CustomEmoji') }
-
-      it 'returns "file"' do
-        expect(subject).to be 'file'
-      end
-    end
-
-    context "log.target_type == 'Report'" do
-      let(:log) { double(target_type: 'Report') }
-
-      it 'returns "flag"' do
-        expect(subject).to be 'flag'
-      end
-    end
-
-    context "log.target_type == 'DomainBlock'" do
-      let(:log) { double(target_type: 'DomainBlock') }
-
-      it 'returns "lock"' do
-        expect(subject).to be 'lock'
-      end
-    end
-
-    context "log.target_type == 'EmailDomainBlock'" do
-      let(:log) { double(target_type: 'EmailDomainBlock') }
-
-      it 'returns "envelope"' do
-        expect(subject).to be 'envelope'
-      end
-    end
-
-    context "log.target_type == 'Status'" do
-      let(:log) { double(target_type: 'Status') }
-
-      it 'returns "pencil"' do
-        expect(subject).to be 'pencil'
-      end
-    end
-  end
-
-  describe '#class_for_log_icon' do
-    subject   { hoge.class_for_log_icon(log) }
-
-    %i(enable unsuspend unsilence confirm promote resolve).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-    end
-
-    context 'log.action == :create' do
-      context 'opposite_verbs?(log)' do
-        let(:log) { double(action: :create, target_type: 'DomainBlock') }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-
-      context '!opposite_verbs?(log)' do
-        let(:log) { double(action: :create, target_type: '') }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-    end
-
-    %i(update reset_password disable_2fa memorialize change_email).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "neutral"' do
-          expect(subject).to be 'neutral'
-        end
-      end
-    end
-
-    %i(demote silence disable suspend remove_avatar remove_header reopen).each do |action|
-      context "log.action == #{action}" do
-        let(:log) { double(action: action) }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-    end
-
-    context 'log.action == :destroy' do
-      context 'opposite_verbs?(log)' do
-        let(:log) { double(action: :destroy, target_type: 'DomainBlock') }
-
-        it 'returns "positive"' do
-          expect(subject).to be 'positive'
-        end
-      end
-
-      context '!opposite_verbs?(log)' do
-        let(:log) { double(action: :destroy, target_type: '') }
-
-        it 'returns "negative"' do
-          expect(subject).to be 'negative'
-        end
-      end
-    end
-  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6fbceca53..40ddf1f95 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -15,7 +15,7 @@ ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!(allow: Chewy.settings[:host])
 Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
 Sidekiq::Testing.inline!
-Sidekiq::Logging.logger = nil
+Sidekiq.logger = nil
 
 Devise::Test::ControllerHelpers.module_eval do
   alias_method :original_sign_in, :sign_in
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 5355133f4..7618e9076 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -91,10 +91,6 @@ RSpec.describe ImportService, type: :service do
 
     let(:csv) { attachment_fixture('mute-imports.txt') }
 
-    before do
-      allow(NotificationWorker).to receive(:perform_async)
-    end
-
     describe 'when no accounts are followed' do
       let(:import) { Import.create(account: account, type: 'following', data: csv) }
       it 'follows the listed accounts, including boosts' do
@@ -135,10 +131,6 @@ RSpec.describe ImportService, type: :service do
 
     let(:csv) { attachment_fixture('new-following-imports.txt') }
 
-    before do
-      allow(NotificationWorker).to receive(:perform_async)
-    end
-
     describe 'when no accounts are followed' do
       let(:import) { Import.create(account: account, type: 'following', data: csv) }
       it 'follows the listed accounts, respecting boosts' do
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 025a3da40..147a59fc3 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -79,6 +79,13 @@ RSpec.describe PostStatusService, type: :service do
     expect(status.spoiler_text).to eq spoiler_text
   end
 
+  it 'creates a sensitive status when there is a CW but no text' do
+    status = subject.call(Fabricate(:account), text: '', spoiler_text: 'foo')
+
+    expect(status).to be_persisted
+    expect(status).to be_sensitive
+  end
+
   it 'creates a status with empty default spoiler text' do
     status = create_status_with_options(spoiler_text: nil)
 
diff --git a/yarn.lock b/yarn.lock
index 8814eb961..6018c5859 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,42 +9,43 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.0", "@babel/compat-data@^7.8.1":
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.1.tgz#fc0bbbb7991e4fb2b47e168e60f2cc2c41680be9"
-  integrity sha512-Z+6ZOXvyOWYxJ50BwxzdhRnRsGST8Y3jaZgxYig575lTjVSs3KtJnmESwZegg6e2Dn0td1eDhoWlp1wI4BTCPw==
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
   dependencies:
-    browserslist "^4.8.2"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
-  integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
+"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.4"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
+    json5 "^2.1.2"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
-  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
+"@babel/generator@^7.0.0", "@babel/generator@^7.9.0":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.3.tgz#7c8b2956c6f68b3ab732bd16305916fbba521d94"
+  integrity sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.9.0"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -64,32 +65,32 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6"
-  integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==
+"@babel/helper-builder-react-jsx-experimental@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz#066d80262ade488f9c1b1823ce5db88a4cedaa43"
+  integrity sha512-3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ==
   dependencies:
-    "@babel/types" "^7.8.3"
-    esutils "^2.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-builder-react-jsx@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
+  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
-"@babel/helper-compilation-targets@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.3.tgz#2deedc816fd41dca7355ef39fd40c9ea69f0719a"
-  integrity sha512-JLylPCsFjhLN+6uBSSh3iYdxKdeO9MNmoY96PE/99d8kyBFaXLORtAVhqN6iHa+wtPeqxKLghDOZry0+Aiw9Tw==
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
-    "@babel/compat-data" "^7.8.1"
-    browserslist "^4.8.2"
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
-    levenary "^1.1.0"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.8.3":
@@ -112,6 +113,15 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.6.0"
 
+"@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
@@ -166,16 +176,17 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590"
-  integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-simple-access" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
@@ -218,6 +229,16 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
@@ -233,6 +254,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
+  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -243,14 +269,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
-  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
   dependencies:
     "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
 
 "@babel/highlight@^7.8.3":
   version "7.8.3"
@@ -261,10 +287,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
-  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.3.tgz#043a5fc2ad8b7ea9facddc4e802a1f0f25da7255"
+  integrity sha512-E6SpIDJZ0cZAKoCNk+qSDd0ChfTnpiJN9FfNf3RZ20dzwA2vL2oq5IX1XTVT+4vDmRlta2nGk5HGMMskJAR+4A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -316,10 +342,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.8.3":
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb"
-  integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f"
+  integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -332,20 +366,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"
-  integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
-  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
@@ -355,6 +389,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-bigint@^7.0.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-decorators@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
@@ -390,6 +431,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
@@ -449,17 +497,17 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"
-  integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==
+"@babel/plugin-transform-classes@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d"
+  integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
@@ -477,7 +525,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -500,10 +548,10 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.3.tgz#15f17bce2fc95c7d59a24b299e83e81cedc22e18"
-  integrity sha512-ZjXznLNTxhpf4Q5q3x1NsngzGA38t9naWH8Gt+0qYZEJAcvPI9waSStSh56u19Ofjr7QmD0wUsQ8hw8s/p1VnA==
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -529,41 +577,41 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5"
-  integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==
+"@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5"
-  integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"
-  integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a"
-  integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
@@ -588,12 +636,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.3.tgz#7890576a13b17325d8b7d44cb37f21dc3bbdda59"
-  integrity sha512-/pqngtGb54JwMBZ6S/D3XYylQDFtGjWrnoCF4gXZOUpFV/ujbxnoNGNvDGu6doFWRPBveE72qTx/RRU44j5I/Q==
+"@babel/plugin-transform-parameters@^7.8.7":
+  version "7.9.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a"
+  integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -611,45 +658,55 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-inline-elements@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.8.3.tgz#fc234d02a35bb188ee3f933d068824e067e42b23"
-  integrity sha512-CGKUlW3vtgk6YYrIMyfpohmmpILnaeFwszqwTIcem2LQkK1qWJj5w2yTZ7LJr2IR8F0XQ60AZoM8jgAB4zpxCg==
+"@babel/plugin-transform-react-inline-elements@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.9.0.tgz#19a39843431803765c9976132198bd8dee3d8058"
+  integrity sha512-iqqKXtOfVZpbgJ+9D4TG+JO/vgxa29FlpPUSIATzIcopKMUd3/bdwIjrrEneNp+SeiJs74nqKfUFYAUPDEu/qw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702"
-  integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==
+"@babel/plugin-transform-react-jsx-development@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
+  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+  dependencies:
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
+
+"@babel/plugin-transform-react-jsx-self@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
+  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0"
-  integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==
+"@babel/plugin-transform-react-jsx-source@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
+  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a"
-  integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==
+"@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
+  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -658,10 +715,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
-  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -698,10 +755,10 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.3.tgz#5cffb216fb25c8c64ba6bf5f76ce49d3ab079f4d"
-  integrity sha512-3TrkKd4LPqm4jHs6nPtSDI/SV9Cm5PRJkHLUgTcqRQQTMAZ44ZaAdDZJtvWFSaRcvT0a1rTmJ5ZA5tDKjleF3g==
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -713,27 +770,29 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.3.tgz#dc0fb2938f52bbddd79b3c861a4b3427dd3a6c54"
-  integrity sha512-Rs4RPL2KjSLSE2mWAx5/iCH+GC1ikKdxPrhnRS6PfFVaiZeom22VFKN4X8ZthyN61kAaR05tfXTbCvatl9WIQg==
+"@babel/preset-env@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
+  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
   dependencies:
-    "@babel/compat-data" "^7.8.0"
-    "@babel/helper-compilation-targets" "^7.8.3"
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
     "@babel/plugin-proposal-dynamic-import" "^7.8.3"
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
@@ -742,50 +801,71 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.0"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
     "@babel/plugin-transform-destructuring" "^7.8.3"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
     "@babel/plugin-transform-sticky-regex" "^7.8.3"
     "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    browserslist "^4.8.2"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.0"
+    browserslist "^4.9.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
-    levenary "^1.1.0"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-react@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2"
-  integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/preset-react@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
+  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-self" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-source" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+
+"@babel/runtime-corejs3@^7.8.3":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c"
+  integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==
+  dependencies:
+    core-js-pure "^3.0.0"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@7.0.0":
   version "7.0.0"
@@ -801,43 +881,43 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
-  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
+"@babel/template@^7.0.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
-  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
+  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
+    "@babel/generator" "^7.9.0"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.3.0", "@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
+  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
   dependencies:
-    esutils "^2.0.2"
+    "@babel/helper-validator-identifier" "^7.9.0"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -936,6 +1016,21 @@
   resolved "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz#321ba0976ee30fd14e51dbf8faa85ce7b325f76a"
   integrity sha512-J3n5SKim+ZoLbe44hRGI/VYAwSMCeIJuBy+FfP6EZaujEpNchPRFcIsVQLWAwpU1bP2Ji63rC+rEUOd1vjUB6Q==
 
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
+  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -1093,6 +1188,28 @@
     source-map "^0.6.1"
     write-file-atomic "2.4.1"
 
+"@jest/transform@^25.2.4":
+  version "25.2.4"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.4.tgz#34336f37f13f62f7d1f5b93d5d150ba9eb3e11b9"
+  integrity sha512-6eRigvb+G6bs4kW5j1/y8wu4nCrmVuIe0epPBbiWaYlwawJ8yi1EIyK3d/btDqmBpN5GpN4YhR6iPPnDmkYdTA==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^25.2.3"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^3.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-haste-map "^25.2.3"
+    jest-regex-util "^25.2.1"
+    jest-util "^25.2.3"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    realpath-native "^2.0.0"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
@@ -1102,6 +1219,21 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jest/types@^25.2.3":
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6"
+  integrity sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
+"@rails/ujs@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.2.tgz#8d32452d51c5e115374a218fb5475803dc17f4c0"
+  integrity sha512-KSQjJG8yzSWC1IT+UtFQglefABU37hpJ7uAz39K1/iWtoaJaI9ydGIaxxpJBT/PmYv4kS6lCSjXq13DELeJocw==
+
 "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.2":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
@@ -1218,150 +1350,156 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+"@types/yargs@^15.0.0":
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
+  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@types/yargs-parser" "*"
 
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
 
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
 
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -1412,11 +1550,16 @@ acorn-jsx@^5.1.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn-walk@^6.0.1, acorn-walk@^6.1.1:
+acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
+acorn-walk@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -1427,15 +1570,15 @@ acorn@^5.5.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
   integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.0, acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 aggregate-error@^3.0.0:
   version "3.0.1"
@@ -1494,6 +1637,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -1571,6 +1724,14 @@ ansi-styles@^4.0.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1587,6 +1748,14 @@ anymatch@^3.0.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1773,18 +1942,18 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.7.4:
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
-  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
+autoprefixer@^9.7.5:
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376"
+  integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==
   dependencies:
-    browserslist "^4.8.3"
-    caniuse-lite "^1.0.30001020"
+    browserslist "^4.11.0"
+    caniuse-lite "^1.0.30001036"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.26"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.27"
+    postcss-value-parser "^4.0.3"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1843,15 +2012,29 @@ babel-jest@^24.9.0:
     chalk "^2.4.2"
     slash "^2.0.0"
 
-babel-loader@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
-  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+babel-jest@^25.2.4:
+  version "25.2.4"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.4.tgz#b21b68d3af8f161c3e6e501e91f0dea8e652e344"
+  integrity sha512-+yDzlyJVWrqih9i2Cvjpt7COaN8vUwCsKGtxJLzg6I0xhxD54K8mvDUCliPKLufyzHh/c5C4MRj4Vk7VMjOjIg==
   dependencies:
-    find-cache-dir "^2.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
+    "@jest/transform" "^25.2.4"
+    "@jest/types" "^25.2.3"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^25.2.1"
+    chalk "^3.0.0"
+    slash "^3.0.0"
+
+babel-loader@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  dependencies:
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
     pify "^4.0.1"
+    schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
@@ -1885,6 +2068,17 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.0.0"
     test-exclude "^5.0.0"
 
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
 babel-plugin-jest-hoist@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
@@ -1892,6 +2086,13 @@ babel-plugin-jest-hoist@^24.9.0:
   dependencies:
     "@types/babel__traverse" "^7.0.6"
 
+babel-plugin-jest-hoist@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.1.tgz#d0003a1f3d5caa281e1107fe03bbf16b799f9955"
+  integrity sha512-HysbCQfJhxLlyxDbKcB2ucGYV0LjqK4h6dBoI3RtFuOxTiTWK6XGZMsHb0tGh8iJdV4hC6Z2GCHzVvDeh9i0lQ==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"
+
 babel-plugin-lodash@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
@@ -1903,22 +2104,22 @@ babel-plugin-lodash@^3.3.4:
     lodash "^4.17.10"
     require-package-name "^2.0.1"
 
-babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.2.tgz#98ae30a02645dfa8033628fe613854ec9541bbc8"
-  integrity sha512-Ntviq8paRTkXIxvrJBauib+2KqQbZQuh4593CEZFF8qz3IVP8VituTZmkGe6N7rsuiOIbejxXj6kx3LMlEq0UA==
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
+  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
   dependencies:
     "@babel/runtime" "^7.7.2"
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-preval@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-4.0.0.tgz#edb8501167985752aafcc31086791e1314052e9d"
-  integrity sha512-fZI/4cYneinlj2k/FsXw0/lTWSC5KKoepUueS1g25Gb5vx3GrRyaVwxWCshYqx11GEU4mZnbbFhee8vpquFS2w==
+babel-plugin-preval@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz#6cabb947ecc241664966e1f99eb56a3b4bb63d1e"
+  integrity sha512-8DqJq6/LPUjSZ0Qq6bVIFpsj2flCEE0Cbnbut9TvGU6jP9g3dOWEXtQ/sdvsA9d6souza8eNGh04WRXpuH9ThA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    babel-plugin-macros "^2.6.1"
+    "@babel/runtime" "^7.9.2"
+    babel-plugin-macros "^2.8.0"
     require-from-string "^2.0.2"
 
 babel-plugin-react-intl@^3.4.1:
@@ -1950,6 +2151,15 @@ babel-preset-jest@^24.9.0:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
     babel-plugin-jest-hoist "^24.9.0"
 
+babel-preset-jest@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2"
+  integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A==
+  dependencies:
+    "@babel/plugin-syntax-bigint" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^25.2.1"
+
 babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -2100,7 +2310,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2:
+braces@^3.0.1, braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2190,14 +2400,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.8.2, browserslist@^4.8.3:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
-  integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
+browserslist@^4.0.0, browserslist@^4.11.0, browserslist@^4.8.3, browserslist@^4.9.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
+  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
   dependencies:
-    caniuse-lite "^1.0.30001017"
-    electron-to-chromium "^1.3.322"
-    node-releases "^1.1.44"
+    caniuse-lite "^1.0.30001038"
+    electron-to-chromium "^1.3.390"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -2366,10 +2577,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020:
-  version "1.0.30001021"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254"
-  integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038:
+  version "1.0.30001038"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff"
+  integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -2403,6 +2614,19 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2648,12 +2872,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9"
-  integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==
-
-commander@~2.20.3:
+commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2814,6 +3033,11 @@ core-js-compat@^3.6.2:
     browserslist "^4.8.3"
     semver "7.0.0"
 
+core-js-pure@^3.0.0:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
+  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
+
 core-js@^2.4.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042"
@@ -2886,12 +3110,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+cross-env@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
+  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.1"
 
 cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
@@ -2904,7 +3128,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
   integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
@@ -3161,6 +3385,11 @@ csstype@^2.5.7:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"
   integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==
 
+csstype@^2.6.7:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
+  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -3325,6 +3554,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+denque@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3443,6 +3677,14 @@ dom-helpers@^3.2.1, dom-helpers@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
+dom-helpers@^5.0.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
+  integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+  dependencies:
+    "@babel/runtime" "^7.6.3"
+    csstype "^2.6.7"
+
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -3516,11 +3758,6 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-double-ended-queue@^2.1.0-0:
-  version "2.1.0-0"
-  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -3554,10 +3791,10 @@ ejs@^2.3.4, ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
   integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
 
-electron-to-chromium@^1.3.322:
-  version "1.3.322"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
-  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
+electron-to-chromium@^1.3.390:
+  version "1.3.391"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.391.tgz#9b7ee2f387814ad7d37addaafe41c8f4c4498d24"
+  integrity sha512-WOi6loSnDmfICOqGRrgeK7bZeWDAbGjCptDhI5eyJAqSzWfoeRuOOU1rOTZRL29/9AaxTndZB6Uh8YrxRfZJqw==
 
 elliptic@^6.0.0:
   version "6.5.1"
@@ -3591,6 +3828,11 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3701,7 +3943,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.13.0, es-abstract@^1.15.0, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.5.1:
+es-abstract@^1.13.0, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.5.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
   integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
@@ -3859,11 +4101,6 @@ eslint-module-utils@^2.4.1:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-eslint-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
-  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
-
 eslint-plugin-import@~2.20.1:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
@@ -3902,21 +4139,23 @@ eslint-plugin-promise@~4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
   integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
-eslint-plugin-react@~7.17.0:
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
-  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
+eslint-plugin-react@~7.19.0:
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
+  integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     doctrine "^2.1.0"
-    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
     jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.0"
-    object.fromentries "^2.0.1"
-    object.values "^1.1.0"
+    object.entries "^1.1.1"
+    object.fromentries "^2.0.2"
+    object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.13.1"
+    resolve "^1.15.1"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.2"
+    xregexp "^4.3.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -4074,7 +4313,7 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-esutils@^2.0.0, esutils@^2.0.2:
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -4283,6 +4522,11 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -4349,12 +4593,12 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa"
-  integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg==
+file-loader@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz#cb56c070efc0e40666424309bd0d9e45ac6f2bb8"
+  integrity sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==
   dependencies:
-    loader-utils "^1.2.3"
+    loader-utils "^1.4.0"
     schema-utils "^2.5.0"
 
 file-type@^10.5.0:
@@ -4397,7 +4641,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -4614,6 +4858,11 @@ fsevents@^2.0.6:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
   integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
 
+fsevents@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4834,7 +5083,7 @@ graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.2.2:
+graceful-fs@^4.2.2, graceful-fs@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -5360,6 +5609,15 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
+internal-slot@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
+  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    has "^1.0.3"
+    side-channel "^1.0.2"
+
 interpret@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -5499,11 +5757,6 @@ is-boolean-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
   integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-buffer@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
@@ -5762,7 +6015,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -5824,6 +6077,11 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
   integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==
 
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
 istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
@@ -5837,6 +6095,19 @@ istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
     istanbul-lib-coverage "^2.0.3"
     semver "^5.5.0"
 
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
+  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
@@ -5990,6 +6261,25 @@ jest-haste-map@^24.9.0:
   optionalDependencies:
     fsevents "^1.2.7"
 
+jest-haste-map@^25.2.3:
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.3.tgz#2649392b5af191f0167a27bfb62e5d96d7eaaade"
+  integrity sha512-pAP22OHtPr4qgZlJJFks2LLgoQUr4XtM1a+F5UaPIZNiCRnePA0hM3L7aiJ0gzwiNIYwMTfKRwG/S1L28J3A3A==
+  dependencies:
+    "@jest/types" "^25.2.3"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-serializer "^25.2.1"
+    jest-util "^25.2.3"
+    jest-worker "^25.2.1"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+    which "^2.0.2"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
 jest-jasmine2@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
@@ -6066,6 +6356,11 @@ jest-regex-util@^24.9.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
   integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
 
+jest-regex-util@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584"
+  integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w==
+
 jest-resolve-dependencies@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
@@ -6145,6 +6440,11 @@ jest-serializer@^24.9.0:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
   integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
 
+jest-serializer@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a"
+  integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ==
+
 jest-snapshot@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
@@ -6182,6 +6482,16 @@ jest-util@^24.9.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
+jest-util@^25.2.3:
+  version "25.2.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256"
+  integrity sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw==
+  dependencies:
+    "@jest/types" "^25.2.3"
+    chalk "^3.0.0"
+    is-ci "^2.0.0"
+    make-dir "^3.0.0"
+
 jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
@@ -6223,6 +6533,14 @@ jest-worker@^25.1.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a"
+  integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 jest@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
@@ -6350,12 +6668,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+json5@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
+  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsonfile@^3.0.0:
   version "3.0.1"
@@ -6409,29 +6727,10 @@ killable@^1.0.1:
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.2:
   version "3.0.2"
@@ -6465,10 +6764,10 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.0.tgz#fc146fe75f32dc483a0a2c64aef720f602cd6210"
-  integrity sha512-VHcwhO0UTpUW7rLPN2/OiWJdgA1e9BqEDALhrgCe/F+uUJnep6CoUsTzMeP8Rh0NGr9uKquXxqe7lwLZo509nQ==
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
   dependencies:
     leven "^3.1.0"
 
@@ -6520,7 +6819,7 @@ loader-utils@0.2.x:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -6529,6 +6828,15 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6670,11 +6978,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6784,6 +7087,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -6863,11 +7174,6 @@ minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
 minimist@1.1.x:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
@@ -6878,6 +7184,11 @@ minimist@^1.1.1, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -6950,12 +7261,17 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
+  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
 
 moo@^0.4.3:
   version "0.4.3"
@@ -7155,12 +7471,10 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.44:
-  version "1.1.45"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.45.tgz#4cf7e9175d71b1317f15ffd68ce63bce1d53e9f2"
-  integrity sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg==
-  dependencies:
-    semver "^6.3.0"
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -7335,16 +7649,6 @@ object.entries@^1.1.0, object.entries@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
-  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.15.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
 object.fromentries@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
@@ -7856,6 +8160,11 @@ picomatch@^2.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
   integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
 
+picomatch@^2.0.5:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
+  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7911,6 +8220,13 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -8275,10 +8591,10 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
-  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
+  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
 postcss@^5.0.16:
   version "5.2.18"
@@ -8290,10 +8606,10 @@ postcss@^5.0.16:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.26"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
-  integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
+  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -8341,7 +8657,7 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-private@^0.1.6:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -8539,11 +8855,6 @@ railroad-diagrams@^1.0.0:
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
   integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
 
-rails-ujs@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.2.4.tgz#31056ccd62d868f7d044395f31d77a4440550ceb"
-  integrity sha512-Mzu6bnTBKn4IuJvP7BDJRy4lzvR1zMWVDeTdPwDubXBfxpFEKqwOi5Nb6tfE2SYtTd+bb3PRETf40I94jgKw3w==
-
 randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
@@ -8592,15 +8903,15 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
-  integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
+react-dom@^16.13.0:
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866"
+  integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-event-listener@^0.6.0:
   version "0.6.5"
@@ -8622,10 +8933,12 @@ react-hotkeys@^1.1.4:
     mousetrap "^1.5.2"
     prop-types "^15.6.0"
 
-react-immutable-proptypes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
-  integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
+react-immutable-proptypes@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a"
+  integrity sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==
+  dependencies:
+    invariant "^2.2.2"
 
 react-immutable-pure-component@^1.1.1:
   version "1.2.3"
@@ -8768,10 +9081,10 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-select@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.8.tgz#06ff764e29db843bcec439ef13e196865242e0c1"
-  integrity sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==
+react-select@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz#ab098720b2e9fe275047c993f0d0caf5ded17c27"
+  integrity sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
@@ -8780,7 +9093,7 @@ react-select@^3.0.8:
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
     react-input-autosize "^2.2.2"
-    react-transition-group "^2.2.1"
+    react-transition-group "^4.3.0"
 
 react-sparklines@^1.7.0:
   version "1.7.0"
@@ -8820,15 +9133,15 @@ react-swipeable-views@^0.13.9:
     react-swipeable-views-utils "^0.13.9"
     warning "^4.0.1"
 
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f"
-  integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w==
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.13.0:
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.0.tgz#39ba3bf72cedc8210c3f81983f0bb061b14a3014"
+  integrity sha512-NQ2S9gdMUa7rgPGpKGyMcwl1d6D9MCF0lftdI3kts6kkiX+qvpC955jNjAZXlIDTjnN9jwFI8A8XhRh/9v0spA==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     react-is "^16.8.6"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-textarea-autosize@^7.1.2:
   version "7.1.2"
@@ -8855,10 +9168,20 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
-  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
+react-transition-group@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
+  integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+
+react@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -8952,24 +9275,37 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
-redis-commands@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
-  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
+realpath-native@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
+  integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==
 
-redis-parser@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
-  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
+redis-commands@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
+  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
 
-redis@^2.7.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
-  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
   dependencies:
-    double-ended-queue "^2.1.0-0"
-    redis-commands "^1.2.0"
-    redis-parser "^2.6.0"
+    redis-errors "^1.0.0"
+
+redis@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz#bd47067b8a4a3e6a2e556e57f71cc82c7360150a"
+  integrity sha512-PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==
+  dependencies:
+    denque "^1.4.1"
+    redis-commands "^1.5.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
 
 redux-immutable@^4.0.0:
   version "4.0.0"
@@ -9001,6 +9337,13 @@ regenerate-unicode-properties@^8.1.0:
   dependencies:
     regenerate "^1.4.0"
 
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -9016,17 +9359,18 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
-  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+regenerator-runtime@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
 
-regenerator-transform@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
-  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9043,6 +9387,14 @@ regexp.prototype.flags@^1.2.0:
   dependencies:
     define-properties "^1.1.2"
 
+regexp.prototype.flags@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -9060,11 +9412,28 @@ regexpu-core@^4.6.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
 regjsgen@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
   integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
 
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
 regjsparser@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
@@ -9072,6 +9441,13 @@ regjsparser@^0.6.0:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  dependencies:
+    jsesc "~0.5.0"
+
 rellax@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz#1b433ef7ac4aa3573449a33efab391c112f6b34d"
@@ -9212,6 +9588,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
@@ -9232,10 +9613,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
-  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
+resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -9418,10 +9799,10 @@ sass-loader@^8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
-sass@^1.25.0:
-  version "1.25.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.25.0.tgz#f8bd7dfbb39d6b0305e27704a8ebe637820693f3"
-  integrity sha512-uQMjye0Y70SEDGO56n0j91tauqS9E1BmpKHtiYNQScXDHeaE9uHwNEqQNFf4Bes/3DHMNinB6u79JsG10XWNyw==
+sass@^1.26.3:
+  version "1.26.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.3.tgz#412df54486143b76b5a65cdf7569e86f44659f46"
+  integrity sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -9430,10 +9811,10 @@ sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
-  integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
+scheduler@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d"
+  integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -9447,12 +9828,12 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
-  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
+  integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
   dependencies:
-    ajv "^6.10.2"
+    ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
 scroll-behavior@^0.9.1:
@@ -9626,6 +10007,14 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+side-channel@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    object-inspect "^1.7.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -9653,6 +10042,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -10011,6 +10405,18 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string.prototype.matchall@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
+  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    has-symbols "^1.0.1"
+    internal-slot "^1.0.2"
+    regexp.prototype.flags "^1.3.0"
+    side-channel "^1.0.2"
+
 string.prototype.trim@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
@@ -10050,12 +10456,12 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringz@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.0.0.tgz#0a092bc64ed9b42eff2936d0401d2398393d54e9"
-  integrity sha512-pRWc5RGpedKEDvQ/ukYs8kS8tKj+cKu5ayOoyOvsavbpiLBcm1dGX6p1o5IagaN11cbfN8tKGpgQ4fHdEq5LBA==
+stringz@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz#5896b4713eac31157556040fb90258fb02c1630c"
+  integrity sha512-KlywLT+MZ+v0IRepfMxRtnSvDCMc3nR1qqCs3m/qIbSOWkNZYT8XHQA31rS3TnKp0c5xjZu3M4GY/2aRKSi/6A==
   dependencies:
-    unicode-astral-regex "^1.0.1"
+    char-regex "^1.0.2"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -10150,7 +10556,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
   integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -10311,6 +10717,15 @@ test-exclude@^5.0.0:
     read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -10512,6 +10927,13 @@ type@^2.0.0:
   resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
   integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10525,11 +10947,6 @@ uglify-js@^3.1.4:
     commander "~2.20.3"
     source-map "~0.6.1"
 
-unicode-astral-regex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unicode-astral-regex/-/unicode-astral-regex-1.0.1.tgz#2cab8529480646f9614ddbc7b62158ad05123feb"
-  integrity sha512-UP6cmDeiWi8bMDmkyXLRsDuVPTvPjh8Wsz+pHu1VkGgTBl4pUceYAdHXY0cdc6Q3+Z2q7QMzi/0E7L/S/yOvFw==
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -10548,6 +10965,11 @@ unicode-match-property-value-ecmascript@^1.1.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
   integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
 
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
@@ -10694,11 +11116,16 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6"
+  integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==
+
 v8-compile-cache@2.0.3, v8-compile-cache@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
@@ -10813,13 +11240,13 @@ webpack-assets-manifest@^3.1.1:
     tapable "^1.0.0"
     webpack-sources "^1.0.0"
 
-webpack-bundle-analyzer@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
-  integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==
+webpack-bundle-analyzer@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b"
+  integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw==
   dependencies:
-    acorn "^6.0.7"
-    acorn-walk "^6.1.1"
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
     bfj "^6.1.1"
     chalk "^2.4.1"
     commander "^2.18.0"
@@ -10860,10 +11287,10 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz#1ff3e5cccf8e0897aa3f5909c654e623f69b1c0e"
-  integrity sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA==
+webpack-dev-server@^3.10.3:
+  version "3.10.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0"
+  integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -10922,15 +11349,15 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.41.5:
-  version "4.41.5"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c"
-  integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==
+webpack@^4.42.1:
+  version "4.42.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
+  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
     acorn "^6.2.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -10942,7 +11369,7 @@ webpack@^4.41.5:
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
@@ -11014,10 +11441,17 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wicg-inert@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.0.tgz#4f5797172fbf7ff01effd3839b52872e35d3cba2"
-  integrity sha512-sZsYZ8pk8y6CgDLkTxivfhLDBvZuDWTWBawU8OuDdO0Id6AOd1Gqjkvt9g9Ni7rgHIS7UbRvbLSv1z7MSJDYCA==
+which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wicg-inert@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.2.tgz#46d8b01142c1bda8f6fa5d78e2754ba56f6f70be"
+  integrity sha512-L2eSi1fx1M+WLLUccwzAulgK5hZtllRDvYk3UB/fe1ZqdkZS6dz718o6xfe3JUtBEJJnqvI6NF8m1bAHlg3JUg==
 
 wide-align@^1.1.0:
   version "1.1.3"
@@ -11083,6 +11517,16 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -11116,6 +11560,13 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xregexp@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
+  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.8.3"
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -11159,10 +11610,10 @@ yargs-parser@^13.1.0, yargs-parser@^13.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1"
-  integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==
+yargs-parser@^18.1.1:
+  version "18.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
+  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11218,10 +11669,10 @@ yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
-yargs@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
-  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"
@@ -11233,7 +11684,7 @@ yargs@^15.1.0:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^16.1.0"
+    yargs-parser "^18.1.1"
 
 zlibjs@^0.3.1:
   version "0.3.1"

From a8a7b8b53bbe044cd7ba3692586b9195ff8504cb Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 6 Apr 2020 20:41:32 +0900
Subject: [PATCH 032/200] =?UTF-8?q?Material=E3=83=86=E3=83=BC=E3=83=9E?=
 =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=A8=E3=83=90=E3=83=AA=E3=82=A8=E3=83=BC=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=BF=BD=E5=8A=A0=20(#276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Material theme (dev) initial release

* fix CSP

* fix CSP (#268)

* fix icon font path

* 相対パスの修正 (#269)

* fix CSP

* fix icon font path

* 相対パスの修正 (#270)

* fix CSP

* fix icon font path

* fix font path

* Revert "相対パスの修正 (#270)" (#271)

This reverts commit 27998a80fe550f3161bf03f76724d01fb56fc2e3.

* Revert "相対パスの修正 (#269)" (#272)

This reverts commit f864de23f4996013e1b05b529214794e581f0611.

* fix relative path

* fix override settings

* Add variation
Update material theme

Co-authored-by: YoheiZuho <yuuman002@gmail.com>
---
 .../fonts/MaterialIcons-Regular.woff2         | Bin 0 -> 44300 bytes
 app/javascript/styles/material-v1-dark.scss   |  18 +
 .../styles/material-v1-dark/_mixins.scss      |  25 ++
 .../styles/material-v1-dark/account.scss      | 139 +++++++
 .../styles/material-v1-dark/basics.scss       |  24 ++
 .../styles/material-v1-dark/button.scss       |  78 ++++
 .../styles/material-v1-dark/cards.scss        |  29 ++
 .../material-v1-dark/color/mastodon-dark.scss | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v1-dark/color/v1-dark.scss       | 107 +++++
 .../material-v1-dark/color/v1-light.scss      | 107 +++++
 .../material-v1-dark/color/v2-dark.scss       | 107 +++++
 .../material-v1-dark/color/v2-light.scss      | 107 +++++
 .../styles/material-v1-dark/columns.scss      | 391 ++++++++++++++++++
 .../styles/material-v1-dark/components.scss   | 339 +++++++++++++++
 .../styles/material-v1-dark/config.scss       |  61 +++
 .../styles/material-v1-dark/control.scss      |  69 ++++
 .../styles/material-v1-dark/emoji-picker.scss |  90 ++++
 .../styles/material-v1-dark/icons.scss        |  37 ++
 .../material-v1-dark/layout/material-v1.scss  |  45 ++
 .../material-v1-dark/layout/material-v2.scss  |  65 +++
 .../material-v1-dark/material-icons.scss      |  96 +++++
 .../styles/material-v1-dark/media.scss        |  38 ++
 .../styles/material-v1-dark/mobile.scss       |  45 ++
 .../styles/material-v1-dark/modal.scss        |  61 +++
 .../styles/material-v1-dark/statuses.scss     | 146 +++++++
 app/javascript/styles/material-v1-light.scss  |  18 +
 .../styles/material-v1-light/_mixins.scss     |  25 ++
 .../styles/material-v1-light/account.scss     | 139 +++++++
 .../styles/material-v1-light/basics.scss      |  24 ++
 .../styles/material-v1-light/button.scss      |  78 ++++
 .../styles/material-v1-light/cards.scss       |  29 ++
 .../color/mastodon-dark.scss                  | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v1-light/color/v1-dark.scss      | 107 +++++
 .../material-v1-light/color/v1-light.scss     | 107 +++++
 .../material-v1-light/color/v2-dark.scss      | 107 +++++
 .../material-v1-light/color/v2-light.scss     | 107 +++++
 .../styles/material-v1-light/columns.scss     | 391 ++++++++++++++++++
 .../styles/material-v1-light/components.scss  | 339 +++++++++++++++
 .../styles/material-v1-light/config.scss      |  61 +++
 .../styles/material-v1-light/control.scss     |  69 ++++
 .../material-v1-light/emoji-picker.scss       |  90 ++++
 .../styles/material-v1-light/icons.scss       |  37 ++
 .../material-v1-light/layout/material-v1.scss |  45 ++
 .../material-v1-light/layout/material-v2.scss |  65 +++
 .../material-v1-light/material-icons.scss     |  96 +++++
 .../styles/material-v1-light/media.scss       |  38 ++
 .../styles/material-v1-light/mobile.scss      |  45 ++
 .../styles/material-v1-light/modal.scss       |  61 +++
 .../styles/material-v1-light/statuses.scss    | 146 +++++++
 app/javascript/styles/material-v2-dark.scss   |  18 +
 .../styles/material-v2-dark/_mixins.scss      |  25 ++
 .../styles/material-v2-dark/account.scss      | 139 +++++++
 .../styles/material-v2-dark/basics.scss       |  24 ++
 .../styles/material-v2-dark/button.scss       |  78 ++++
 .../styles/material-v2-dark/cards.scss        |  29 ++
 .../material-v2-dark/color/mastodon-dark.scss | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v2-dark/color/v1-dark.scss       | 107 +++++
 .../material-v2-dark/color/v1-light.scss      | 107 +++++
 .../material-v2-dark/color/v2-dark.scss       | 107 +++++
 .../material-v2-dark/color/v2-light.scss      | 107 +++++
 .../styles/material-v2-dark/columns.scss      | 391 ++++++++++++++++++
 .../styles/material-v2-dark/components.scss   | 339 +++++++++++++++
 .../styles/material-v2-dark/config.scss       |  61 +++
 .../styles/material-v2-dark/control.scss      |  69 ++++
 .../styles/material-v2-dark/emoji-picker.scss |  90 ++++
 .../styles/material-v2-dark/icons.scss        |  37 ++
 .../material-v2-dark/layout/material-v1.scss  |  45 ++
 .../material-v2-dark/layout/material-v2.scss  |  65 +++
 .../material-v2-dark/material-icons.scss      |  96 +++++
 .../styles/material-v2-dark/media.scss        |  38 ++
 .../styles/material-v2-dark/mobile.scss       |  45 ++
 .../styles/material-v2-dark/modal.scss        |  61 +++
 .../styles/material-v2-dark/statuses.scss     | 146 +++++++
 app/javascript/styles/material-v2-light.scss  |  18 +
 .../styles/material-v2-light/_mixins.scss     |  25 ++
 .../styles/material-v2-light/account.scss     | 139 +++++++
 .../styles/material-v2-light/basics.scss      |  24 ++
 .../styles/material-v2-light/button.scss      |  78 ++++
 .../styles/material-v2-light/cards.scss       |  29 ++
 .../color/mastodon-dark.scss                  | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v2-light/color/v1-dark.scss      | 107 +++++
 .../material-v2-light/color/v1-light.scss     | 107 +++++
 .../material-v2-light/color/v2-dark.scss      | 107 +++++
 .../material-v2-light/color/v2-light.scss     | 107 +++++
 .../styles/material-v2-light/columns.scss     | 391 ++++++++++++++++++
 .../styles/material-v2-light/components.scss  | 339 +++++++++++++++
 .../styles/material-v2-light/config.scss      |  61 +++
 .../styles/material-v2-light/control.scss     |  69 ++++
 .../material-v2-light/emoji-picker.scss       |  90 ++++
 .../styles/material-v2-light/icons.scss       |  37 ++
 .../material-v2-light/layout/material-v1.scss |  45 ++
 .../material-v2-light/layout/material-v2.scss |  65 +++
 .../material-v2-light/material-icons.scss     |  96 +++++
 .../styles/material-v2-light/media.scss       |  38 ++
 .../styles/material-v2-light/mobile.scss      |  45 ++
 .../styles/material-v2-light/modal.scss       |  61 +++
 .../styles/material-v2-light/statuses.scss    | 146 +++++++
 .../initializers/content_security_policy.rb   |   5 +-
 config/locales/en.yml                         |   6 +-
 config/locales/ja.yml                         |   5 +
 config/themes.yml                             |   6 +
 105 files changed, 9765 insertions(+), 5 deletions(-)
 create mode 100644 app/javascript/fonts/MaterialIcons-Regular.woff2
 create mode 100644 app/javascript/styles/material-v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/_mixins.scss
 create mode 100644 app/javascript/styles/material-v1-dark/account.scss
 create mode 100644 app/javascript/styles/material-v1-dark/basics.scss
 create mode 100644 app/javascript/styles/material-v1-dark/button.scss
 create mode 100644 app/javascript/styles/material-v1-dark/cards.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/columns.scss
 create mode 100644 app/javascript/styles/material-v1-dark/components.scss
 create mode 100644 app/javascript/styles/material-v1-dark/config.scss
 create mode 100644 app/javascript/styles/material-v1-dark/control.scss
 create mode 100644 app/javascript/styles/material-v1-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v1-dark/icons.scss
 create mode 100644 app/javascript/styles/material-v1-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v1-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-dark/material-icons.scss
 create mode 100644 app/javascript/styles/material-v1-dark/media.scss
 create mode 100644 app/javascript/styles/material-v1-dark/mobile.scss
 create mode 100644 app/javascript/styles/material-v1-dark/modal.scss
 create mode 100644 app/javascript/styles/material-v1-dark/statuses.scss
 create mode 100644 app/javascript/styles/material-v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/_mixins.scss
 create mode 100644 app/javascript/styles/material-v1-light/account.scss
 create mode 100644 app/javascript/styles/material-v1-light/basics.scss
 create mode 100644 app/javascript/styles/material-v1-light/button.scss
 create mode 100644 app/javascript/styles/material-v1-light/cards.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/columns.scss
 create mode 100644 app/javascript/styles/material-v1-light/components.scss
 create mode 100644 app/javascript/styles/material-v1-light/config.scss
 create mode 100644 app/javascript/styles/material-v1-light/control.scss
 create mode 100644 app/javascript/styles/material-v1-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v1-light/icons.scss
 create mode 100644 app/javascript/styles/material-v1-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v1-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-light/material-icons.scss
 create mode 100644 app/javascript/styles/material-v1-light/media.scss
 create mode 100644 app/javascript/styles/material-v1-light/mobile.scss
 create mode 100644 app/javascript/styles/material-v1-light/modal.scss
 create mode 100644 app/javascript/styles/material-v1-light/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/_mixins.scss
 create mode 100644 app/javascript/styles/material-v2-dark/account.scss
 create mode 100644 app/javascript/styles/material-v2-dark/basics.scss
 create mode 100644 app/javascript/styles/material-v2-dark/button.scss
 create mode 100644 app/javascript/styles/material-v2-dark/cards.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/columns.scss
 create mode 100644 app/javascript/styles/material-v2-dark/components.scss
 create mode 100644 app/javascript/styles/material-v2-dark/config.scss
 create mode 100644 app/javascript/styles/material-v2-dark/control.scss
 create mode 100644 app/javascript/styles/material-v2-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-dark/icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v2-dark/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/media.scss
 create mode 100644 app/javascript/styles/material-v2-dark/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-dark/modal.scss
 create mode 100644 app/javascript/styles/material-v2-dark/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/_mixins.scss
 create mode 100644 app/javascript/styles/material-v2-light/account.scss
 create mode 100644 app/javascript/styles/material-v2-light/basics.scss
 create mode 100644 app/javascript/styles/material-v2-light/button.scss
 create mode 100644 app/javascript/styles/material-v2-light/cards.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/columns.scss
 create mode 100644 app/javascript/styles/material-v2-light/components.scss
 create mode 100644 app/javascript/styles/material-v2-light/config.scss
 create mode 100644 app/javascript/styles/material-v2-light/control.scss
 create mode 100644 app/javascript/styles/material-v2-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-light/icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v2-light/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/media.scss
 create mode 100644 app/javascript/styles/material-v2-light/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-light/modal.scss
 create mode 100644 app/javascript/styles/material-v2-light/statuses.scss

diff --git a/app/javascript/fonts/MaterialIcons-Regular.woff2 b/app/javascript/fonts/MaterialIcons-Regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..9fa211252080046a23b2449dbdced6abc2b0bb34
GIT binary patch
literal 44300
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
QW8}wPUeo^@jR61v08@RD2LJ#7

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
new file mode 100644
index 000000000..b1646b3df
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v1-dark/account';
+@import 'material-v1-dark/basics';
+@import 'material-v1-dark/button';
+//@import 'material-v1-dark/cards';
+@import 'material-v1-dark/columns';
+@import 'material-v1-dark/components';
+@import 'material-v1-dark/config';
+@import 'material-v1-dark/control';
+@import 'material-v1-dark/emoji-picker';
+@import 'material-v1-dark/icons';
+@import 'material-v1-dark/material-icons';
+@import 'material-v1-dark/media';
+@import 'material-v1-dark/mobile';
+@import 'material-v1-dark/modal';
+@import 'material-v1-dark/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/_mixins.scss b/app/javascript/styles/material-v1-dark/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v1-dark/account.scss b/app/javascript/styles/material-v1-dark/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/basics.scss b/app/javascript/styles/material-v1-dark/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/button.scss b/app/javascript/styles/material-v1-dark/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/cards.scss b/app/javascript/styles/material-v1-dark/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-dark.scss b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-light.scss b/app/javascript/styles/material-v1-dark/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-dark.scss b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-light.scss b/app/javascript/styles/material-v1-dark/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/columns.scss b/app/javascript/styles/material-v1-dark/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/components.scss b/app/javascript/styles/material-v1-dark/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/config.scss b/app/javascript/styles/material-v1-dark/config.scss
new file mode 100644
index 000000000..ee50da02f
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v1-dark';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/control.scss b/app/javascript/styles/material-v1-dark/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/emoji-picker.scss b/app/javascript/styles/material-v1-dark/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/icons.scss b/app/javascript/styles/material-v1-dark/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v1.scss b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v2.scss b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/material-icons.scss b/app/javascript/styles/material-v1-dark/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/media.scss b/app/javascript/styles/material-v1-dark/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/mobile.scss b/app/javascript/styles/material-v1-dark/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/modal.scss b/app/javascript/styles/material-v1-dark/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/statuses.scss b/app/javascript/styles/material-v1-dark/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
new file mode 100644
index 000000000..c75295e71
--- /dev/null
+++ b/app/javascript/styles/material-v1-light.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v1-light/account';
+@import 'material-v1-light/basics';
+@import 'material-v1-light/button';
+//@import 'material-v1-light/cards';
+@import 'material-v1-light/columns';
+@import 'material-v1-light/components';
+@import 'material-v1-light/config';
+@import 'material-v1-light/control';
+@import 'material-v1-light/emoji-picker';
+@import 'material-v1-light/icons';
+@import 'material-v1-light/material-icons';
+@import 'material-v1-light/media';
+@import 'material-v1-light/mobile';
+@import 'material-v1-light/modal';
+@import 'material-v1-light/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/_mixins.scss b/app/javascript/styles/material-v1-light/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v1-light/account.scss b/app/javascript/styles/material-v1-light/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/basics.scss b/app/javascript/styles/material-v1-light/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/button.scss b/app/javascript/styles/material-v1-light/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/cards.scss b/app/javascript/styles/material-v1-light/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-light.scss b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-dark.scss b/app/javascript/styles/material-v1-light/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-light.scss b/app/javascript/styles/material-v1-light/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-dark.scss b/app/javascript/styles/material-v1-light/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-light.scss b/app/javascript/styles/material-v1-light/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/columns.scss b/app/javascript/styles/material-v1-light/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/components.scss b/app/javascript/styles/material-v1-light/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/config.scss b/app/javascript/styles/material-v1-light/config.scss
new file mode 100644
index 000000000..dd25f6bf7
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v1-light';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/control.scss b/app/javascript/styles/material-v1-light/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/emoji-picker.scss b/app/javascript/styles/material-v1-light/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/icons.scss b/app/javascript/styles/material-v1-light/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v1.scss b/app/javascript/styles/material-v1-light/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v2.scss b/app/javascript/styles/material-v1-light/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/material-icons.scss b/app/javascript/styles/material-v1-light/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/media.scss b/app/javascript/styles/material-v1-light/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/mobile.scss b/app/javascript/styles/material-v1-light/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/modal.scss b/app/javascript/styles/material-v1-light/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/statuses.scss b/app/javascript/styles/material-v1-light/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
new file mode 100644
index 000000000..04d5e399b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v2-dark/account';
+@import 'material-v2-dark/basics';
+@import 'material-v2-dark/button';
+//@import 'material-v2-dark/cards';
+@import 'material-v2-dark/columns';
+@import 'material-v2-dark/components';
+@import 'material-v2-dark/config';
+@import 'material-v2-dark/control';
+@import 'material-v2-dark/emoji-picker';
+@import 'material-v2-dark/icons';
+@import 'material-v2-dark/material-icons';
+@import 'material-v2-dark/media';
+@import 'material-v2-dark/mobile';
+@import 'material-v2-dark/modal';
+@import 'material-v2-dark/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/_mixins.scss b/app/javascript/styles/material-v2-dark/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v2-dark/account.scss b/app/javascript/styles/material-v2-dark/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/basics.scss b/app/javascript/styles/material-v2-dark/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/button.scss b/app/javascript/styles/material-v2-dark/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/cards.scss b/app/javascript/styles/material-v2-dark/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-dark.scss b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-light.scss b/app/javascript/styles/material-v2-dark/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-dark.scss b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-light.scss b/app/javascript/styles/material-v2-dark/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/columns.scss b/app/javascript/styles/material-v2-dark/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/components.scss b/app/javascript/styles/material-v2-dark/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/config.scss b/app/javascript/styles/material-v2-dark/config.scss
new file mode 100644
index 000000000..1d9a47e68
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v2-dark';
+
+
+// Layout profile
+@import 'layout/material-v2';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/control.scss b/app/javascript/styles/material-v2-dark/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/emoji-picker.scss b/app/javascript/styles/material-v2-dark/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icons.scss b/app/javascript/styles/material-v2-dark/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v1.scss b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v2.scss b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/material-icons.scss b/app/javascript/styles/material-v2-dark/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/media.scss b/app/javascript/styles/material-v2-dark/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/mobile.scss b/app/javascript/styles/material-v2-dark/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/modal.scss b/app/javascript/styles/material-v2-dark/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/statuses.scss b/app/javascript/styles/material-v2-dark/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
new file mode 100644
index 000000000..51e5eabd4
--- /dev/null
+++ b/app/javascript/styles/material-v2-light.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v2-light/account';
+@import 'material-v2-light/basics';
+@import 'material-v2-light/button';
+//@import 'material-v2-light/cards';
+@import 'material-v2-light/columns';
+@import 'material-v2-light/components';
+@import 'material-v2-light/config';
+@import 'material-v2-light/control';
+@import 'material-v2-light/emoji-picker';
+@import 'material-v2-light/icons';
+@import 'material-v2-light/material-icons';
+@import 'material-v2-light/media';
+@import 'material-v2-light/mobile';
+@import 'material-v2-light/modal';
+@import 'material-v2-light/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/_mixins.scss b/app/javascript/styles/material-v2-light/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v2-light/account.scss b/app/javascript/styles/material-v2-light/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/basics.scss b/app/javascript/styles/material-v2-light/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/button.scss b/app/javascript/styles/material-v2-light/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/cards.scss b/app/javascript/styles/material-v2-light/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-light.scss b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-dark.scss b/app/javascript/styles/material-v2-light/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-light.scss b/app/javascript/styles/material-v2-light/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-dark.scss b/app/javascript/styles/material-v2-light/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-light.scss b/app/javascript/styles/material-v2-light/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/columns.scss b/app/javascript/styles/material-v2-light/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/components.scss b/app/javascript/styles/material-v2-light/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/config.scss b/app/javascript/styles/material-v2-light/config.scss
new file mode 100644
index 000000000..f823bad9a
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v2-light';
+
+
+// Layout profile
+@import 'layout/material-v2';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/control.scss b/app/javascript/styles/material-v2-light/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/emoji-picker.scss b/app/javascript/styles/material-v2-light/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icons.scss b/app/javascript/styles/material-v2-light/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v1.scss b/app/javascript/styles/material-v2-light/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v2.scss b/app/javascript/styles/material-v2-light/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/material-icons.scss b/app/javascript/styles/material-v2-light/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/media.scss b/app/javascript/styles/material-v2-light/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/mobile.scss b/app/javascript/styles/material-v2-light/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/modal.scss b/app/javascript/styles/material-v2-light/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/statuses.scss b/app/javascript/styles/material-v2-light/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index e75b668b5..654e2e8cd 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -9,9 +9,6 @@ end
 base_host = Rails.configuration.x.web_domain
 
 assets_host   = Rails.configuration.action_controller.asset_host
-assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
-google_font_host = "https://fonts.gstatic.com"
-gplus_theme_host = "https://raw.githubusercontent.com"
 assets_host ||= host_to_url(base_host)
 
 media_host   = host_to_url(ENV['S3_ALIAS_HOST'])
@@ -23,7 +20,7 @@ Rails.application.config.content_security_policy do |p|
   p.base_uri        :none
   p.default_src     :none
   p.frame_ancestors :none
-  p.font_src        :self, assets_host, google_font_host
+  p.font_src        :self, assets_host
   p.img_src         :self, :https, :data, :blob, assets_host
   p.style_src       :self, :unsafe_inline, assets_host
   p.media_src       :self, :https, :data, assets_host
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b806b7779..a11ecf185 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1239,7 +1239,11 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
-
+    # additional theme
+    material-v1-dark: Material v1 (Dark)
+    material-v1-light: Material v1 (Light)
+    material-v2-dark: Material v2 (Dark)
+    material-v2-light: Material v2 (Light)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 95a2f69c9..489463ed6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1221,6 +1221,11 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
+    # 追加テーマ
+    material-v1-dark: Material v1 (ダーク)
+    material-v1-light: Material v1 (ライト)
+    material-v2-dark: Material v2 (ダーク)
+    material-v2-light: Material v2 (ライト)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index 9c21c9459..70a145918 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,3 +1,9 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+
+# 追加テーマ
+material-v1-dark: styles/material-v1-dark.scss
+material-v1-light: styles/material-v1-light.scss
+material-v2-dark: styles/material-v2-dark.scss
+material-v2-light: styles/material-v2-light.scss
\ No newline at end of file

From 2d8867dd21e36758969cf2e4221988be78721974 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 6 Apr 2020 20:51:51 +0900
Subject: [PATCH 033/200] Features/mild master (#278)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 3.1.3 (#275)

* Fix announcements with fully-qualified mention to local user crashing WebUI (#13164)

* [Security] Bump puma from 4.3.1 to 4.3.2 (#13167)

Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix installation failing when Redis password contains special characters (#13156)

* Add support for special characters in Redis passwords

Fixes #13154

* Refactor

* Fix elasticsearch-api and faraday incompatibilities (#13166)

* Bump puma from 4.3.2 to 4.3.3 (#13177)

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132

* Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump oj from 3.10.1 to 3.10.3 (#13187)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/core from 7.8.4 to 7.8.6 (#13185)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Add tooltips to audio/video player buttons (#13203)

* Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170)

Fixes #13168

* Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)

Blocking a domain is closer to blocking all its users than to a mute
action.

* Remove useless `respond_to` calls (#13208)

* Change GIF label to be displayed even when autoplay is enabled in web UI (#13209)

* Fix too large announcements not being scrollable in web UI (#13211)

* Add specific rate limits for posting and following (#13172)

* Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148)

* Add sorting by username, creation and last activity in moderation view (#13076)

* Add ability to order accounts in moderation view

* Display last status date in “Most recent activity” for remote users

* Fix error when searching for URLs that contain the mention syntax (#13151)

Fixes #13150

* Set BUNDLE_PATH in CircleCI (#13214)

* Change description of privacy levels to be more intuitive in web UI (#13197)

* Improve description of privacy levels in compose interface

* Change strings in defaultMessage and source as well as english

Co-authored-by: Thibaut Girka <thib@sitedethib.com>

* Add ability to delete files uploaded for settings in admin UI (#13192)

* Allow deleting site uploads

* Refactor and move links into hints

* Fix i18n tests

* Fix HTML output of site_upload_delete_hint

* Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)

* Add skip_media_remove option to tootctl statuses remove

* Add skip_media_remove option to tootctl statuses remove

Co-authored-by: tateisu <tateisu@juggler.jp>

* Code style improvements in JavaScript (#13159)

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

* Add submit button to the top of preferences pages (#13068)

* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec

* Update nginx.conf (#13066)

* Change wording of media display preferences to be more intuitive (#13198)

* Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)

* Add support for links to statuses in announcements to be opened in web UI (#13212)

* Add support for links to public statuses in announcements to be opened in WebUI

* Please CodeClimate

* Fix public posts from silenced accounts not being changed to unlisted visibility (#13096)

* Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change local media attachments to perform heavy processing asynchronously (#13210)

Fix #9106

* Add federation support for the "hide network" preference (#11673)

* Change ActivityPub follower/following collections to not link first page

* Add support for hiding followers and following of remote users

* Switch to using a single `hide_collections` column

* Address code style remarks

* Bump cld3 from 3.2.6 to 3.3.0 (#13107)

* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Change video uploads to enforce certain limits (#13218)

- Dimensions at most 1920x1200
- Frame rate at most 60

* Change video uploads to always be converted to H264/MP4 (#13220)

Even if the container format is the same (.mp4), the codec could
be different and not playable in web browsers

* Change the string "hidden" to "blocked" in WebUI (#13221)

* Change the string "hidden" to "blocked" in WebUI.

* update

* Bump file-loader from 5.0.2 to 5.1.0 (#13225)

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump wicg-inert from 3.0.0 to 3.0.2 (#13226)

Bumps [wicg-inert](https://github.com/WICG/inert) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/WICG/inert/releases)
- [Commits](https://github.com/WICG/inert/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump cross-env from 6.0.3 to 7.0.2 (#13228)

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump eslint-plugin-react from 7.17.0 to 7.19.0 (#13224)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.17.0 to 7.19.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.17.0...v7.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)

* Fix videos with unsupported colorspace not being transcoded (#13242)

* Fix regression in “Edit media” modal in web UI (#13243)

* [Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235)

* Update Dockerfile

* Update Dockerfile

* Fix detailed view of direct messages displaying a 0 boost count (#13244)

The boost count is already removed from private toots,
do the same with direct messages.

* Add titles to warning presets in admin UI (#13252)

* Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)

* Add shortcuts to blacklist a user's e-mail domain in admin UI

* Add option to blacklist resolved MX and IP records for e-mail domains

* Fix some timeouts when searching URLs by limiting some database queries (#13253)

Only look up private toots from database if the request failed because of 401,
403 or 404 errors, as those may indicate a private toot, rather than something
that isn't a toot or cannot be processed.

* Fix WebUI crash in single-column mode on prehistoric browsers (#13267)

Fixes #13266

* Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)

Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases)
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 24.9.0 to 25.1.0 (#12973)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-dom from 16.12.0 to 16.13.0 (#13181)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sass from 1.25.0 to 1.26.3 (#13263)

Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.25.0...1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump mkdirp from 0.5.1 to 1.0.3 (#12979)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump redis from 2.8.0 to 3.0.2 (#13102)

Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.0 to 3.1.1 (#13230)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simple_form from 5.0.1 to 5.0.2 (#13231)

Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webmock from 3.8.0 to 3.8.3 (#13265)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump capistrano from 3.11.2 to 3.12.1 (#13264)

* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

* Decommission support for Ruby 2.4 (#13287)

* Update Gemfile

* Update README.md

* Fix frontend crash when deleting announcements (#13283)

This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)

As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.

This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present.

* Make bookmarks also searchable (#13271)

* Add link to bookmarks in web UI dropdown (#13273)

* Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)

* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js

* [Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Sidekiq::Logger.logger -> Sidekiq.logger

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix bookmarks also searchable (#13293)

* Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)

* Change poll option hover/active styling to be less confusing (#13313)

* Fix frontend crash when deleting announcements (#13312)

Refactor and fix #13283, which only worked in some cases.

* Fix media not being marked sensitive when client sets a CW but no text (#13277)

Mastodon enforces the “sensitive” flag on media attachments whenever a toot
is posted with a Content Warning. However, it does so *after* potentially
converting the Content Warning to toot text (when there is no toot text),
which leads to inconsistent and surprising behavior for API clients.
This commit fixes this inconsistency.

* Bump browser from 3.0.3 to 4.0.0 (#13307)

Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simplecov from 0.18.2 to 0.18.5 (#13310)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump discard from 1.1.0 to 1.2.0 (#13308)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* New Crowdin translations (#13064)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations devise.en.yml (Icelandic)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations activerecord.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

* Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/core from 7.8.6 to 7.9.0 (#13303)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change `tootctl media remove-orphans` to work for all classes (#13316)

Change `tootctl media lookup` to not use an interactive prompt

* Bump react-select from 3.0.8 to 3.1.0 (#13296)

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack from 4.41.5 to 4.42.1 (#13319)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix Paperclip using deprecated URI.escape function (#13320)

Monkey-patch Paperclip to perform URL escaping in a slightly more
appropriate way, and get rid of runtime deprecation warnings.

* Bump brakeman from 4.7.2 to 4.8.0 (#13309)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix OCR not working on Safari because of unsupported worker-src CSP (#13323)

Fixes #13321

* Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors

* Fix incorrect deletion of local accounts imported by overwriting (#13350)

* Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)

* Bump pg from 1.2.2 to 1.2.3 (#13344)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.2...v1.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump oj from 3.10.3 to 3.10.5 (#13345)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump iso-639 from 0.2.8 to 0.3.5 (#13343)

Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases)
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump ox from 2.12.1 to 2.13.2 (#13342)

Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump better_errors from 2.5.1 to 2.6.0 (#13340)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix ImportsController param to permit :mode (#13347)

* Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump uuid from 3.4.0 to 7.0.2 (#13295)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)

* Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react from 16.12.0 to 16.13.1 (#13337)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump stringz from 2.0.0 to 2.1.0 (#13331)

Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 25.1.0 to 25.2.4 (#13332)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump yargs from 15.1.0 to 15.3.1 (#13334)

Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-loader from 8.0.6 to 8.1.0 (#13333)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix re-sending of e-mail confirmation not being rate limited (#13360)

Fix #13330

* Improve toot clicking areas (#13327)

* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI

* Fix background jobs not using locks like they are supposed to (#13361)

Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349

* Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump faker from 2.10.1 to 2.11.0 (#13363)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump bootsnap from 1.4.5 to 1.4.6 (#13369)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.1 to 3.1.2 (#13368)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix pinning a column in web UI sometimes redirecting out of web UI (#13376)

Fix #13216

* Fix returning results when searching for URL with non-zero offset (#13377)

Fix #13083

* Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)

Fix #13371

* Improve polls: option lengths & redesign (#13257)

This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.

* Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Add ability to filter audit log in admin UI (#13381)

* Update Vagrant box to Bionic (#13384)

* Update config.yml (#13379)

* Add explanation as to why unlocked accounts may have follow requests (#13385)

* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”

* Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)

* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3

* Bump version to 3.1.3 (#13389)

* Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review

* [Security] Update Dockerfile for Ruby 2.6.6 (#13393)

* Update .ruby-version (#13395)

* Fix “Show more” not switching to “Show less” on public pages (#13174)

* Fix “Show more” not switching to “Show less” on public pages

Fixes #13169

* Fix initial text of CW button on public pages when CW are unfolded by default

* Add rate limit for reporting (#13390)

* New Crowdin translations (#13317)

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Georgian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations simple_form.en.yml (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Hebrew)
[ci skip]

* New translations devise.en.yml (Hebrew)
[ci skip]

* New translations doorkeeper.en.yml (Hebrew)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Vietnamese)
[ci skip]

* New translations devise.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (German)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations devise.en.yml (Galician)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New t…

* Materialテーマのアップデートとバリエーションの追加 (#276)

* Material theme (dev) initial release

* fix CSP

* fix CSP (#268)

* fix icon font path

* 相対パスの修正 (#269)

* fix CSP

* fix icon font path

* 相対パスの修正 (#270)

* fix CSP

* fix icon font path

* fix font path

* Revert "相対パスの修正 (#270)" (#271)

This reverts commit 27998a80fe550f3161bf03f76724d01fb56fc2e3.

* Revert "相対パスの修正 (#269)" (#272)

This reverts commit f864de23f4996013e1b05b529214794e581f0611.

* fix relative path

* fix override settings

* Add variation
Update material theme

Co-authored-by: YoheiZuho <yuuman002@gmail.com>

Co-authored-by: ThibG <thib@sitedethib.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: koyu <me@koyu.space>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: David Cook <divergentdave@gmail.com>
Co-authored-by: tateisu <tateisu@gmail.com>
Co-authored-by: tateisu <tateisu@juggler.jp>
Co-authored-by: Bèr Kessels <ber@berk.es>
Co-authored-by: guigeekz <pattusg@gmail.com>
Co-authored-by: Shlee <github@shl.ee>
Co-authored-by: mayaeh <mayaeh@marimo-net.org>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Daniel Sockwell <dsockwell@gmail.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Takeshi Umeda <noel.yoshiba@gmail.com>
Co-authored-by: Sasha Sorokin <dafri.nochiterov8@gmail.com>
Co-authored-by: fuyu <54523771+mfmfuyu@users.noreply.github.com>
Co-authored-by: Rintan <rintanminecraft@gmail.com>
---
 app/javascript/styles/material-v1-dark.scss   |  18 +
 .../styles/material-v1-dark/_mixins.scss      |  25 ++
 .../styles/material-v1-dark/account.scss      | 139 +++++++
 .../styles/material-v1-dark/basics.scss       |  24 ++
 .../styles/material-v1-dark/button.scss       |  78 ++++
 .../styles/material-v1-dark/cards.scss        |  29 ++
 .../material-v1-dark/color/mastodon-dark.scss | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v1-dark/color/v1-dark.scss       | 107 +++++
 .../material-v1-dark/color/v1-light.scss      | 107 +++++
 .../material-v1-dark/color/v2-dark.scss       | 107 +++++
 .../material-v1-dark/color/v2-light.scss      | 107 +++++
 .../styles/material-v1-dark/columns.scss      | 391 ++++++++++++++++++
 .../styles/material-v1-dark/components.scss   | 339 +++++++++++++++
 .../styles/material-v1-dark/config.scss       |  61 +++
 .../styles/material-v1-dark/control.scss      |  69 ++++
 .../styles/material-v1-dark/emoji-picker.scss |  90 ++++
 .../styles/material-v1-dark/icons.scss        |  37 ++
 .../material-v1-dark/layout/material-v1.scss  |  45 ++
 .../material-v1-dark/layout/material-v2.scss  |  65 +++
 .../material-v1-dark/material-icons.scss      |  96 +++++
 .../styles/material-v1-dark/media.scss        |  38 ++
 .../styles/material-v1-dark/mobile.scss       |  45 ++
 .../styles/material-v1-dark/modal.scss        |  61 +++
 .../styles/material-v1-dark/statuses.scss     | 146 +++++++
 app/javascript/styles/material-v1-light.scss  |  18 +
 .../styles/material-v1-light/_mixins.scss     |  25 ++
 .../styles/material-v1-light/account.scss     | 139 +++++++
 .../styles/material-v1-light/basics.scss      |  24 ++
 .../styles/material-v1-light/button.scss      |  78 ++++
 .../styles/material-v1-light/cards.scss       |  29 ++
 .../color/mastodon-dark.scss                  | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v1-light/color/v1-dark.scss      | 107 +++++
 .../material-v1-light/color/v1-light.scss     | 107 +++++
 .../material-v1-light/color/v2-dark.scss      | 107 +++++
 .../material-v1-light/color/v2-light.scss     | 107 +++++
 .../styles/material-v1-light/columns.scss     | 391 ++++++++++++++++++
 .../styles/material-v1-light/components.scss  | 339 +++++++++++++++
 .../styles/material-v1-light/config.scss      |  61 +++
 .../styles/material-v1-light/control.scss     |  69 ++++
 .../material-v1-light/emoji-picker.scss       |  90 ++++
 .../styles/material-v1-light/icons.scss       |  37 ++
 .../material-v1-light/layout/material-v1.scss |  45 ++
 .../material-v1-light/layout/material-v2.scss |  65 +++
 .../material-v1-light/material-icons.scss     |  96 +++++
 .../styles/material-v1-light/media.scss       |  38 ++
 .../styles/material-v1-light/mobile.scss      |  45 ++
 .../styles/material-v1-light/modal.scss       |  61 +++
 .../styles/material-v1-light/statuses.scss    | 146 +++++++
 app/javascript/styles/material-v2-dark.scss   |  18 +
 .../styles/material-v2-dark/_mixins.scss      |  25 ++
 .../styles/material-v2-dark/account.scss      | 139 +++++++
 .../styles/material-v2-dark/basics.scss       |  24 ++
 .../styles/material-v2-dark/button.scss       |  78 ++++
 .../styles/material-v2-dark/cards.scss        |  29 ++
 .../material-v2-dark/color/mastodon-dark.scss | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v2-dark/color/v1-dark.scss       | 107 +++++
 .../material-v2-dark/color/v1-light.scss      | 107 +++++
 .../material-v2-dark/color/v2-dark.scss       | 107 +++++
 .../material-v2-dark/color/v2-light.scss      | 107 +++++
 .../styles/material-v2-dark/columns.scss      | 391 ++++++++++++++++++
 .../styles/material-v2-dark/components.scss   | 339 +++++++++++++++
 .../styles/material-v2-dark/config.scss       |  61 +++
 .../styles/material-v2-dark/control.scss      |  69 ++++
 .../styles/material-v2-dark/emoji-picker.scss |  90 ++++
 .../styles/material-v2-dark/icons.scss        |  37 ++
 .../material-v2-dark/layout/material-v1.scss  |  45 ++
 .../material-v2-dark/layout/material-v2.scss  |  65 +++
 .../material-v2-dark/material-icons.scss      |  96 +++++
 .../styles/material-v2-dark/media.scss        |  38 ++
 .../styles/material-v2-dark/mobile.scss       |  45 ++
 .../styles/material-v2-dark/modal.scss        |  61 +++
 .../styles/material-v2-dark/statuses.scss     | 146 +++++++
 app/javascript/styles/material-v2-light.scss  |  18 +
 .../styles/material-v2-light/_mixins.scss     |  25 ++
 .../styles/material-v2-light/account.scss     | 139 +++++++
 .../styles/material-v2-light/basics.scss      |  24 ++
 .../styles/material-v2-light/button.scss      |  78 ++++
 .../styles/material-v2-light/cards.scss       |  29 ++
 .../color/mastodon-dark.scss                  | 107 +++++
 .../color/mastodon-light.scss                 | 106 +++++
 .../material-v2-light/color/v1-dark.scss      | 107 +++++
 .../material-v2-light/color/v1-light.scss     | 107 +++++
 .../material-v2-light/color/v2-dark.scss      | 107 +++++
 .../material-v2-light/color/v2-light.scss     | 107 +++++
 .../styles/material-v2-light/columns.scss     | 391 ++++++++++++++++++
 .../styles/material-v2-light/components.scss  | 339 +++++++++++++++
 .../styles/material-v2-light/config.scss      |  61 +++
 .../styles/material-v2-light/control.scss     |  69 ++++
 .../material-v2-light/emoji-picker.scss       |  90 ++++
 .../styles/material-v2-light/icons.scss       |  37 ++
 .../material-v2-light/layout/material-v1.scss |  45 ++
 .../material-v2-light/layout/material-v2.scss |  65 +++
 .../material-v2-light/material-icons.scss     |  96 +++++
 .../styles/material-v2-light/media.scss       |  38 ++
 .../styles/material-v2-light/mobile.scss      |  45 ++
 .../styles/material-v2-light/modal.scss       |  61 +++
 .../styles/material-v2-light/statuses.scss    | 146 +++++++
 config/locales/en.yml                         |   5 +-
 config/locales/ja.yml                         |   5 +-
 config/themes.yml                             |   5 +-
 103 files changed, 9760 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/styles/material-v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/_mixins.scss
 create mode 100644 app/javascript/styles/material-v1-dark/account.scss
 create mode 100644 app/javascript/styles/material-v1-dark/basics.scss
 create mode 100644 app/javascript/styles/material-v1-dark/button.scss
 create mode 100644 app/javascript/styles/material-v1-dark/cards.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/columns.scss
 create mode 100644 app/javascript/styles/material-v1-dark/components.scss
 create mode 100644 app/javascript/styles/material-v1-dark/config.scss
 create mode 100644 app/javascript/styles/material-v1-dark/control.scss
 create mode 100644 app/javascript/styles/material-v1-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v1-dark/icons.scss
 create mode 100644 app/javascript/styles/material-v1-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v1-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-dark/material-icons.scss
 create mode 100644 app/javascript/styles/material-v1-dark/media.scss
 create mode 100644 app/javascript/styles/material-v1-dark/mobile.scss
 create mode 100644 app/javascript/styles/material-v1-dark/modal.scss
 create mode 100644 app/javascript/styles/material-v1-dark/statuses.scss
 create mode 100644 app/javascript/styles/material-v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/_mixins.scss
 create mode 100644 app/javascript/styles/material-v1-light/account.scss
 create mode 100644 app/javascript/styles/material-v1-light/basics.scss
 create mode 100644 app/javascript/styles/material-v1-light/button.scss
 create mode 100644 app/javascript/styles/material-v1-light/cards.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/columns.scss
 create mode 100644 app/javascript/styles/material-v1-light/components.scss
 create mode 100644 app/javascript/styles/material-v1-light/config.scss
 create mode 100644 app/javascript/styles/material-v1-light/control.scss
 create mode 100644 app/javascript/styles/material-v1-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v1-light/icons.scss
 create mode 100644 app/javascript/styles/material-v1-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v1-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-light/material-icons.scss
 create mode 100644 app/javascript/styles/material-v1-light/media.scss
 create mode 100644 app/javascript/styles/material-v1-light/mobile.scss
 create mode 100644 app/javascript/styles/material-v1-light/modal.scss
 create mode 100644 app/javascript/styles/material-v1-light/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/_mixins.scss
 create mode 100644 app/javascript/styles/material-v2-dark/account.scss
 create mode 100644 app/javascript/styles/material-v2-dark/basics.scss
 create mode 100644 app/javascript/styles/material-v2-dark/button.scss
 create mode 100644 app/javascript/styles/material-v2-dark/cards.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/columns.scss
 create mode 100644 app/javascript/styles/material-v2-dark/components.scss
 create mode 100644 app/javascript/styles/material-v2-dark/config.scss
 create mode 100644 app/javascript/styles/material-v2-dark/control.scss
 create mode 100644 app/javascript/styles/material-v2-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-dark/icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v2-dark/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/media.scss
 create mode 100644 app/javascript/styles/material-v2-dark/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-dark/modal.scss
 create mode 100644 app/javascript/styles/material-v2-dark/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/_mixins.scss
 create mode 100644 app/javascript/styles/material-v2-light/account.scss
 create mode 100644 app/javascript/styles/material-v2-light/basics.scss
 create mode 100644 app/javascript/styles/material-v2-light/button.scss
 create mode 100644 app/javascript/styles/material-v2-light/cards.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/columns.scss
 create mode 100644 app/javascript/styles/material-v2-light/components.scss
 create mode 100644 app/javascript/styles/material-v2-light/config.scss
 create mode 100644 app/javascript/styles/material-v2-light/control.scss
 create mode 100644 app/javascript/styles/material-v2-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-light/icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v2-light/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/media.scss
 create mode 100644 app/javascript/styles/material-v2-light/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-light/modal.scss
 create mode 100644 app/javascript/styles/material-v2-light/statuses.scss

diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
new file mode 100644
index 000000000..b1646b3df
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v1-dark/account';
+@import 'material-v1-dark/basics';
+@import 'material-v1-dark/button';
+//@import 'material-v1-dark/cards';
+@import 'material-v1-dark/columns';
+@import 'material-v1-dark/components';
+@import 'material-v1-dark/config';
+@import 'material-v1-dark/control';
+@import 'material-v1-dark/emoji-picker';
+@import 'material-v1-dark/icons';
+@import 'material-v1-dark/material-icons';
+@import 'material-v1-dark/media';
+@import 'material-v1-dark/mobile';
+@import 'material-v1-dark/modal';
+@import 'material-v1-dark/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/_mixins.scss b/app/javascript/styles/material-v1-dark/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v1-dark/account.scss b/app/javascript/styles/material-v1-dark/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/basics.scss b/app/javascript/styles/material-v1-dark/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/button.scss b/app/javascript/styles/material-v1-dark/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/cards.scss b/app/javascript/styles/material-v1-dark/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-dark.scss b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-light.scss b/app/javascript/styles/material-v1-dark/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-dark.scss b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-light.scss b/app/javascript/styles/material-v1-dark/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/columns.scss b/app/javascript/styles/material-v1-dark/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/components.scss b/app/javascript/styles/material-v1-dark/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/config.scss b/app/javascript/styles/material-v1-dark/config.scss
new file mode 100644
index 000000000..ee50da02f
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v1-dark';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/control.scss b/app/javascript/styles/material-v1-dark/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/emoji-picker.scss b/app/javascript/styles/material-v1-dark/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/icons.scss b/app/javascript/styles/material-v1-dark/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v1.scss b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v2.scss b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/material-icons.scss b/app/javascript/styles/material-v1-dark/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/media.scss b/app/javascript/styles/material-v1-dark/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/mobile.scss b/app/javascript/styles/material-v1-dark/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/modal.scss b/app/javascript/styles/material-v1-dark/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/statuses.scss b/app/javascript/styles/material-v1-dark/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
new file mode 100644
index 000000000..c75295e71
--- /dev/null
+++ b/app/javascript/styles/material-v1-light.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v1-light/account';
+@import 'material-v1-light/basics';
+@import 'material-v1-light/button';
+//@import 'material-v1-light/cards';
+@import 'material-v1-light/columns';
+@import 'material-v1-light/components';
+@import 'material-v1-light/config';
+@import 'material-v1-light/control';
+@import 'material-v1-light/emoji-picker';
+@import 'material-v1-light/icons';
+@import 'material-v1-light/material-icons';
+@import 'material-v1-light/media';
+@import 'material-v1-light/mobile';
+@import 'material-v1-light/modal';
+@import 'material-v1-light/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/_mixins.scss b/app/javascript/styles/material-v1-light/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v1-light/account.scss b/app/javascript/styles/material-v1-light/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/basics.scss b/app/javascript/styles/material-v1-light/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/button.scss b/app/javascript/styles/material-v1-light/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/cards.scss b/app/javascript/styles/material-v1-light/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-light.scss b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-dark.scss b/app/javascript/styles/material-v1-light/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-light.scss b/app/javascript/styles/material-v1-light/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-dark.scss b/app/javascript/styles/material-v1-light/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-light.scss b/app/javascript/styles/material-v1-light/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/columns.scss b/app/javascript/styles/material-v1-light/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/components.scss b/app/javascript/styles/material-v1-light/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/config.scss b/app/javascript/styles/material-v1-light/config.scss
new file mode 100644
index 000000000..dd25f6bf7
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v1-light';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/control.scss b/app/javascript/styles/material-v1-light/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/emoji-picker.scss b/app/javascript/styles/material-v1-light/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/icons.scss b/app/javascript/styles/material-v1-light/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v1.scss b/app/javascript/styles/material-v1-light/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v2.scss b/app/javascript/styles/material-v1-light/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/material-icons.scss b/app/javascript/styles/material-v1-light/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/media.scss b/app/javascript/styles/material-v1-light/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/mobile.scss b/app/javascript/styles/material-v1-light/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/modal.scss b/app/javascript/styles/material-v1-light/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/statuses.scss b/app/javascript/styles/material-v1-light/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
new file mode 100644
index 000000000..04d5e399b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v2-dark/account';
+@import 'material-v2-dark/basics';
+@import 'material-v2-dark/button';
+//@import 'material-v2-dark/cards';
+@import 'material-v2-dark/columns';
+@import 'material-v2-dark/components';
+@import 'material-v2-dark/config';
+@import 'material-v2-dark/control';
+@import 'material-v2-dark/emoji-picker';
+@import 'material-v2-dark/icons';
+@import 'material-v2-dark/material-icons';
+@import 'material-v2-dark/media';
+@import 'material-v2-dark/mobile';
+@import 'material-v2-dark/modal';
+@import 'material-v2-dark/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/_mixins.scss b/app/javascript/styles/material-v2-dark/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v2-dark/account.scss b/app/javascript/styles/material-v2-dark/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/basics.scss b/app/javascript/styles/material-v2-dark/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/button.scss b/app/javascript/styles/material-v2-dark/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/cards.scss b/app/javascript/styles/material-v2-dark/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-dark.scss b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-light.scss b/app/javascript/styles/material-v2-dark/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-dark.scss b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-light.scss b/app/javascript/styles/material-v2-dark/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/columns.scss b/app/javascript/styles/material-v2-dark/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/components.scss b/app/javascript/styles/material-v2-dark/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/config.scss b/app/javascript/styles/material-v2-dark/config.scss
new file mode 100644
index 000000000..1d9a47e68
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v2-dark';
+
+
+// Layout profile
+@import 'layout/material-v2';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/control.scss b/app/javascript/styles/material-v2-dark/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/emoji-picker.scss b/app/javascript/styles/material-v2-dark/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icons.scss b/app/javascript/styles/material-v2-dark/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v1.scss b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v2.scss b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/material-icons.scss b/app/javascript/styles/material-v2-dark/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/media.scss b/app/javascript/styles/material-v2-dark/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/mobile.scss b/app/javascript/styles/material-v2-dark/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/modal.scss b/app/javascript/styles/material-v2-dark/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/statuses.scss b/app/javascript/styles/material-v2-dark/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
new file mode 100644
index 000000000..51e5eabd4
--- /dev/null
+++ b/app/javascript/styles/material-v2-light.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+//@import 'application';
+@import 'material-v2-light/account';
+@import 'material-v2-light/basics';
+@import 'material-v2-light/button';
+//@import 'material-v2-light/cards';
+@import 'material-v2-light/columns';
+@import 'material-v2-light/components';
+@import 'material-v2-light/config';
+@import 'material-v2-light/control';
+@import 'material-v2-light/emoji-picker';
+@import 'material-v2-light/icons';
+@import 'material-v2-light/material-icons';
+@import 'material-v2-light/media';
+@import 'material-v2-light/mobile';
+@import 'material-v2-light/modal';
+@import 'material-v2-light/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/_mixins.scss b/app/javascript/styles/material-v2-light/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v2-light/account.scss b/app/javascript/styles/material-v2-light/account.scss
new file mode 100644
index 000000000..2d8f2f210
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/account.scss
@@ -0,0 +1,139 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name,
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay-base {
+            border-radius: 50%;
+            width: 44px;
+            height: 44px;
+            background-size: 44px;
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $card-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $secondary-text-color;
+
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/basics.scss b/app/javascript/styles/material-v2-light/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/button.scss b/app/javascript/styles/material-v2-light/button.scss
new file mode 100644
index 000000000..6bb6bfa29
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/button.scss
@@ -0,0 +1,78 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/cards.scss b/app/javascript/styles/material-v2-light/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..14ef148f4
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #444b5d;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-light.scss b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
new file mode 100644
index 000000000..62a064b87
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
@@ -0,0 +1,106 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
+$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-dark.scss b/app/javascript/styles/material-v2-light/color/v1-dark.scss
new file mode 100644
index 000000000..f6168a35e
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-light.scss b/app/javascript/styles/material-v2-light/color/v1-light.scss
new file mode 100644
index 000000000..3a09d2a5d
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-dark.scss b/app/javascript/styles/material-v2-light/color/v2-dark.scss
new file mode 100644
index 000000000..aae145b3b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v2-dark.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #1e1e1e;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #5f6368;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-light.scss b/app/javascript/styles/material-v2-light/color/v2-light.scss
new file mode 100644
index 000000000..99d502543
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v2-light.scss
@@ -0,0 +1,107 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $primary-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/columns.scss b/app/javascript/styles/material-v2-light/columns.scss
new file mode 100644
index 000000000..dc61167dc
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/columns.scss
@@ -0,0 +1,391 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-arrows { font-size: 16px }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &:before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+.muted {
+    .status {
+        &__content {
+            color: $primary-text-color;
+    
+            p { color: $primary-text-color }
+    
+            a { color: $secondary-text-color }
+        }
+
+        &__display-name strong { color: $primary-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $top-bar-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $top-bar-color;
+            color: $top-bar-icon-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-color;
+                border-bottom: 4px solid $tab-indicator-color;
+    
+                &:before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.tabs-bar__wrapper { background: transparent }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/components.scss b/app/javascript/styles/material-v2-light/components.scss
new file mode 100644
index 000000000..f1e594e3c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/components.scss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 9px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea__textarea {
+        background: $card-background-color;
+        color: $ui-text-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.poll__input {
+    border: 2px solid $control-border-color;
+    width: 20px;
+    height: 20px;
+    flex: 0 0 20px;
+}
+
+.poll__text input[type=text] {
+    color: $ui-text-color;
+    background: $background-color;
+    border: 1px solid $border-color;
+    padding: 8px 12px;
+
+    &:focus { border-color: $border-active-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/config.scss b/app/javascript/styles/material-v2-light/config.scss
new file mode 100644
index 000000000..f823bad9a
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/config.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/v2-light';
+
+
+// Layout profile
+@import 'layout/material-v2';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+// If you exclude 'material-icons.scss', please comment out this section.
+.fa {
+    &.fa-star:before { content: "star" }  // Star
+    //&.fa-star:before { content: "favorite" }  // Heart
+    //&.fa-star:before { content: "plus_one" }  // +1
+}
+
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active {
+    color: #ffd600;  // Star
+    //color: #ff4081;  // Heart
+    //color: #db4437;  // +1
+}
+
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star:before { content: "star_border" }  // Star
+    //.fa.fa-star:before { content: "favorite_border" }  // Heart
+    //.fa.fa-star:before { content: "plus_one" }  // +1
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star:before { content: "star" }  // Star
+        //.fa.fa-star:before { content: "favorite" }  // Heart
+        //.fa.fa-star:before { content: "plus_one" }  // +1
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/control.scss b/app/javascript/styles/material-v2-light/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/emoji-picker.scss b/app/javascript/styles/material-v2-light/emoji-picker.scss
new file mode 100644
index 000000000..d57c5c041
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover:before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icons.scss b/app/javascript/styles/material-v2-light/icons.scss
new file mode 100644
index 000000000..6778e3d2c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/icons.scss
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+
+.fa.fa-times,
+.fa.fa-eraser { vertical-align: middle }  //↑の例外
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v1.scss b/app/javascript/styles/material-v2-light/layout/material-v1.scss
new file mode 100644
index 000000000..92f369245
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v2.scss b/app/javascript/styles/material-v2-light/layout/material-v2.scss
new file mode 100644
index 000000000..86d2c496f
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/material-icons.scss b/app/javascript/styles/material-v2-light/material-icons.scss
new file mode 100644
index 000000000..52b959485
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/material-icons.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+@import 'config';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
+    &.fa-globe:before { content: "public" }
+    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
+    &.fa-sign-out:before { content: "exit_to_app" }
+    &.fa-search:before { content: "search" }
+    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
+    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
+    &.fa-paperclip:before { content: "attach_file" }
+    &.fa-tasks:before { content: "poll" }
+    &.fa-plus:before { content: "add" }
+    &.fa-unlock:before { content: "lock_open" }
+    &.fa-lock:before { content: "lock" }
+    &.fa-envelope:before { content: "mail" }
+    &.fa-home:before { content: "home" }
+    &.fa-bullhorn:before { content: "announcement" }
+    &.fa-sliders:before { content: "tune" }
+    &.fa-chevron-left:before { content: "arrow_back" }
+    &.fa-chevron-right:before { content: "arrow_forward" }
+    &.fa-reply:before { content: "reply" }
+    &.fa-reply-all:before { content: "reply_all" }
+    &.fa-bookmark:before { content: "bookmark" }
+    &.fa-ellipsis-h:before { content: "more_horiz" }
+    &.fa-bell:before { content: "notifications" }
+    &.fa-eraser:before { content: "clear_all" }
+    &.fa-users:before { content: "people" }
+    &.fa-file-text:before { content: "web" }
+    &.fa-user-plus:before { content: "person_add" }
+    &.fa-address-book:before { content: "explore" }
+    &.fa-address-book-o:before { content: "explore" }
+    &.fa-list:before { content: "list" }
+    &.fa-list-ul:before { content: "list" }
+    &.fa-eye:before { content: "visibility" }
+    &.fa-eye-slash:before { content : "visibility_off" }
+    &.fa-pencil:before { content: "create" }
+    &.fa-trash:before { content: "delete" }
+}
+
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark:before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark:before { content: "bookmark" }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/media.scss b/app/javascript/styles/material-v2-light/media.scss
new file mode 100644
index 000000000..74dfd8dcc
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/media.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.icon-button.overlayed {
+    border-radius: 50%;
+    background: $media-icon-background-color;
+    color: $media-icon-color;
+
+    &:hover {
+        background: $media-icon-background-color;
+        color: $media-icon-hover-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/mobile.scss b/app/javascript/styles/material-v2-light/mobile.scss
new file mode 100644
index 000000000..448f80585
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/mobile.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-color;
+            color: $tab-indicator-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper { @include shadow-4dp }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/modal.scss b/app/javascript/styles/material-v2-light/modal.scss
new file mode 100644
index 000000000..40710fe43
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/modal.scss
@@ -0,0 +1,61 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover { background: $card-background-hover-color }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/statuses.scss b/app/javascript/styles/material-v2-light/statuses.scss
new file mode 100644
index 000000000..c569b3b92
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/statuses.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+.status.light {
+    .display-name span { color: $info-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bea07a443..a11ecf185 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1240,7 +1240,10 @@ en:
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
     # additional theme
-    mastodon-material-dev: Material Dev (Light)
+    material-v1-dark: Material v1 (Dark)
+    material-v1-light: Material v1 (Light)
+    material-v2-dark: Material v2 (Dark)
+    material-v2-light: Material v2 (Light)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 211ffb09c..489463ed6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1222,7 +1222,10 @@ ja:
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
     # 追加テーマ
-    mastodon-material: Material Dev (ライト)
+    material-v1-dark: Material v1 (ダーク)
+    material-v1-light: Material v1 (ライト)
+    material-v2-dark: Material v2 (ダーク)
+    material-v2-light: Material v2 (ライト)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index e93b9f8f1..015c9ddf7 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -3,4 +3,7 @@ contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
 
 # 追加テーマ
-mastodon-material: styles/mastodon-material-dev.scss
+material-v1-dark: styles/material-v1-dark.scss
+material-v1-light: styles/material-v1-light.scss
+material-v2-dark: styles/material-v2-dark.scss
+material-v2-light: styles/material-v2-light.scss

From de430d30813cf1f65dc3c32d628c6b55f6583796 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 6 Apr 2020 21:09:01 +0900
Subject: [PATCH 034/200] clean up old theme fix override settings

---
 .../styles/mastodon-material-dev.scss         |  16 -
 .../styles/mastodon-material-dev/_mixins.scss |  23 --
 .../styles/mastodon-material-dev/account.scss | 127 -------
 .../styles/mastodon-material-dev/basics.scss  |  20 -
 .../styles/mastodon-material-dev/button.scss  |  59 ---
 .../styles/mastodon-material-dev/cards.scss   |   1 -
 .../mastodon-material-dev/color/dark.scss     |  30 --
 .../mastodon-material-dev/color/light.scss    |  93 -----
 .../styles/mastodon-material-dev/columns.scss | 351 ------------------
 .../mastodon-material-dev/components.scss     | 329 ----------------
 .../styles/mastodon-material-dev/config.scss  |  21 --
 .../styles/mastodon-material-dev/control.scss |  59 ---
 .../mastodon-material-dev/emoji-picker.scss   |  88 -----
 .../styles/mastodon-material-dev/icons.scss   |  36 --
 .../mastodon-material-dev/material-icons.scss |  88 -----
 .../styles/mastodon-material-dev/media.scss   |  17 -
 .../styles/mastodon-material-dev/mobile.scss  |   0
 .../profile/material-v1.scss                  |  52 ---
 .../profile/material-v2.scss                  |  66 ----
 .../mastodon-material-dev/statuses.scss       | 135 -------
 app/javascript/styles/material-v1-dark.scss   |   2 +-
 app/javascript/styles/material-v1-light.scss  |   2 +-
 app/javascript/styles/material-v2-dark.scss   |   2 +-
 app/javascript/styles/material-v2-light.scss  |   2 +-
 24 files changed, 4 insertions(+), 1615 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-material-dev.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/_mixins.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/account.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/basics.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/button.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/cards.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/columns.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/components.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/control.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/emoji-picker.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/material-icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/media.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/mobile.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/statuses.scss

diff --git a/app/javascript/styles/mastodon-material-dev.scss b/app/javascript/styles/mastodon-material-dev.scss
deleted file mode 100644
index 18935348a..000000000
--- a/app/javascript/styles/mastodon-material-dev.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@charset "UTF-8";
-
-@import 'application';
-@import 'mastodon-material-dev/account';
-@import 'mastodon-material-dev/basics';
-@import 'mastodon-material-dev/button';
-// @import 'mastodon-material-dev/cards';
-@import 'mastodon-material-dev/columns';
-@import 'mastodon-material-dev/components';
-@import 'mastodon-material-dev/config';
-@import 'mastodon-material-dev/control';
-@import 'mastodon-material-dev/emoji-picker';
-@import 'mastodon-material-dev/icons';
-@import 'mastodon-material-dev/material-icons';
-@import 'mastodon-material-dev/media';
-@import 'mastodon-material-dev/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/_mixins.scss b/app/javascript/styles/mastodon-material-dev/_mixins.scss
deleted file mode 100644
index 798e690e7..000000000
--- a/app/javascript/styles/mastodon-material-dev/_mixins.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
diff --git a/app/javascript/styles/mastodon-material-dev/account.scss b/app/javascript/styles/mastodon-material-dev/account.scss
deleted file mode 100644
index 46203b7e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/account.scss
+++ /dev/null
@@ -1,127 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name,
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $card-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $secondary-text-color;
-
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $outlined-chip-color;
-    border: 1px solid $border-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/basics.scss b/app/javascript/styles/mastodon-material-dev/basics.scss
deleted file mode 100644
index fd5abf7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/basics.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-body {
-    background: $background-color;
-}
-
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/button.scss b/app/javascript/styles/mastodon-material-dev/button.scss
deleted file mode 100644
index b1a0b99a3..000000000
--- a/app/javascript/styles/mastodon-material-dev/button.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active { color: $icon-button-active-color }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/cards.scss b/app/javascript/styles/mastodon-material-dev/cards.scss
deleted file mode 100644
index 08778d7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/cards.scss
+++ /dev/null
@@ -1 +0,0 @@
-{\rtf1}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/dark.scss b/app/javascript/styles/mastodon-material-dev/color/dark.scss
deleted file mode 100644
index 75759126a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/dark.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #db4437;
-$secondary-color: #ffffff;
-$error-color: #d50000;
-
-// Text color
-$ui-text-color: #ffffff;
-$secondary-text-color: #80868b;
-$info-text-color: #5e5e5e;
-$tips-text-color: #ffffff;
-$disabled-text-color: #ffffff;
-$inverted-text-color: #ffffff;
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #121212;
-
-// Icon color
-$icon-color: #757575;
-
-// Button color
-$icon-button-color: #757575;
-$contained-button-color: #4285f4;
-
-// Derived color
-$top-bar-color: lighten($background-color, 10%);
-$search-bar-color: lighten($background-color, 20%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/light.scss b/app/javascript/styles/mastodon-material-dev/color/light.scss
deleted file mode 100644
index c2c47545a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/light.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$ui-text-color: #202124;
-$ui-inverted-text-color: #ffffff;
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$card-background-color: $background-color;
-$card-background-inactive-color: darken($card-background-color, 6%);
-$list-background-color: $background-color;
-$list-background-inactive-color: darken($list-background-color, 6%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: $disabled-icon-color;
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$top-bar-hover-color: $icon-background-hover-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/columns.scss b/app/javascript/styles/mastodon-material-dev/columns.scss
deleted file mode 100644
index 796382d31..000000000
--- a/app/javascript/styles/mastodon-material-dev/columns.scss
+++ /dev/null
@@ -1,351 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $ui-text-color;
-    }
-
-    &.active {
-        .column-header__icon {
-            color: $primary-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $icon-button-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $icon-button-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $icon-button-active-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-arrows { font-size: 16px }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &:before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $top-bar-color;
-            padding: 16px;
-        }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $menu-background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $menu-background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $menu-background-hover-color }
-
-    &:active,
-    &:focus { background: $menu-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $icon-color;
-    padding: 16px;
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-.muted {
-    .status__content {
-        color: $primary-text-color;
-
-        p { color: $primary-text-color }
-
-        a { color: $secondary-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-}
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $top-bar-color;
-        border-bottom: 1px solid $border-color;
-    
-        button {
-            background: $top-bar-color;
-            color: $secondary-text-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-    
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-div.notification.notification-favourite.focusable,
-div.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
-.notification-favourite .status.status-direct { background: transparent }
-
-.relationship-tag {
-    color: $ui-inverted-text-color;
-    background-color: $media-icon-background-color;
-    font-size: 12px;
-    border-radius: 17px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/components.scss b/app/javascript/styles/mastodon-material-dev/components.scss
deleted file mode 100644
index e2a0d6af8..000000000
--- a/app/javascript/styles/mastodon-material-dev/components.scss
+++ /dev/null
@@ -1,329 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $top-bar-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 12px auto 12px;
-        padding: 8px;
-        flex: none;
-        height: 16px;
-    
-        &:hover { color: $icon-button-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $background-color;
-
-        &.darker { background: $card-background-color }
-
-        &__mastodon {
-            background: $background-color
-        }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $ui-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 10px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $ui-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.account__avatar {
-    border-radius: $avater-radius;
-    width: 40px;
-    height: 40px;
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 9px 16px;
-        background: $menu-background-color;
-        color: $ui-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea__textarea {
-        background: $background-color;
-        color: $ui-text-color;
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
-}
-
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
-
-    &:focus { border-color: $border-active-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
deleted file mode 100644
index 3095407d8..000000000
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-
-// Color scheme
-@import 'color/light';
-
-
-// Profile
-@import 'profile/material-v1';
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/control.scss b/app/javascript/styles/mastodon-material-dev/control.scss
deleted file mode 100644
index 9048d1228..000000000
--- a/app/javascript/styles/mastodon-material-dev/control.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $disabled-icon-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 24px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss b/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
deleted file mode 100644
index d5eada557..000000000
--- a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $ui-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover:before {
-        background-color: $icon-background-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/icons.scss b/app/javascript/styles/mastodon-material-dev/icons.scss
deleted file mode 100644
index d4cc4ebff..000000000
--- a/app/javascript/styles/mastodon-material-dev/icons.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
-
-.fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/material-icons.scss b/app/javascript/styles/mastodon-material-dev/material-icons.scss
deleted file mode 100644
index d7c8fcbd7..000000000
--- a/app/javascript/styles/mastodon-material-dev/material-icons.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/media.scss b/app/javascript/styles/mastodon-material-dev/media.scss
deleted file mode 100644
index 14b43d4ea..000000000
--- a/app/javascript/styles/mastodon-material-dev/media.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
-        background: $media-icon-background-color;
-        color: $media-icon-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/mobile.scss b/app/javascript/styles/mastodon-material-dev/mobile.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
deleted file mode 100644
index b18ec1b72..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 2px;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
deleted file mode 100644
index 3e19b60e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/statuses.scss b/app/javascript/styles/mastodon-material-dev/statuses.scss
deleted file mode 100644
index 5f1da722f..000000000
--- a/app/javascript/styles/mastodon-material-dev/statuses.scss
+++ /dev/null
@@ -1,135 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info { font-size: 16px }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: 16px;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: $card-background-color;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: $card-background-color !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
index b1646b3df..98d8aaf28 100644
--- a/app/javascript/styles/material-v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-dark/account';
 @import 'material-v1-dark/basics';
 @import 'material-v1-dark/button';
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
index c75295e71..8668288e4 100644
--- a/app/javascript/styles/material-v1-light.scss
+++ b/app/javascript/styles/material-v1-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-light/account';
 @import 'material-v1-light/basics';
 @import 'material-v1-light/button';
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
index 04d5e399b..351cf8a73 100644
--- a/app/javascript/styles/material-v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-dark/account';
 @import 'material-v2-dark/basics';
 @import 'material-v2-dark/button';
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
index 51e5eabd4..3c7ccb250 100644
--- a/app/javascript/styles/material-v2-light.scss
+++ b/app/javascript/styles/material-v2-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-light/account';
 @import 'material-v2-light/basics';
 @import 'material-v2-light/button';

From 847ea24e0167743fb82831e0031fdcb1060e761b Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Mon, 6 Apr 2020 21:15:56 +0900
Subject: [PATCH 035/200] clean up old theme (#279)

fix override settings
---
 .../styles/mastodon-material-dev.scss         |  16 -
 .../styles/mastodon-material-dev/_mixins.scss |  23 --
 .../styles/mastodon-material-dev/account.scss | 127 -------
 .../styles/mastodon-material-dev/basics.scss  |  20 -
 .../styles/mastodon-material-dev/button.scss  |  59 ---
 .../styles/mastodon-material-dev/cards.scss   |   1 -
 .../mastodon-material-dev/color/dark.scss     |  30 --
 .../mastodon-material-dev/color/light.scss    |  93 -----
 .../styles/mastodon-material-dev/columns.scss | 351 ------------------
 .../mastodon-material-dev/components.scss     | 329 ----------------
 .../styles/mastodon-material-dev/config.scss  |  21 --
 .../styles/mastodon-material-dev/control.scss |  59 ---
 .../mastodon-material-dev/emoji-picker.scss   |  88 -----
 .../styles/mastodon-material-dev/icons.scss   |  36 --
 .../mastodon-material-dev/material-icons.scss |  88 -----
 .../styles/mastodon-material-dev/media.scss   |  17 -
 .../styles/mastodon-material-dev/mobile.scss  |   0
 .../profile/material-v1.scss                  |  52 ---
 .../profile/material-v2.scss                  |  66 ----
 .../mastodon-material-dev/statuses.scss       | 135 -------
 app/javascript/styles/material-v1-dark.scss   |   2 +-
 app/javascript/styles/material-v1-light.scss  |   2 +-
 app/javascript/styles/material-v2-dark.scss   |   2 +-
 app/javascript/styles/material-v2-light.scss  |   2 +-
 24 files changed, 4 insertions(+), 1615 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-material-dev.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/_mixins.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/account.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/basics.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/button.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/cards.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/columns.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/components.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/control.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/emoji-picker.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/material-icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/media.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/mobile.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/statuses.scss

diff --git a/app/javascript/styles/mastodon-material-dev.scss b/app/javascript/styles/mastodon-material-dev.scss
deleted file mode 100644
index 18935348a..000000000
--- a/app/javascript/styles/mastodon-material-dev.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@charset "UTF-8";
-
-@import 'application';
-@import 'mastodon-material-dev/account';
-@import 'mastodon-material-dev/basics';
-@import 'mastodon-material-dev/button';
-// @import 'mastodon-material-dev/cards';
-@import 'mastodon-material-dev/columns';
-@import 'mastodon-material-dev/components';
-@import 'mastodon-material-dev/config';
-@import 'mastodon-material-dev/control';
-@import 'mastodon-material-dev/emoji-picker';
-@import 'mastodon-material-dev/icons';
-@import 'mastodon-material-dev/material-icons';
-@import 'mastodon-material-dev/media';
-@import 'mastodon-material-dev/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/_mixins.scss b/app/javascript/styles/mastodon-material-dev/_mixins.scss
deleted file mode 100644
index 798e690e7..000000000
--- a/app/javascript/styles/mastodon-material-dev/_mixins.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
diff --git a/app/javascript/styles/mastodon-material-dev/account.scss b/app/javascript/styles/mastodon-material-dev/account.scss
deleted file mode 100644
index 46203b7e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/account.scss
+++ /dev/null
@@ -1,127 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name,
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $card-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $secondary-text-color;
-
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $outlined-chip-color;
-    border: 1px solid $border-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/basics.scss b/app/javascript/styles/mastodon-material-dev/basics.scss
deleted file mode 100644
index fd5abf7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/basics.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-body {
-    background: $background-color;
-}
-
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/button.scss b/app/javascript/styles/mastodon-material-dev/button.scss
deleted file mode 100644
index b1a0b99a3..000000000
--- a/app/javascript/styles/mastodon-material-dev/button.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active { color: $icon-button-active-color }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/cards.scss b/app/javascript/styles/mastodon-material-dev/cards.scss
deleted file mode 100644
index 08778d7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/cards.scss
+++ /dev/null
@@ -1 +0,0 @@
-{\rtf1}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/dark.scss b/app/javascript/styles/mastodon-material-dev/color/dark.scss
deleted file mode 100644
index 75759126a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/dark.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #db4437;
-$secondary-color: #ffffff;
-$error-color: #d50000;
-
-// Text color
-$ui-text-color: #ffffff;
-$secondary-text-color: #80868b;
-$info-text-color: #5e5e5e;
-$tips-text-color: #ffffff;
-$disabled-text-color: #ffffff;
-$inverted-text-color: #ffffff;
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #121212;
-
-// Icon color
-$icon-color: #757575;
-
-// Button color
-$icon-button-color: #757575;
-$contained-button-color: #4285f4;
-
-// Derived color
-$top-bar-color: lighten($background-color, 10%);
-$search-bar-color: lighten($background-color, 20%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/light.scss b/app/javascript/styles/mastodon-material-dev/color/light.scss
deleted file mode 100644
index c2c47545a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/light.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$ui-text-color: #202124;
-$ui-inverted-text-color: #ffffff;
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$card-background-color: $background-color;
-$card-background-inactive-color: darken($card-background-color, 6%);
-$list-background-color: $background-color;
-$list-background-inactive-color: darken($list-background-color, 6%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: $disabled-icon-color;
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$top-bar-hover-color: $icon-background-hover-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/columns.scss b/app/javascript/styles/mastodon-material-dev/columns.scss
deleted file mode 100644
index 796382d31..000000000
--- a/app/javascript/styles/mastodon-material-dev/columns.scss
+++ /dev/null
@@ -1,351 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $ui-text-color;
-    }
-
-    &.active {
-        .column-header__icon {
-            color: $primary-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $icon-button-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $icon-button-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $icon-button-active-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-arrows { font-size: 16px }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &:before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $top-bar-color;
-            padding: 16px;
-        }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $menu-background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $menu-background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $menu-background-hover-color }
-
-    &:active,
-    &:focus { background: $menu-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $icon-color;
-    padding: 16px;
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-.muted {
-    .status__content {
-        color: $primary-text-color;
-
-        p { color: $primary-text-color }
-
-        a { color: $secondary-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-}
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $top-bar-color;
-        border-bottom: 1px solid $border-color;
-    
-        button {
-            background: $top-bar-color;
-            color: $secondary-text-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-    
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-div.notification.notification-favourite.focusable,
-div.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
-.notification-favourite .status.status-direct { background: transparent }
-
-.relationship-tag {
-    color: $ui-inverted-text-color;
-    background-color: $media-icon-background-color;
-    font-size: 12px;
-    border-radius: 17px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/components.scss b/app/javascript/styles/mastodon-material-dev/components.scss
deleted file mode 100644
index e2a0d6af8..000000000
--- a/app/javascript/styles/mastodon-material-dev/components.scss
+++ /dev/null
@@ -1,329 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $top-bar-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 12px auto 12px;
-        padding: 8px;
-        flex: none;
-        height: 16px;
-    
-        &:hover { color: $icon-button-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $background-color;
-
-        &.darker { background: $card-background-color }
-
-        &__mastodon {
-            background: $background-color
-        }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $ui-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 10px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $ui-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.account__avatar {
-    border-radius: $avater-radius;
-    width: 40px;
-    height: 40px;
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 9px 16px;
-        background: $menu-background-color;
-        color: $ui-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea__textarea {
-        background: $background-color;
-        color: $ui-text-color;
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
-}
-
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
-
-    &:focus { border-color: $border-active-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
deleted file mode 100644
index 3095407d8..000000000
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-
-// Color scheme
-@import 'color/light';
-
-
-// Profile
-@import 'profile/material-v1';
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/control.scss b/app/javascript/styles/mastodon-material-dev/control.scss
deleted file mode 100644
index 9048d1228..000000000
--- a/app/javascript/styles/mastodon-material-dev/control.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $disabled-icon-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 24px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss b/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
deleted file mode 100644
index d5eada557..000000000
--- a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $ui-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover:before {
-        background-color: $icon-background-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/icons.scss b/app/javascript/styles/mastodon-material-dev/icons.scss
deleted file mode 100644
index d4cc4ebff..000000000
--- a/app/javascript/styles/mastodon-material-dev/icons.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
-
-.fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/material-icons.scss b/app/javascript/styles/mastodon-material-dev/material-icons.scss
deleted file mode 100644
index d7c8fcbd7..000000000
--- a/app/javascript/styles/mastodon-material-dev/material-icons.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/media.scss b/app/javascript/styles/mastodon-material-dev/media.scss
deleted file mode 100644
index 14b43d4ea..000000000
--- a/app/javascript/styles/mastodon-material-dev/media.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
-        background: $media-icon-background-color;
-        color: $media-icon-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/mobile.scss b/app/javascript/styles/mastodon-material-dev/mobile.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
deleted file mode 100644
index b18ec1b72..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 2px;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
deleted file mode 100644
index 3e19b60e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/statuses.scss b/app/javascript/styles/mastodon-material-dev/statuses.scss
deleted file mode 100644
index 5f1da722f..000000000
--- a/app/javascript/styles/mastodon-material-dev/statuses.scss
+++ /dev/null
@@ -1,135 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info { font-size: 16px }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: 16px;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: $card-background-color;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: $card-background-color !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
index b1646b3df..98d8aaf28 100644
--- a/app/javascript/styles/material-v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-dark/account';
 @import 'material-v1-dark/basics';
 @import 'material-v1-dark/button';
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
index c75295e71..8668288e4 100644
--- a/app/javascript/styles/material-v1-light.scss
+++ b/app/javascript/styles/material-v1-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-light/account';
 @import 'material-v1-light/basics';
 @import 'material-v1-light/button';
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
index 04d5e399b..351cf8a73 100644
--- a/app/javascript/styles/material-v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-dark/account';
 @import 'material-v2-dark/basics';
 @import 'material-v2-dark/button';
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
index 51e5eabd4..3c7ccb250 100644
--- a/app/javascript/styles/material-v2-light.scss
+++ b/app/javascript/styles/material-v2-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-light/account';
 @import 'material-v2-light/basics';
 @import 'material-v2-light/button';

From f7701806614b10eff1bf4c71b6bf2efc62ce60b9 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Mon, 6 Apr 2020 21:18:13 +0900
Subject: [PATCH 036/200] Features/material theme (#280)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Features/mild master (#278)

* 3.1.3 (#275)

* Fix announcements with fully-qualified mention to local user crashing WebUI (#13164)

* [Security] Bump puma from 4.3.1 to 4.3.2 (#13167)

Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix installation failing when Redis password contains special characters (#13156)

* Add support for special characters in Redis passwords

Fixes #13154

* Refactor

* Fix elasticsearch-api and faraday incompatibilities (#13166)

* Bump puma from 4.3.2 to 4.3.3 (#13177)

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132

* Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump oj from 3.10.1 to 3.10.3 (#13187)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/core from 7.8.4 to 7.8.6 (#13185)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Add tooltips to audio/video player buttons (#13203)

* Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170)

Fixes #13168

* Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)

Blocking a domain is closer to blocking all its users than to a mute
action.

* Remove useless `respond_to` calls (#13208)

* Change GIF label to be displayed even when autoplay is enabled in web UI (#13209)

* Fix too large announcements not being scrollable in web UI (#13211)

* Add specific rate limits for posting and following (#13172)

* Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148)

* Add sorting by username, creation and last activity in moderation view (#13076)

* Add ability to order accounts in moderation view

* Display last status date in “Most recent activity” for remote users

* Fix error when searching for URLs that contain the mention syntax (#13151)

Fixes #13150

* Set BUNDLE_PATH in CircleCI (#13214)

* Change description of privacy levels to be more intuitive in web UI (#13197)

* Improve description of privacy levels in compose interface

* Change strings in defaultMessage and source as well as english

Co-authored-by: Thibaut Girka <thib@sitedethib.com>

* Add ability to delete files uploaded for settings in admin UI (#13192)

* Allow deleting site uploads

* Refactor and move links into hints

* Fix i18n tests

* Fix HTML output of site_upload_delete_hint

* Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)

* Add skip_media_remove option to tootctl statuses remove

* Add skip_media_remove option to tootctl statuses remove

Co-authored-by: tateisu <tateisu@juggler.jp>

* Code style improvements in JavaScript (#13159)

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

* Add submit button to the top of preferences pages (#13068)

* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec

* Update nginx.conf (#13066)

* Change wording of media display preferences to be more intuitive (#13198)

* Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)

* Add support for links to statuses in announcements to be opened in web UI (#13212)

* Add support for links to public statuses in announcements to be opened in WebUI

* Please CodeClimate

* Fix public posts from silenced accounts not being changed to unlisted visibility (#13096)

* Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change local media attachments to perform heavy processing asynchronously (#13210)

Fix #9106

* Add federation support for the "hide network" preference (#11673)

* Change ActivityPub follower/following collections to not link first page

* Add support for hiding followers and following of remote users

* Switch to using a single `hide_collections` column

* Address code style remarks

* Bump cld3 from 3.2.6 to 3.3.0 (#13107)

* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Change video uploads to enforce certain limits (#13218)

- Dimensions at most 1920x1200
- Frame rate at most 60

* Change video uploads to always be converted to H264/MP4 (#13220)

Even if the container format is the same (.mp4), the codec could
be different and not playable in web browsers

* Change the string "hidden" to "blocked" in WebUI (#13221)

* Change the string "hidden" to "blocked" in WebUI.

* update

* Bump file-loader from 5.0.2 to 5.1.0 (#13225)

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump wicg-inert from 3.0.0 to 3.0.2 (#13226)

Bumps [wicg-inert](https://github.com/WICG/inert) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/WICG/inert/releases)
- [Commits](https://github.com/WICG/inert/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump cross-env from 6.0.3 to 7.0.2 (#13228)

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump eslint-plugin-react from 7.17.0 to 7.19.0 (#13224)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.17.0 to 7.19.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.17.0...v7.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)

* Fix videos with unsupported colorspace not being transcoded (#13242)

* Fix regression in “Edit media” modal in web UI (#13243)

* [Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235)

* Update Dockerfile

* Update Dockerfile

* Fix detailed view of direct messages displaying a 0 boost count (#13244)

The boost count is already removed from private toots,
do the same with direct messages.

* Add titles to warning presets in admin UI (#13252)

* Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)

* Add shortcuts to blacklist a user's e-mail domain in admin UI

* Add option to blacklist resolved MX and IP records for e-mail domains

* Fix some timeouts when searching URLs by limiting some database queries (#13253)

Only look up private toots from database if the request failed because of 401,
403 or 404 errors, as those may indicate a private toot, rather than something
that isn't a toot or cannot be processed.

* Fix WebUI crash in single-column mode on prehistoric browsers (#13267)

Fixes #13266

* Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)

Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases)
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 24.9.0 to 25.1.0 (#12973)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-dom from 16.12.0 to 16.13.0 (#13181)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sass from 1.25.0 to 1.26.3 (#13263)

Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.25.0...1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump mkdirp from 0.5.1 to 1.0.3 (#12979)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump redis from 2.8.0 to 3.0.2 (#13102)

Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.0 to 3.1.1 (#13230)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simple_form from 5.0.1 to 5.0.2 (#13231)

Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webmock from 3.8.0 to 3.8.3 (#13265)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump capistrano from 3.11.2 to 3.12.1 (#13264)

* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

* Decommission support for Ruby 2.4 (#13287)

* Update Gemfile

* Update README.md

* Fix frontend crash when deleting announcements (#13283)

This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)

As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.

This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present.

* Make bookmarks also searchable (#13271)

* Add link to bookmarks in web UI dropdown (#13273)

* Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)

* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js

* [Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Sidekiq::Logger.logger -> Sidekiq.logger

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix bookmarks also searchable (#13293)

* Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)

* Change poll option hover/active styling to be less confusing (#13313)

* Fix frontend crash when deleting announcements (#13312)

Refactor and fix #13283, which only worked in some cases.

* Fix media not being marked sensitive when client sets a CW but no text (#13277)

Mastodon enforces the “sensitive” flag on media attachments whenever a toot
is posted with a Content Warning. However, it does so *after* potentially
converting the Content Warning to toot text (when there is no toot text),
which leads to inconsistent and surprising behavior for API clients.
This commit fixes this inconsistency.

* Bump browser from 3.0.3 to 4.0.0 (#13307)

Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump simplecov from 0.18.2 to 0.18.5 (#13310)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump discard from 1.1.0 to 1.2.0 (#13308)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* New Crowdin translations (#13064)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations devise.en.yml (Icelandic)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations activerecord.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

* Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/core from 7.8.6 to 7.9.0 (#13303)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Change `tootctl media remove-orphans` to work for all classes (#13316)

Change `tootctl media lookup` to not use an interactive prompt

* Bump react-select from 3.0.8 to 3.1.0 (#13296)

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump webpack from 4.41.5 to 4.42.1 (#13319)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix Paperclip using deprecated URI.escape function (#13320)

Monkey-patch Paperclip to perform URL escaping in a slightly more
appropriate way, and get rid of runtime deprecation warnings.

* Bump brakeman from 4.7.2 to 4.8.0 (#13309)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix OCR not working on Safari because of unsupported worker-src CSP (#13323)

Fixes #13321

* Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors

* Fix incorrect deletion of local accounts imported by overwriting (#13350)

* Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)

* Bump pg from 1.2.2 to 1.2.3 (#13344)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.2...v1.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump oj from 3.10.3 to 3.10.5 (#13345)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump iso-639 from 0.2.8 to 0.3.5 (#13343)

Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases)
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump ox from 2.12.1 to 2.13.2 (#13342)

Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump better_errors from 2.5.1 to 2.6.0 (#13340)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix ImportsController param to permit :mode (#13347)

* Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump uuid from 3.4.0 to 7.0.2 (#13295)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)

* Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump react from 16.12.0 to 16.13.1 (#13337)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump stringz from 2.0.0 to 2.1.0 (#13331)

Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-jest from 25.1.0 to 25.2.4 (#13332)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump yargs from 15.1.0 to 15.3.1 (#13334)

Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump babel-loader from 8.0.6 to 8.1.0 (#13333)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix re-sending of e-mail confirmation not being rate limited (#13360)

Fix #13330

* Improve toot clicking areas (#13327)

* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI

* Fix background jobs not using locks like they are supposed to (#13361)

Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349

* Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump faker from 2.10.1 to 2.11.0 (#13363)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump bootsnap from 1.4.5 to 1.4.6 (#13369)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump json-ld from 3.1.1 to 3.1.2 (#13368)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix pinning a column in web UI sometimes redirecting out of web UI (#13376)

Fix #13216

* Fix returning results when searching for URL with non-zero offset (#13377)

Fix #13083

* Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)

Fix #13371

* Improve polls: option lengths & redesign (#13257)

This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.

* Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Add ability to filter audit log in admin UI (#13381)

* Update Vagrant box to Bionic (#13384)

* Update config.yml (#13379)

* Add explanation as to why unlocked accounts may have follow requests (#13385)

* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”

* Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)

* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3

* Bump version to 3.1.3 (#13389)

* Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review

* [Security] Update Dockerfile for Ruby 2.6.6 (#13393)

* Update .ruby-version (#13395)

* Fix “Show more” not switching to “Show less” on public pages (#13174)

* Fix “Show more” not switching to “Show less” on public pages

Fixes #13169

* Fix initial text of CW button on public pages when CW are unfolded by default

* Add rate limit for reporting (#13390)

* New Crowdin translations (#13317)

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Georgian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations simple_form.en.yml (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Hebrew)
[ci skip]

* New translations devise.en.yml (Hebrew)
[ci skip]

* New translations doorkeeper.en.yml (Hebrew)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Vietnamese)
[ci skip]

* New translations devise.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (German)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations devise.en.yml (Galician)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.y…

* clean up old theme (#279)

fix override settings

Co-authored-by: ThibG <thib@sitedethib.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: koyu <me@koyu.space>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: David Cook <divergentdave@gmail.com>
Co-authored-by: tateisu <tateisu@gmail.com>
Co-authored-by: tateisu <tateisu@juggler.jp>
Co-authored-by: Bèr Kessels <ber@berk.es>
Co-authored-by: guigeekz <pattusg@gmail.com>
Co-authored-by: Shlee <github@shl.ee>
Co-authored-by: mayaeh <mayaeh@marimo-net.org>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Daniel Sockwell <dsockwell@gmail.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Takeshi Umeda <noel.yoshiba@gmail.com>
Co-authored-by: Sasha Sorokin <dafri.nochiterov8@gmail.com>
Co-authored-by: fuyu <54523771+mfmfuyu@users.noreply.github.com>
Co-authored-by: Rintan <rintanminecraft@gmail.com>
---
 .../styles/mastodon-material-dev.scss         |  16 -
 .../styles/mastodon-material-dev/_mixins.scss |  23 --
 .../styles/mastodon-material-dev/account.scss | 127 -------
 .../styles/mastodon-material-dev/basics.scss  |  20 -
 .../styles/mastodon-material-dev/button.scss  |  59 ---
 .../styles/mastodon-material-dev/cards.scss   |   1 -
 .../mastodon-material-dev/color/dark.scss     |  30 --
 .../mastodon-material-dev/color/light.scss    |  93 -----
 .../styles/mastodon-material-dev/columns.scss | 351 ------------------
 .../mastodon-material-dev/components.scss     | 329 ----------------
 .../styles/mastodon-material-dev/config.scss  |  21 --
 .../styles/mastodon-material-dev/control.scss |  59 ---
 .../mastodon-material-dev/emoji-picker.scss   |  88 -----
 .../styles/mastodon-material-dev/icons.scss   |  36 --
 .../mastodon-material-dev/material-icons.scss |  88 -----
 .../styles/mastodon-material-dev/media.scss   |  17 -
 .../styles/mastodon-material-dev/mobile.scss  |   0
 .../profile/material-v1.scss                  |  52 ---
 .../profile/material-v2.scss                  |  66 ----
 .../mastodon-material-dev/statuses.scss       | 135 -------
 app/javascript/styles/material-v1-dark.scss   |   2 +-
 app/javascript/styles/material-v1-light.scss  |   2 +-
 app/javascript/styles/material-v2-dark.scss   |   2 +-
 app/javascript/styles/material-v2-light.scss  |   2 +-
 24 files changed, 4 insertions(+), 1615 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-material-dev.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/_mixins.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/account.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/basics.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/button.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/cards.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/color/light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/columns.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/components.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/control.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/emoji-picker.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/material-icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/media.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/mobile.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dev/statuses.scss

diff --git a/app/javascript/styles/mastodon-material-dev.scss b/app/javascript/styles/mastodon-material-dev.scss
deleted file mode 100644
index 18935348a..000000000
--- a/app/javascript/styles/mastodon-material-dev.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@charset "UTF-8";
-
-@import 'application';
-@import 'mastodon-material-dev/account';
-@import 'mastodon-material-dev/basics';
-@import 'mastodon-material-dev/button';
-// @import 'mastodon-material-dev/cards';
-@import 'mastodon-material-dev/columns';
-@import 'mastodon-material-dev/components';
-@import 'mastodon-material-dev/config';
-@import 'mastodon-material-dev/control';
-@import 'mastodon-material-dev/emoji-picker';
-@import 'mastodon-material-dev/icons';
-@import 'mastodon-material-dev/material-icons';
-@import 'mastodon-material-dev/media';
-@import 'mastodon-material-dev/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/_mixins.scss b/app/javascript/styles/mastodon-material-dev/_mixins.scss
deleted file mode 100644
index 798e690e7..000000000
--- a/app/javascript/styles/mastodon-material-dev/_mixins.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
diff --git a/app/javascript/styles/mastodon-material-dev/account.scss b/app/javascript/styles/mastodon-material-dev/account.scss
deleted file mode 100644
index 46203b7e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/account.scss
+++ /dev/null
@@ -1,127 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name,
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $card-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $secondary-text-color;
-
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $outlined-chip-color;
-    border: 1px solid $border-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/basics.scss b/app/javascript/styles/mastodon-material-dev/basics.scss
deleted file mode 100644
index fd5abf7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/basics.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-body {
-    background: $background-color;
-}
-
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/button.scss b/app/javascript/styles/mastodon-material-dev/button.scss
deleted file mode 100644
index b1a0b99a3..000000000
--- a/app/javascript/styles/mastodon-material-dev/button.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active { color: $icon-button-active-color }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/cards.scss b/app/javascript/styles/mastodon-material-dev/cards.scss
deleted file mode 100644
index 08778d7a8..000000000
--- a/app/javascript/styles/mastodon-material-dev/cards.scss
+++ /dev/null
@@ -1 +0,0 @@
-{\rtf1}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/dark.scss b/app/javascript/styles/mastodon-material-dev/color/dark.scss
deleted file mode 100644
index 75759126a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/dark.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #db4437;
-$secondary-color: #ffffff;
-$error-color: #d50000;
-
-// Text color
-$ui-text-color: #ffffff;
-$secondary-text-color: #80868b;
-$info-text-color: #5e5e5e;
-$tips-text-color: #ffffff;
-$disabled-text-color: #ffffff;
-$inverted-text-color: #ffffff;
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #121212;
-
-// Icon color
-$icon-color: #757575;
-
-// Button color
-$icon-button-color: #757575;
-$contained-button-color: #4285f4;
-
-// Derived color
-$top-bar-color: lighten($background-color, 10%);
-$search-bar-color: lighten($background-color, 20%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/color/light.scss b/app/javascript/styles/mastodon-material-dev/color/light.scss
deleted file mode 100644
index c2c47545a..000000000
--- a/app/javascript/styles/mastodon-material-dev/color/light.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$ui-text-color: #202124;
-$ui-inverted-text-color: #ffffff;
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$card-background-color: $background-color;
-$card-background-inactive-color: darken($card-background-color, 6%);
-$list-background-color: $background-color;
-$list-background-inactive-color: darken($list-background-color, 6%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: $disabled-icon-color;
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$top-bar-hover-color: $icon-background-hover-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/columns.scss b/app/javascript/styles/mastodon-material-dev/columns.scss
deleted file mode 100644
index 796382d31..000000000
--- a/app/javascript/styles/mastodon-material-dev/columns.scss
+++ /dev/null
@@ -1,351 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $ui-text-color;
-    }
-
-    &.active {
-        .column-header__icon {
-            color: $primary-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $icon-button-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $icon-button-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $icon-button-active-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-arrows { font-size: 16px }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &:before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $top-bar-color;
-            padding: 16px;
-        }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $menu-background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $menu-background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $menu-background-hover-color }
-
-    &:active,
-    &:focus { background: $menu-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $icon-color;
-    padding: 16px;
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-.muted {
-    .status__content {
-        color: $primary-text-color;
-
-        p { color: $primary-text-color }
-
-        a { color: $secondary-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-}
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $top-bar-color;
-        border-bottom: 1px solid $border-color;
-    
-        button {
-            background: $top-bar-color;
-            color: $secondary-text-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
-    
-                &:before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-div.notification.notification-favourite.focusable,
-div.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
-.notification-favourite .status.status-direct { background: transparent }
-
-.relationship-tag {
-    color: $ui-inverted-text-color;
-    background-color: $media-icon-background-color;
-    font-size: 12px;
-    border-radius: 17px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/components.scss b/app/javascript/styles/mastodon-material-dev/components.scss
deleted file mode 100644
index e2a0d6af8..000000000
--- a/app/javascript/styles/mastodon-material-dev/components.scss
+++ /dev/null
@@ -1,329 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $top-bar-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 12px auto 12px;
-        padding: 8px;
-        flex: none;
-        height: 16px;
-    
-        &:hover { color: $icon-button-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $background-color;
-
-        &.darker { background: $card-background-color }
-
-        &__mastodon {
-            background: $background-color
-        }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $ui-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 10px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $ui-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.account__avatar {
-    border-radius: $avater-radius;
-    width: 40px;
-    height: 40px;
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 9px 16px;
-        background: $menu-background-color;
-        color: $ui-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea__textarea {
-        background: $background-color;
-        color: $ui-text-color;
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
-}
-
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
-
-    &:focus { border-color: $border-active-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss
deleted file mode 100644
index 3095407d8..000000000
--- a/app/javascript/styles/mastodon-material-dev/config.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@charset "UTF-8";
-
-
-// Color scheme
-@import 'color/light';
-
-
-// Profile
-@import 'profile/material-v1';
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/control.scss b/app/javascript/styles/mastodon-material-dev/control.scss
deleted file mode 100644
index 9048d1228..000000000
--- a/app/javascript/styles/mastodon-material-dev/control.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $disabled-icon-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 24px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss b/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
deleted file mode 100644
index d5eada557..000000000
--- a/app/javascript/styles/mastodon-material-dev/emoji-picker.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $ui-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover:before {
-        background-color: $icon-background-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/icons.scss b/app/javascript/styles/mastodon-material-dev/icons.scss
deleted file mode 100644
index d4cc4ebff..000000000
--- a/app/javascript/styles/mastodon-material-dev/icons.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
-
-.fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/material-icons.scss b/app/javascript/styles/mastodon-material-dev/material-icons.scss
deleted file mode 100644
index d7c8fcbd7..000000000
--- a/app/javascript/styles/mastodon-material-dev/material-icons.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/media.scss b/app/javascript/styles/mastodon-material-dev/media.scss
deleted file mode 100644
index 14b43d4ea..000000000
--- a/app/javascript/styles/mastodon-material-dev/media.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
-        background: $media-icon-background-color;
-        color: $media-icon-hover-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/mobile.scss b/app/javascript/styles/mastodon-material-dev/mobile.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
deleted file mode 100644
index b18ec1b72..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v1.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 2px;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss b/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
deleted file mode 100644
index 3e19b60e4..000000000
--- a/app/javascript/styles/mastodon-material-dev/profile/material-v2.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Bar radius settings
-$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Favorite icon settings
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
-
-.star-icon.active,
-.notification__favourite-icon-wrapper .star-icon {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dev/statuses.scss b/app/javascript/styles/mastodon-material-dev/statuses.scss
deleted file mode 100644
index 5f1da722f..000000000
--- a/app/javascript/styles/mastodon-material-dev/statuses.scss
+++ /dev/null
@@ -1,135 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info { font-size: 16px }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: 16px;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: $card-background-color;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: $card-background-color !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
index b1646b3df..98d8aaf28 100644
--- a/app/javascript/styles/material-v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-dark/account';
 @import 'material-v1-dark/basics';
 @import 'material-v1-dark/button';
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
index c75295e71..8668288e4 100644
--- a/app/javascript/styles/material-v1-light.scss
+++ b/app/javascript/styles/material-v1-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v1-light/account';
 @import 'material-v1-light/basics';
 @import 'material-v1-light/button';
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
index 04d5e399b..351cf8a73 100644
--- a/app/javascript/styles/material-v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-dark/account';
 @import 'material-v2-dark/basics';
 @import 'material-v2-dark/button';
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
index 51e5eabd4..3c7ccb250 100644
--- a/app/javascript/styles/material-v2-light.scss
+++ b/app/javascript/styles/material-v2-light.scss
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-//@import 'application';
+@import 'application';
 @import 'material-v2-light/account';
 @import 'material-v2-light/basics';
 @import 'material-v2-light/button';

From c0776cf12704ef6c756b31345e06d87aae579055 Mon Sep 17 00:00:00 2001
From: Rintan <rintanminecraft@gmail.com>
Date: Tue, 28 Apr 2020 12:57:07 +0900
Subject: [PATCH 037/200] =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=9E=E3=82=92?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E3=81=B8=E3=81=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20Mastodon=E9=A2=A8=E3=81=AE=E3=83=86=E3=83=BC=E3=83=9E?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../styles/mastodon-material-dark.scss        |  18 +
 .../mastodon-material-dark/_functions.scss    |  12 +
 .../mastodon-material-dark/_mixins.scss       |  25 +
 .../mastodon-material-dark/account.scss       | 143 ++++++
 .../styles/mastodon-material-dark/basics.scss |  24 +
 .../styles/mastodon-material-dark/button.scss |  95 ++++
 .../styles/mastodon-material-dark/cards.scss  |  29 ++
 .../color/mastodon-dark.scss                  |  30 +-
 .../mastodon-material-dark/columns.scss       | 461 ++++++++++++++++++
 .../mastodon-material-dark/components.scss    | 389 +++++++++++++++
 .../styles/mastodon-material-dark/config.scss |  39 ++
 .../mastodon-material-dark/control.scss       |  69 +++
 .../mastodon-material-dark/emoji-picker.scss  |  90 ++++
 .../styles/mastodon-material-dark/icons.scss  |  48 ++
 .../layout/material-v1.scss                   |   0
 .../material-icons.scss                       | 146 ++++++
 .../styles/mastodon-material-dark/media.scss  |  99 ++++
 .../styles/mastodon-material-dark/mobile.scss |  48 ++
 .../styles/mastodon-material-dark/modal.scss  |  76 +++
 .../mastodon-material-dark/statuses.scss      | 172 +++++++
 .../styles/mastodon-material-light.scss       |  18 +
 .../mastodon-material-light/_functions.scss   |  12 +
 .../mastodon-material-light/_mixins.scss      |  25 +
 .../mastodon-material-light/account.scss      | 143 ++++++
 .../mastodon-material-light/basics.scss       |  24 +
 .../mastodon-material-light/button.scss       |  95 ++++
 .../styles/mastodon-material-light/cards.scss |  29 ++
 .../color/mastodon-light.scss                 |  30 +-
 .../mastodon-material-light/columns.scss      | 461 ++++++++++++++++++
 .../mastodon-material-light/components.scss   | 389 +++++++++++++++
 .../mastodon-material-light/config.scss       |  39 ++
 .../mastodon-material-light/control.scss      |  69 +++
 .../mastodon-material-light/emoji-picker.scss |  90 ++++
 .../styles/mastodon-material-light/icons.scss |  48 ++
 .../layout/material-v1.scss                   |   0
 .../material-icons.scss                       | 146 ++++++
 .../styles/mastodon-material-light/media.scss |  99 ++++
 .../mastodon-material-light/mobile.scss       |  48 ++
 .../styles/mastodon-material-light/modal.scss |  76 +++
 .../mastodon-material-light/statuses.scss     | 172 +++++++
 .../styles/material-v1-dark/_functions.scss   |  12 +
 .../styles/material-v1-dark/account.scss      |  30 +-
 .../styles/material-v1-dark/button.scss       |  17 +
 .../color/mastodon-light.scss                 | 106 ----
 .../material-v1-dark/color/v1-dark.scss       |  30 +-
 .../material-v1-dark/color/v1-light.scss      | 107 ----
 .../material-v1-dark/color/v2-dark.scss       | 107 ----
 .../material-v1-dark/color/v2-light.scss      | 107 ----
 .../styles/material-v1-dark/columns.scss      | 102 +++-
 .../styles/material-v1-dark/components.scss   |  82 +++-
 .../styles/material-v1-dark/config.scss       |  34 +-
 .../styles/material-v1-dark/emoji-picker.scss |   6 +-
 .../styles/material-v1-dark/icons.scss        |  19 +-
 .../material-v1-dark/layout/material-v2.scss  |  65 ---
 .../material-v1-dark/material-icons.scss      | 126 +++--
 .../styles/material-v1-dark/media.scss        |  75 ++-
 .../styles/material-v1-dark/mobile.scss       |   9 +-
 .../styles/material-v1-dark/modal.scss        |  17 +-
 .../styles/material-v1-dark/statuses.scss     |  28 +-
 .../styles/material-v1-light/_functions.scss  |  12 +
 .../styles/material-v1-light/account.scss     |  30 +-
 .../styles/material-v1-light/button.scss      |  17 +
 .../color/mastodon-dark.scss                  | 107 ----
 .../material-v1-light/color/v1-dark.scss      | 107 ----
 .../material-v1-light/color/v1-light.scss     |  28 +-
 .../material-v1-light/color/v2-dark.scss      | 107 ----
 .../material-v1-light/color/v2-light.scss     | 107 ----
 .../styles/material-v1-light/columns.scss     | 102 +++-
 .../styles/material-v1-light/components.scss  |  82 +++-
 .../styles/material-v1-light/config.scss      |  34 +-
 .../material-v1-light/emoji-picker.scss       |   6 +-
 .../styles/material-v1-light/icons.scss       |  19 +-
 .../material-v1-light/layout/material-v2.scss |  65 ---
 .../material-v1-light/material-icons.scss     | 126 +++--
 .../styles/material-v1-light/media.scss       |  75 ++-
 .../styles/material-v1-light/mobile.scss      |   9 +-
 .../styles/material-v1-light/modal.scss       |  17 +-
 .../styles/material-v1-light/statuses.scss    |  28 +-
 .../styles/material-v2-dark/_functions.scss   |  12 +
 .../styles/material-v2-dark/account.scss      |  30 +-
 .../styles/material-v2-dark/button.scss       |  17 +
 .../material-v2-dark/color/mastodon-dark.scss | 107 ----
 .../color/mastodon-light.scss                 | 106 ----
 .../material-v2-dark/color/v1-dark.scss       | 107 ----
 .../material-v2-dark/color/v1-light.scss      | 107 ----
 .../material-v2-dark/color/v2-dark.scss       |  32 +-
 .../material-v2-dark/color/v2-light.scss      | 107 ----
 .../styles/material-v2-dark/columns.scss      | 102 +++-
 .../styles/material-v2-dark/components.scss   |  82 +++-
 .../styles/material-v2-dark/config.scss       |  34 +-
 .../styles/material-v2-dark/emoji-picker.scss |   6 +-
 .../styles/material-v2-dark/icons.scss        |  19 +-
 .../material-v2-dark/material-icons.scss      | 126 +++--
 .../styles/material-v2-dark/media.scss        |  75 ++-
 .../styles/material-v2-dark/mobile.scss       |   9 +-
 .../styles/material-v2-dark/modal.scss        |  17 +-
 .../styles/material-v2-dark/statuses.scss     |  28 +-
 .../styles/material-v2-light/_functions.scss  |  12 +
 .../styles/material-v2-light/account.scss     |  30 +-
 .../styles/material-v2-light/button.scss      |  17 +
 .../color/mastodon-dark.scss                  | 107 ----
 .../color/mastodon-light.scss                 | 106 ----
 .../material-v2-light/color/v1-dark.scss      | 107 ----
 .../material-v2-light/color/v1-light.scss     | 107 ----
 .../material-v2-light/color/v2-dark.scss      | 107 ----
 .../material-v2-light/color/v2-light.scss     |  30 +-
 .../styles/material-v2-light/columns.scss     | 102 +++-
 .../styles/material-v2-light/components.scss  |  82 +++-
 .../styles/material-v2-light/config.scss      |  34 +-
 .../material-v2-light/emoji-picker.scss       |   6 +-
 .../styles/material-v2-light/icons.scss       |  19 +-
 .../material-v2-light/material-icons.scss     | 126 +++--
 .../styles/material-v2-light/media.scss       |  75 ++-
 .../styles/material-v2-light/mobile.scss      |   9 +-
 .../styles/material-v2-light/modal.scss       |  17 +-
 .../styles/material-v2-light/statuses.scss    |  28 +-
 config/locales/en.yml                         |   2 +
 config/locales/ja.yml                         |   2 +
 config/themes.yml                             |   2 +
 119 files changed, 5836 insertions(+), 2597 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/_functions.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/_mixins.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/account.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/basics.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/button.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/cards.scss
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark}/color/mastodon-dark.scss (77%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/columns.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/components.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/config.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/control.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/icons.scss
 rename app/javascript/styles/{material-v2-dark => mastodon-material-dark}/layout/material-v1.scss (100%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/material-icons.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/media.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/mobile.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/modal.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/statuses.scss
 create mode 100644 app/javascript/styles/mastodon-material-light.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/_functions.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/_mixins.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/account.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/basics.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/button.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/cards.scss
 rename app/javascript/styles/{material-v1-light => mastodon-material-light}/color/mastodon-light.scss (74%)
 create mode 100644 app/javascript/styles/mastodon-material-light/columns.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/components.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/config.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/control.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/icons.scss
 rename app/javascript/styles/{material-v2-light => mastodon-material-light}/layout/material-v1.scss (100%)
 create mode 100644 app/javascript/styles/mastodon-material-light/material-icons.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/media.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/mobile.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/modal.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/statuses.scss
 create mode 100644 app/javascript/styles/material-v1-dark/_functions.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-light/_functions.scss
 delete mode 100644 app/javascript/styles/material-v1-light/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-light/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-light/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-v1-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v2-dark/_functions.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/_functions.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/v2-dark.scss

diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
new file mode 100644
index 000000000..901a441be
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+@import 'application';
+@import 'mastodon-material-dark/account';
+@import 'mastodon-material-dark/basics';
+@import 'mastodon-material-dark/button';
+//@import 'mastodon-material-dark/cards';
+@import 'mastodon-material-dark/columns';
+@import 'mastodon-material-dark/components';
+@import 'mastodon-material-dark/config';
+@import 'mastodon-material-dark/control';
+@import 'mastodon-material-dark/emoji-picker';
+@import 'mastodon-material-dark/icons';
+@import 'mastodon-material-dark/material-icons';
+@import 'mastodon-material-dark/media';
+@import 'mastodon-material-dark/mobile';
+@import 'mastodon-material-dark/modal';
+@import 'mastodon-material-dark/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/_functions.scss b/app/javascript/styles/mastodon-material-dark/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/_mixins.scss b/app/javascript/styles/mastodon-material-dark/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/mastodon-material-dark/account.scss b/app/javascript/styles/mastodon-material-dark/account.scss
new file mode 100644
index 000000000..b43194729
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/account.scss
@@ -0,0 +1,143 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name { color: $primary-text-color }
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $text-tab-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/basics.scss b/app/javascript/styles/mastodon-material-dark/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/button.scss b/app/javascript/styles/mastodon-material-dark/button.scss
new file mode 100644
index 000000000..38fd1a3c1
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/button.scss
@@ -0,0 +1,95 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/cards.scss b/app/javascript/styles/mastodon-material-dark/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
similarity index 77%
rename from app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
rename to app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index 14ef148f4..47f990072 100644
--- a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -27,7 +27,7 @@ $menu-background-color: #d9e1e8;
 $menu-background-hover-color: lighten($menu-background-color, 6%);
 $menu-background-active-color: lighten($menu-background-color, 10%);
 $menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #444b5d;
+$card-background-color: #313543;
 $card-background-hover-color: lighten($card-background-color, 6%);
 $card-background-inactive-color: lighten($card-background-color, 10%);
 $list-background-color: #282c37;
@@ -60,7 +60,7 @@ $top-bar-icon-active-color: $icon-hover-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -103,5 +103,27 @@ $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: #d9e1e8;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/columns.scss b/app/javascript/styles/mastodon-material-dark/columns.scss
new file mode 100644
index 000000000..689028581
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/columns.scss
@@ -0,0 +1,461 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-background-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-background-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $tab-background-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+// read notification
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/components.scss b/app/javascript/styles/mastodon-material-dark/components.scss
new file mode 100644
index 000000000..92d2801f4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/components.scss
@@ -0,0 +1,389 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
+}
+
+
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/config.scss b/app/javascript/styles/mastodon-material-dark/config.scss
new file mode 100644
index 000000000..77d7982e4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/config.scss
@@ -0,0 +1,39 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/mastodon-dark';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/control.scss b/app/javascript/styles/mastodon-material-dark/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/emoji-picker.scss
new file mode 100644
index 000000000..2c17701cf
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-active-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover::before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/icons.scss b/app/javascript/styles/mastodon-material-dark/icons.scss
new file mode 100644
index 000000000..beca11a6f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/icons.scss
@@ -0,0 +1,48 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
+
+.fa.fa-times,
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/layout/material-v1.scss
rename to app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
diff --git a/app/javascript/styles/mastodon-material-dark/material-icons.scss b/app/javascript/styles/mastodon-material-dark/material-icons.scss
new file mode 100644
index 000000000..e473dfe31
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/material-icons.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'functions';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/media.scss b/app/javascript/styles/mastodon-material-dark/media.scss
new file mode 100644
index 000000000..64a69a129
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/media.scss
@@ -0,0 +1,99 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/mobile.scss b/app/javascript/styles/mastodon-material-dark/mobile.scss
new file mode 100644
index 000000000..de6f4e94c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/mobile.scss
@@ -0,0 +1,48 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/modal.scss b/app/javascript/styles/mastodon-material-dark/modal.scss
new file mode 100644
index 000000000..7734c8dfa
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/modal.scss
@@ -0,0 +1,76 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/statuses.scss b/app/javascript/styles/mastodon-material-dark/statuses.scss
new file mode 100644
index 000000000..f60c2d859
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/statuses.scss
@@ -0,0 +1,172 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &__prepend { color: $secondary-text-color }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
new file mode 100644
index 000000000..7a725f929
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+@import 'application';
+@import 'mastodon-material-light/account';
+@import 'mastodon-material-light/basics';
+@import 'mastodon-material-light/button';
+//@import 'mastodon-material-light/cards';
+@import 'mastodon-material-light/columns';
+@import 'mastodon-material-light/components';
+@import 'mastodon-material-light/config';
+@import 'mastodon-material-light/control';
+@import 'mastodon-material-light/emoji-picker';
+@import 'mastodon-material-light/icons';
+@import 'mastodon-material-light/material-icons';
+@import 'mastodon-material-light/media';
+@import 'mastodon-material-light/mobile';
+@import 'mastodon-material-light/modal';
+@import 'mastodon-material-light/statuses';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/_functions.scss b/app/javascript/styles/mastodon-material-light/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/_mixins.scss b/app/javascript/styles/mastodon-material-light/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/mastodon-material-light/account.scss b/app/javascript/styles/mastodon-material-light/account.scss
new file mode 100644
index 000000000..b43194729
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/account.scss
@@ -0,0 +1,143 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name { color: $primary-text-color }
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $text-tab-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/basics.scss b/app/javascript/styles/mastodon-material-light/basics.scss
new file mode 100644
index 000000000..5c7c3dc04
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/basics.scss
@@ -0,0 +1,24 @@
+@charset "UTF-8";
+@import 'config';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/button.scss b/app/javascript/styles/mastodon-material-light/button.scss
new file mode 100644
index 000000000..38fd1a3c1
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/button.scss
@@ -0,0 +1,95 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/cards.scss b/app/javascript/styles/mastodon-material-light/cards.scss
new file mode 100644
index 000000000..96988f2c9
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/cards.scss
@@ -0,0 +1,29 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+}
+
+.status {
+    border-bottom: 0 !important;
+    border-radius: $card-radius;
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
similarity index 74%
rename from app/javascript/styles/material-v1-light/color/mastodon-light.scss
rename to app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 62a064b87..22bcc9f91 100644
--- a/app/javascript/styles/material-v1-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -59,7 +59,7 @@ $top-bar-icon-active-color: $icon-hover-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -101,6 +101,28 @@ $search-bar-color: #d9e1e8;
 $search-bar-focus-color: $background-color;
 
 // Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/columns.scss b/app/javascript/styles/mastodon-material-light/columns.scss
new file mode 100644
index 000000000..689028581
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/columns.scss
@@ -0,0 +1,461 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $secondary-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-background-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+}
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-background-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $tab-background-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+// read notification
+.notification.notification-favourite.focusable,
+.notification.notification-follow.focusable { background: $list-background-inactive-color }
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.react-swipeable-view-container { height: auto }
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/components.scss b/app/javascript/styles/mastodon-material-light/components.scss
new file mode 100644
index 000000000..92d2801f4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/components.scss
@@ -0,0 +1,389 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker { background: $card-background-color }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 10px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
+}
+
+
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/config.scss b/app/javascript/styles/mastodon-material-light/config.scss
new file mode 100644
index 000000000..3bcd48014
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/config.scss
@@ -0,0 +1,39 @@
+@charset "UTF-8";
+
+
+// Color scheme
+@import 'color/mastodon-light';
+
+
+// Layout profile
+@import 'layout/material-v1';
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/control.scss b/app/javascript/styles/mastodon-material-light/control.scss
new file mode 100644
index 000000000..7bd251291
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/control.scss
@@ -0,0 +1,69 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/emoji-picker.scss
new file mode 100644
index 000000000..2c17701cf
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/emoji-picker.scss
@@ -0,0 +1,90 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $ui-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-active-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover::before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/icons.scss b/app/javascript/styles/mastodon-material-light/icons.scss
new file mode 100644
index 000000000..beca11a6f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/icons.scss
@@ -0,0 +1,48 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
+
+.fa.fa-times,
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
similarity index 100%
rename from app/javascript/styles/material-v2-light/layout/material-v1.scss
rename to app/javascript/styles/mastodon-material-light/layout/material-v1.scss
diff --git a/app/javascript/styles/mastodon-material-light/material-icons.scss b/app/javascript/styles/mastodon-material-light/material-icons.scss
new file mode 100644
index 000000000..e473dfe31
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/material-icons.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+@import 'config';
+@import 'functions';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/media.scss b/app/javascript/styles/mastodon-material-light/media.scss
new file mode 100644
index 000000000..64a69a129
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/media.scss
@@ -0,0 +1,99 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/mobile.scss b/app/javascript/styles/mastodon-material-light/mobile.scss
new file mode 100644
index 000000000..de6f4e94c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/mobile.scss
@@ -0,0 +1,48 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    
+    .column { margin: 0 !important }
+
+    .search__input { padding: 16px 38px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/modal.scss b/app/javascript/styles/mastodon-material-light/modal.scss
new file mode 100644
index 000000000..7734c8dfa
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/modal.scss
@@ -0,0 +1,76 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/statuses.scss b/app/javascript/styles/mastodon-material-light/statuses.scss
new file mode 100644
index 000000000..f60c2d859
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/statuses.scss
@@ -0,0 +1,172 @@
+@charset "UTF-8";
+@import 'config';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: 16px;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: 16px;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &__prepend { color: $secondary-text-color }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/_functions.scss b/app/javascript/styles/material-v1-dark/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/account.scss b/app/javascript/styles/material-v1-dark/account.scss
index 2d8f2f210..b43194729 100644
--- a/app/javascript/styles/material-v1-dark/account.scss
+++ b/app/javascript/styles/material-v1-dark/account.scss
@@ -5,7 +5,7 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name,
+    .account__display-name { color: $primary-text-color }
     .account__display-name strong { color: $secondary-text-color }
 
     &__avatar {
@@ -13,11 +13,15 @@
         width: 40px;
         height: 40px;
 
-        &-overlay-base {
-            border-radius: 50%;
-            width: 44px;
-            height: 44px;
-            background-size: 44px;
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
         }
     }
 
@@ -109,24 +113,24 @@
     }
 
     &__section-headline {
-        background: $card-background-color;
+        background: $text-tab-background-color;
         border-bottom: 1px solid $border-color;
 
         a {
             padding: 16px 0;
-            color: $secondary-text-color;
+            color: $text-tab-indicator-color;
 
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
 
-                &:before,
+                &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-background-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-background-hover-color }
         }
     }
 }
diff --git a/app/javascript/styles/material-v1-dark/button.scss b/app/javascript/styles/material-v1-dark/button.scss
index 6bb6bfa29..38fd1a3c1 100644
--- a/app/javascript/styles/material-v1-dark/button.scss
+++ b/app/javascript/styles/material-v1-dark/button.scss
@@ -23,6 +23,17 @@
         }
     }
 
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
     &:hover {
         color: $icon-button-hover-color;
         background-color: $icon-background-hover-color;
@@ -75,4 +86,10 @@
     &:hover { background: $text-button-hover-color }
 
     &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
deleted file mode 100644
index 62a064b87..000000000
--- a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-dark.scss b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
index f6168a35e..a9289ce25 100644
--- a/app/javascript/styles/material-v1-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
@@ -60,7 +60,7 @@ $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,11 +97,33 @@ $scroll-bar-thumb-hover-color: lighten($background-color, 30%);
 $scroll-bar-thumb-active-color: lighten($background-color, 38%);
 
 // App bar color
-$top-bar-color: #2196f3;
+$top-bar-color: #1565C0;
 $search-bar-color: lighten($background-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-light.scss b/app/javascript/styles/material-v1-dark/color/v1-light.scss
deleted file mode 100644
index 3a09d2a5d..000000000
--- a/app/javascript/styles/material-v1-dark/color/v1-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-dark.scss b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
deleted file mode 100644
index aae145b3b..000000000
--- a/app/javascript/styles/material-v1-dark/color/v2-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #1e1e1e;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-light.scss b/app/javascript/styles/material-v1-dark/color/v2-light.scss
deleted file mode 100644
index 99d502543..000000000
--- a/app/javascript/styles/material-v1-dark/color/v2-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/columns.scss b/app/javascript/styles/material-v1-dark/columns.scss
index dc61167dc..689028581 100644
--- a/app/javascript/styles/material-v1-dark/columns.scss
+++ b/app/javascript/styles/material-v1-dark/columns.scss
@@ -22,6 +22,8 @@
         color: $top-bar-text-color;
     }
 
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
     &.active {
         .column-header__icon {
             color: $secondary-color;
@@ -62,14 +64,29 @@
 
     &__setting-btn {
         color: $icon-button-color;
+        padding: 8px 0;
 
         &:hover {
             color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
+            text-decoration: none;
         }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
     }
 
-    &__setting-arrows { font-size: 16px }
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
 
     &__wrapper {
         @include shadow-4dp;
@@ -80,12 +97,13 @@
         &.active {
             @include shadow-4dp;
 
-            &:before { background: transparent }
+            &::before { background: transparent }
         }
     }
 
     &__collapsible {
         color: $ui-text-color;
+        background: $card-background-color;
         border-top: 1px solid $border-color;
 
         &-inner {
@@ -98,7 +116,7 @@
 
     &__back-button {
         background: $top-bar-color;
-        color: $icon-color;
+        color: $top-bar-icon-color;
         padding: 8px;
         margin: auto 0;
         border-radius: 50%;
@@ -156,6 +174,8 @@
         margin-bottom: 0;
         margin-top: 8px;
     }
+
+    &__row .text-btn { margin-bottom: 0 }
 }
 
 .column-back-button {
@@ -163,6 +183,8 @@
     background: $top-bar-color;
     color: $top-bar-icon-color;
     padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
 }
 
 .column-inline-form {
@@ -222,17 +244,31 @@
     }
 }
 
+// read status in notification column
 .muted {
     .status {
         &__content {
-            color: $primary-text-color;
+            color: $read-primary-text-color;
     
-            p { color: $primary-text-color }
+            p { color: $read-primary-text-color }
     
-            a { color: $secondary-text-color }
+            a { color: $read-secondary-text-color }
         }
 
-        &__display-name strong { color: $primary-text-color }
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
     }
 }
 
@@ -267,7 +303,42 @@
         a { color: $ui-text-color }
 
         p a { color: $link-text-color }
+    }
 
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
     }
 }
 
@@ -330,22 +401,22 @@
 
 .notification {
     &__filter-bar {
-        background: $top-bar-color;
+        background: $tab-background-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
     
         button {
-            background: $top-bar-color;
-            color: $top-bar-icon-color;
+            background: $tab-background-color;
+            color: $tab-indicator-color;
             font-size: 16px;
 
             span { font-size: 14px }
     
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
     
-                &:before,
+                &::before,
                 &:after { border: none }
 
                 &:focus { background: $tab-indicator-background-focus-color }
@@ -370,6 +441,7 @@
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
+// read notification
 .notification.notification-favourite.focusable,
 .notification.notification-follow.focusable { background: $list-background-inactive-color }
 
@@ -384,8 +456,6 @@
 
 .react-swipeable-view-container { height: auto }
 
-.tabs-bar__wrapper { background: transparent }
-
 .attachment-list__list a { color: $secondary-text-color }
 
 .focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/components.scss b/app/javascript/styles/material-v1-dark/components.scss
index f1e594e3c..92d2801f4 100644
--- a/app/javascript/styles/material-v1-dark/components.scss
+++ b/app/javascript/styles/material-v1-dark/components.scss
@@ -149,7 +149,7 @@
 
     &__item a {
         font-size: 14px;
-        padding: 9px 16px;
+        padding: 8px 16px;
         background: $menu-background-color;
         color: $menu-text-color;
 
@@ -166,11 +166,33 @@
 }
 
 .compose-form {
-    .autosuggest-textarea__textarea {
-        background: $card-background-color;
-        color: $ui-text-color;
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
 
-        &::placeholder { color: $tips-text-color }
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
     }
 
     .spoiler-input__input {
@@ -234,20 +256,42 @@
     }
 }
 
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
 }
 
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
 
-    &:focus { border-color: $border-active-color }
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
 }
 
 .privacy-dropdown {
@@ -336,4 +380,10 @@
     }
 
     &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/config.scss b/app/javascript/styles/material-v1-dark/config.scss
index ee50da02f..c8cc5eef4 100644
--- a/app/javascript/styles/material-v1-dark/config.scss
+++ b/app/javascript/styles/material-v1-dark/config.scss
@@ -30,32 +30,10 @@
 
 
 // Favorite icon settings
-// If you exclude 'material-icons.scss', please comment out this section.
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star:before { content: "star_border" }  // Star
-    //.fa.fa-star:before { content: "favorite_border" }  // Heart
-    //.fa.fa-star:before { content: "plus_one" }  // +1
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star:before { content: "star" }  // Star
-        //.fa.fa-star:before { content: "favorite" }  // Heart
-        //.fa.fa-star:before { content: "plus_one" }  // +1
-    }
-}
\ No newline at end of file
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/emoji-picker.scss b/app/javascript/styles/material-v1-dark/emoji-picker.scss
index d57c5c041..2c17701cf 100644
--- a/app/javascript/styles/material-v1-dark/emoji-picker.scss
+++ b/app/javascript/styles/material-v1-dark/emoji-picker.scss
@@ -46,7 +46,7 @@
         }
 
         &-bar {
-            background-color: $tab-indicator-color;
+            background-color: $tab-indicator-active-color;
         }
 
         &:hover {
@@ -63,7 +63,7 @@
             background: $search-bar-color;
             color: $ui-text-color;
             border: 0;
-            border-radius: $bar-radius;
+            border-radius: $search-bar-radius;
 
             &:focus {
                 @include shadow-2dp;
@@ -82,7 +82,7 @@
         background: $menu-background-color;
     }
 
-    &-emoji:hover:before {
+    &-emoji:hover::before {
         background-color: $icon-background-hover-color;
     }
 
diff --git a/app/javascript/styles/material-v1-dark/icons.scss b/app/javascript/styles/material-v1-dark/icons.scss
index 6778e3d2c..beca11a6f 100644
--- a/app/javascript/styles/material-v1-dark/icons.scss
+++ b/app/javascript/styles/material-v1-dark/icons.scss
@@ -15,16 +15,21 @@
 }
 
 
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
 
 .fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
 
 .fa.fa-lock { text-transform: none }
 
 .fa-fw { width: 16px }
 
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
     font-size: 20px;
     margin-right: 16px;
 }
@@ -34,4 +39,10 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
\ No newline at end of file
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v2.scss b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
deleted file mode 100644
index 86d2c496f..000000000
--- a/app/javascript/styles/material-v1-dark/layout/material-v2.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/material-icons.scss b/app/javascript/styles/material-v1-dark/material-icons.scss
index 52b959485..e473dfe31 100644
--- a/app/javascript/styles/material-v1-dark/material-icons.scss
+++ b/app/javascript/styles/material-v1-dark/material-icons.scss
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 @import 'config';
+@import 'functions';
 
 
 .fa {
@@ -31,6 +32,7 @@
     &.fa-chevron-right,
     &.fa-reply,
     &.fa-reply-all,
+    &.fa-share-alt,
     &.fa-star,
     &.fa-bookmark,
     &.fa-ellipsis-h,
@@ -46,51 +48,99 @@
     &.fa-eye,
     &.fa-eye-slash,
     &.fa-pencil,
-    &.fa-trash {
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
         font-family: "Material Icons";
     }
 }
 
 .fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-address-book-o:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
 }
 
+// bookmark icon
 .status__action-bar-button.icon-button,
 .bookmark-icon.icon-button {
-    .fa.fa-bookmark:before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark:before { content: "bookmark" }
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/media.scss b/app/javascript/styles/material-v1-dark/media.scss
index 74dfd8dcc..64a69a129 100644
--- a/app/javascript/styles/material-v1-dark/media.scss
+++ b/app/javascript/styles/material-v1-dark/media.scss
@@ -26,13 +26,74 @@
     }
 }
 
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
+.media-modal {
+    &__nav {
         background: $media-icon-background-color;
-        color: $media-icon-hover-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
     }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/mobile.scss b/app/javascript/styles/material-v1-dark/mobile.scss
index 448f80585..de6f4e94c 100644
--- a/app/javascript/styles/material-v1-dark/mobile.scss
+++ b/app/javascript/styles/material-v1-dark/mobile.scss
@@ -12,14 +12,17 @@
         border-bottom: 4px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-indicator-color;
-            color: $tab-indicator-color;
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
         }
 
         .fa { font-size: 20px }
     }
 
-    &__wrapper { @include shadow-4dp }
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
 }
 
 
diff --git a/app/javascript/styles/material-v1-dark/modal.scss b/app/javascript/styles/material-v1-dark/modal.scss
index 40710fe43..7734c8dfa 100644
--- a/app/javascript/styles/material-v1-dark/modal.scss
+++ b/app/javascript/styles/material-v1-dark/modal.scss
@@ -29,10 +29,25 @@
         color: $ui-text-color;
         font-size: 16px;
 
-        &:hover { background: $card-background-hover-color }
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
     }
 
     .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
 }
 
 .report-modal {
diff --git a/app/javascript/styles/material-v1-dark/statuses.scss b/app/javascript/styles/material-v1-dark/statuses.scss
index c569b3b92..f60c2d859 100644
--- a/app/javascript/styles/material-v1-dark/statuses.scss
+++ b/app/javascript/styles/material-v1-dark/statuses.scss
@@ -73,6 +73,8 @@
         }
     }
 
+    &__prepend { color: $secondary-text-color }
+
     &.status-direct:not(.read) {
         background: transparent;
         border-bottom-color: $border-color;
@@ -99,9 +101,25 @@
 
     &__description { color: $secondary-text-color }
 
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
     &.compact {
         border-color: $border-color;
         outline: none;
+        background: transparent;
         
         .status-card {
             &__content { padding: 12px }
@@ -114,8 +132,16 @@
     &:hover { background-color: $card-background-color }
 }
 
+// Detailed status in mobile
 .status.light {
-    .display-name span { color: $info-text-color }
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-v1-light/_functions.scss b/app/javascript/styles/material-v1-light/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/account.scss b/app/javascript/styles/material-v1-light/account.scss
index 2d8f2f210..b43194729 100644
--- a/app/javascript/styles/material-v1-light/account.scss
+++ b/app/javascript/styles/material-v1-light/account.scss
@@ -5,7 +5,7 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name,
+    .account__display-name { color: $primary-text-color }
     .account__display-name strong { color: $secondary-text-color }
 
     &__avatar {
@@ -13,11 +13,15 @@
         width: 40px;
         height: 40px;
 
-        &-overlay-base {
-            border-radius: 50%;
-            width: 44px;
-            height: 44px;
-            background-size: 44px;
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
         }
     }
 
@@ -109,24 +113,24 @@
     }
 
     &__section-headline {
-        background: $card-background-color;
+        background: $text-tab-background-color;
         border-bottom: 1px solid $border-color;
 
         a {
             padding: 16px 0;
-            color: $secondary-text-color;
+            color: $text-tab-indicator-color;
 
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
 
-                &:before,
+                &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-background-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-background-hover-color }
         }
     }
 }
diff --git a/app/javascript/styles/material-v1-light/button.scss b/app/javascript/styles/material-v1-light/button.scss
index 6bb6bfa29..38fd1a3c1 100644
--- a/app/javascript/styles/material-v1-light/button.scss
+++ b/app/javascript/styles/material-v1-light/button.scss
@@ -23,6 +23,17 @@
         }
     }
 
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
     &:hover {
         color: $icon-button-hover-color;
         background-color: $icon-background-hover-color;
@@ -75,4 +86,10 @@
     &:hover { background: $text-button-hover-color }
 
     &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
deleted file mode 100644
index 14ef148f4..000000000
--- a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #444b5d;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #42485a;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-dark.scss b/app/javascript/styles/material-v1-light/color/v1-dark.scss
deleted file mode 100644
index f6168a35e..000000000
--- a/app/javascript/styles/material-v1-light/color/v1-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #303030;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: lighten($background-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-light.scss b/app/javascript/styles/material-v1-light/color/v1-light.scss
index 3a09d2a5d..e672b5640 100644
--- a/app/javascript/styles/material-v1-light/color/v1-light.scss
+++ b/app/javascript/styles/material-v1-light/color/v1-light.scss
@@ -60,7 +60,7 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -103,5 +103,27 @@ $search-bar-focus-color: $background-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-dark.scss b/app/javascript/styles/material-v1-light/color/v2-dark.scss
deleted file mode 100644
index aae145b3b..000000000
--- a/app/javascript/styles/material-v1-light/color/v2-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #1e1e1e;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-light.scss b/app/javascript/styles/material-v1-light/color/v2-light.scss
deleted file mode 100644
index 99d502543..000000000
--- a/app/javascript/styles/material-v1-light/color/v2-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/columns.scss b/app/javascript/styles/material-v1-light/columns.scss
index dc61167dc..689028581 100644
--- a/app/javascript/styles/material-v1-light/columns.scss
+++ b/app/javascript/styles/material-v1-light/columns.scss
@@ -22,6 +22,8 @@
         color: $top-bar-text-color;
     }
 
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
     &.active {
         .column-header__icon {
             color: $secondary-color;
@@ -62,14 +64,29 @@
 
     &__setting-btn {
         color: $icon-button-color;
+        padding: 8px 0;
 
         &:hover {
             color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
+            text-decoration: none;
         }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
     }
 
-    &__setting-arrows { font-size: 16px }
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
 
     &__wrapper {
         @include shadow-4dp;
@@ -80,12 +97,13 @@
         &.active {
             @include shadow-4dp;
 
-            &:before { background: transparent }
+            &::before { background: transparent }
         }
     }
 
     &__collapsible {
         color: $ui-text-color;
+        background: $card-background-color;
         border-top: 1px solid $border-color;
 
         &-inner {
@@ -98,7 +116,7 @@
 
     &__back-button {
         background: $top-bar-color;
-        color: $icon-color;
+        color: $top-bar-icon-color;
         padding: 8px;
         margin: auto 0;
         border-radius: 50%;
@@ -156,6 +174,8 @@
         margin-bottom: 0;
         margin-top: 8px;
     }
+
+    &__row .text-btn { margin-bottom: 0 }
 }
 
 .column-back-button {
@@ -163,6 +183,8 @@
     background: $top-bar-color;
     color: $top-bar-icon-color;
     padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
 }
 
 .column-inline-form {
@@ -222,17 +244,31 @@
     }
 }
 
+// read status in notification column
 .muted {
     .status {
         &__content {
-            color: $primary-text-color;
+            color: $read-primary-text-color;
     
-            p { color: $primary-text-color }
+            p { color: $read-primary-text-color }
     
-            a { color: $secondary-text-color }
+            a { color: $read-secondary-text-color }
         }
 
-        &__display-name strong { color: $primary-text-color }
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
     }
 }
 
@@ -267,7 +303,42 @@
         a { color: $ui-text-color }
 
         p a { color: $link-text-color }
+    }
 
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
     }
 }
 
@@ -330,22 +401,22 @@
 
 .notification {
     &__filter-bar {
-        background: $top-bar-color;
+        background: $tab-background-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
     
         button {
-            background: $top-bar-color;
-            color: $top-bar-icon-color;
+            background: $tab-background-color;
+            color: $tab-indicator-color;
             font-size: 16px;
 
             span { font-size: 14px }
     
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
     
-                &:before,
+                &::before,
                 &:after { border: none }
 
                 &:focus { background: $tab-indicator-background-focus-color }
@@ -370,6 +441,7 @@
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
+// read notification
 .notification.notification-favourite.focusable,
 .notification.notification-follow.focusable { background: $list-background-inactive-color }
 
@@ -384,8 +456,6 @@
 
 .react-swipeable-view-container { height: auto }
 
-.tabs-bar__wrapper { background: transparent }
-
 .attachment-list__list a { color: $secondary-text-color }
 
 .focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/components.scss b/app/javascript/styles/material-v1-light/components.scss
index f1e594e3c..92d2801f4 100644
--- a/app/javascript/styles/material-v1-light/components.scss
+++ b/app/javascript/styles/material-v1-light/components.scss
@@ -149,7 +149,7 @@
 
     &__item a {
         font-size: 14px;
-        padding: 9px 16px;
+        padding: 8px 16px;
         background: $menu-background-color;
         color: $menu-text-color;
 
@@ -166,11 +166,33 @@
 }
 
 .compose-form {
-    .autosuggest-textarea__textarea {
-        background: $card-background-color;
-        color: $ui-text-color;
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
 
-        &::placeholder { color: $tips-text-color }
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
     }
 
     .spoiler-input__input {
@@ -234,20 +256,42 @@
     }
 }
 
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
 }
 
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
 
-    &:focus { border-color: $border-active-color }
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
 }
 
 .privacy-dropdown {
@@ -336,4 +380,10 @@
     }
 
     &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/config.scss b/app/javascript/styles/material-v1-light/config.scss
index dd25f6bf7..294c254c3 100644
--- a/app/javascript/styles/material-v1-light/config.scss
+++ b/app/javascript/styles/material-v1-light/config.scss
@@ -30,32 +30,10 @@
 
 
 // Favorite icon settings
-// If you exclude 'material-icons.scss', please comment out this section.
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star:before { content: "star_border" }  // Star
-    //.fa.fa-star:before { content: "favorite_border" }  // Heart
-    //.fa.fa-star:before { content: "plus_one" }  // +1
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star:before { content: "star" }  // Star
-        //.fa.fa-star:before { content: "favorite" }  // Heart
-        //.fa.fa-star:before { content: "plus_one" }  // +1
-    }
-}
\ No newline at end of file
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/emoji-picker.scss b/app/javascript/styles/material-v1-light/emoji-picker.scss
index d57c5c041..2c17701cf 100644
--- a/app/javascript/styles/material-v1-light/emoji-picker.scss
+++ b/app/javascript/styles/material-v1-light/emoji-picker.scss
@@ -46,7 +46,7 @@
         }
 
         &-bar {
-            background-color: $tab-indicator-color;
+            background-color: $tab-indicator-active-color;
         }
 
         &:hover {
@@ -63,7 +63,7 @@
             background: $search-bar-color;
             color: $ui-text-color;
             border: 0;
-            border-radius: $bar-radius;
+            border-radius: $search-bar-radius;
 
             &:focus {
                 @include shadow-2dp;
@@ -82,7 +82,7 @@
         background: $menu-background-color;
     }
 
-    &-emoji:hover:before {
+    &-emoji:hover::before {
         background-color: $icon-background-hover-color;
     }
 
diff --git a/app/javascript/styles/material-v1-light/icons.scss b/app/javascript/styles/material-v1-light/icons.scss
index 6778e3d2c..beca11a6f 100644
--- a/app/javascript/styles/material-v1-light/icons.scss
+++ b/app/javascript/styles/material-v1-light/icons.scss
@@ -15,16 +15,21 @@
 }
 
 
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
 
 .fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
 
 .fa.fa-lock { text-transform: none }
 
 .fa-fw { width: 16px }
 
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
     font-size: 20px;
     margin-right: 16px;
 }
@@ -34,4 +39,10 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
\ No newline at end of file
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v2.scss b/app/javascript/styles/material-v1-light/layout/material-v2.scss
deleted file mode 100644
index 86d2c496f..000000000
--- a/app/javascript/styles/material-v1-light/layout/material-v2.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@charset "UTF-8";
-@import '../mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/material-icons.scss b/app/javascript/styles/material-v1-light/material-icons.scss
index 52b959485..e473dfe31 100644
--- a/app/javascript/styles/material-v1-light/material-icons.scss
+++ b/app/javascript/styles/material-v1-light/material-icons.scss
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 @import 'config';
+@import 'functions';
 
 
 .fa {
@@ -31,6 +32,7 @@
     &.fa-chevron-right,
     &.fa-reply,
     &.fa-reply-all,
+    &.fa-share-alt,
     &.fa-star,
     &.fa-bookmark,
     &.fa-ellipsis-h,
@@ -46,51 +48,99 @@
     &.fa-eye,
     &.fa-eye-slash,
     &.fa-pencil,
-    &.fa-trash {
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
         font-family: "Material Icons";
     }
 }
 
 .fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-address-book-o:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
 }
 
+// bookmark icon
 .status__action-bar-button.icon-button,
 .bookmark-icon.icon-button {
-    .fa.fa-bookmark:before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark:before { content: "bookmark" }
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/media.scss b/app/javascript/styles/material-v1-light/media.scss
index 74dfd8dcc..64a69a129 100644
--- a/app/javascript/styles/material-v1-light/media.scss
+++ b/app/javascript/styles/material-v1-light/media.scss
@@ -26,13 +26,74 @@
     }
 }
 
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
+.media-modal {
+    &__nav {
         background: $media-icon-background-color;
-        color: $media-icon-hover-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
     }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/mobile.scss b/app/javascript/styles/material-v1-light/mobile.scss
index 448f80585..de6f4e94c 100644
--- a/app/javascript/styles/material-v1-light/mobile.scss
+++ b/app/javascript/styles/material-v1-light/mobile.scss
@@ -12,14 +12,17 @@
         border-bottom: 4px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-indicator-color;
-            color: $tab-indicator-color;
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
         }
 
         .fa { font-size: 20px }
     }
 
-    &__wrapper { @include shadow-4dp }
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
 }
 
 
diff --git a/app/javascript/styles/material-v1-light/modal.scss b/app/javascript/styles/material-v1-light/modal.scss
index 40710fe43..7734c8dfa 100644
--- a/app/javascript/styles/material-v1-light/modal.scss
+++ b/app/javascript/styles/material-v1-light/modal.scss
@@ -29,10 +29,25 @@
         color: $ui-text-color;
         font-size: 16px;
 
-        &:hover { background: $card-background-hover-color }
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
     }
 
     .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
 }
 
 .report-modal {
diff --git a/app/javascript/styles/material-v1-light/statuses.scss b/app/javascript/styles/material-v1-light/statuses.scss
index c569b3b92..f60c2d859 100644
--- a/app/javascript/styles/material-v1-light/statuses.scss
+++ b/app/javascript/styles/material-v1-light/statuses.scss
@@ -73,6 +73,8 @@
         }
     }
 
+    &__prepend { color: $secondary-text-color }
+
     &.status-direct:not(.read) {
         background: transparent;
         border-bottom-color: $border-color;
@@ -99,9 +101,25 @@
 
     &__description { color: $secondary-text-color }
 
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
     &.compact {
         border-color: $border-color;
         outline: none;
+        background: transparent;
         
         .status-card {
             &__content { padding: 12px }
@@ -114,8 +132,16 @@
     &:hover { background-color: $card-background-color }
 }
 
+// Detailed status in mobile
 .status.light {
-    .display-name span { color: $info-text-color }
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-v2-dark/_functions.scss b/app/javascript/styles/material-v2-dark/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/account.scss b/app/javascript/styles/material-v2-dark/account.scss
index 2d8f2f210..b43194729 100644
--- a/app/javascript/styles/material-v2-dark/account.scss
+++ b/app/javascript/styles/material-v2-dark/account.scss
@@ -5,7 +5,7 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name,
+    .account__display-name { color: $primary-text-color }
     .account__display-name strong { color: $secondary-text-color }
 
     &__avatar {
@@ -13,11 +13,15 @@
         width: 40px;
         height: 40px;
 
-        &-overlay-base {
-            border-radius: 50%;
-            width: 44px;
-            height: 44px;
-            background-size: 44px;
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
         }
     }
 
@@ -109,24 +113,24 @@
     }
 
     &__section-headline {
-        background: $card-background-color;
+        background: $text-tab-background-color;
         border-bottom: 1px solid $border-color;
 
         a {
             padding: 16px 0;
-            color: $secondary-text-color;
+            color: $text-tab-indicator-color;
 
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
 
-                &:before,
+                &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-background-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-background-hover-color }
         }
     }
 }
diff --git a/app/javascript/styles/material-v2-dark/button.scss b/app/javascript/styles/material-v2-dark/button.scss
index 6bb6bfa29..38fd1a3c1 100644
--- a/app/javascript/styles/material-v2-dark/button.scss
+++ b/app/javascript/styles/material-v2-dark/button.scss
@@ -23,6 +23,17 @@
         }
     }
 
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
     &:hover {
         color: $icon-button-hover-color;
         background-color: $icon-background-hover-color;
@@ -75,4 +86,10 @@
     &:hover { background: $text-button-hover-color }
 
     &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
deleted file mode 100644
index 14ef148f4..000000000
--- a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #444b5d;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #42485a;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
deleted file mode 100644
index 62a064b87..000000000
--- a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-dark.scss b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
deleted file mode 100644
index f6168a35e..000000000
--- a/app/javascript/styles/material-v2-dark/color/v1-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #303030;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: lighten($background-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-light.scss b/app/javascript/styles/material-v2-dark/color/v1-light.scss
deleted file mode 100644
index 3a09d2a5d..000000000
--- a/app/javascript/styles/material-v2-dark/color/v1-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-dark.scss b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
index aae145b3b..3c0de2770 100644
--- a/app/javascript/styles/material-v2-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
@@ -60,7 +60,7 @@ $top-bar-icon-active-color: $primary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -76,7 +76,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #1e1e1e;
+$floating-action-button-color: $secondary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
@@ -102,6 +102,28 @@ $search-bar-color: lighten($top-bar-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-light.scss b/app/javascript/styles/material-v2-dark/color/v2-light.scss
deleted file mode 100644
index 99d502543..000000000
--- a/app/javascript/styles/material-v2-dark/color/v2-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/columns.scss b/app/javascript/styles/material-v2-dark/columns.scss
index dc61167dc..689028581 100644
--- a/app/javascript/styles/material-v2-dark/columns.scss
+++ b/app/javascript/styles/material-v2-dark/columns.scss
@@ -22,6 +22,8 @@
         color: $top-bar-text-color;
     }
 
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
     &.active {
         .column-header__icon {
             color: $secondary-color;
@@ -62,14 +64,29 @@
 
     &__setting-btn {
         color: $icon-button-color;
+        padding: 8px 0;
 
         &:hover {
             color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
+            text-decoration: none;
         }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
     }
 
-    &__setting-arrows { font-size: 16px }
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
 
     &__wrapper {
         @include shadow-4dp;
@@ -80,12 +97,13 @@
         &.active {
             @include shadow-4dp;
 
-            &:before { background: transparent }
+            &::before { background: transparent }
         }
     }
 
     &__collapsible {
         color: $ui-text-color;
+        background: $card-background-color;
         border-top: 1px solid $border-color;
 
         &-inner {
@@ -98,7 +116,7 @@
 
     &__back-button {
         background: $top-bar-color;
-        color: $icon-color;
+        color: $top-bar-icon-color;
         padding: 8px;
         margin: auto 0;
         border-radius: 50%;
@@ -156,6 +174,8 @@
         margin-bottom: 0;
         margin-top: 8px;
     }
+
+    &__row .text-btn { margin-bottom: 0 }
 }
 
 .column-back-button {
@@ -163,6 +183,8 @@
     background: $top-bar-color;
     color: $top-bar-icon-color;
     padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
 }
 
 .column-inline-form {
@@ -222,17 +244,31 @@
     }
 }
 
+// read status in notification column
 .muted {
     .status {
         &__content {
-            color: $primary-text-color;
+            color: $read-primary-text-color;
     
-            p { color: $primary-text-color }
+            p { color: $read-primary-text-color }
     
-            a { color: $secondary-text-color }
+            a { color: $read-secondary-text-color }
         }
 
-        &__display-name strong { color: $primary-text-color }
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
     }
 }
 
@@ -267,7 +303,42 @@
         a { color: $ui-text-color }
 
         p a { color: $link-text-color }
+    }
 
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
     }
 }
 
@@ -330,22 +401,22 @@
 
 .notification {
     &__filter-bar {
-        background: $top-bar-color;
+        background: $tab-background-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
     
         button {
-            background: $top-bar-color;
-            color: $top-bar-icon-color;
+            background: $tab-background-color;
+            color: $tab-indicator-color;
             font-size: 16px;
 
             span { font-size: 14px }
     
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
     
-                &:before,
+                &::before,
                 &:after { border: none }
 
                 &:focus { background: $tab-indicator-background-focus-color }
@@ -370,6 +441,7 @@
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
+// read notification
 .notification.notification-favourite.focusable,
 .notification.notification-follow.focusable { background: $list-background-inactive-color }
 
@@ -384,8 +456,6 @@
 
 .react-swipeable-view-container { height: auto }
 
-.tabs-bar__wrapper { background: transparent }
-
 .attachment-list__list a { color: $secondary-text-color }
 
 .focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/components.scss b/app/javascript/styles/material-v2-dark/components.scss
index f1e594e3c..92d2801f4 100644
--- a/app/javascript/styles/material-v2-dark/components.scss
+++ b/app/javascript/styles/material-v2-dark/components.scss
@@ -149,7 +149,7 @@
 
     &__item a {
         font-size: 14px;
-        padding: 9px 16px;
+        padding: 8px 16px;
         background: $menu-background-color;
         color: $menu-text-color;
 
@@ -166,11 +166,33 @@
 }
 
 .compose-form {
-    .autosuggest-textarea__textarea {
-        background: $card-background-color;
-        color: $ui-text-color;
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
 
-        &::placeholder { color: $tips-text-color }
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
     }
 
     .spoiler-input__input {
@@ -234,20 +256,42 @@
     }
 }
 
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
 }
 
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
 
-    &:focus { border-color: $border-active-color }
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
 }
 
 .privacy-dropdown {
@@ -336,4 +380,10 @@
     }
 
     &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/config.scss b/app/javascript/styles/material-v2-dark/config.scss
index 1d9a47e68..25becc639 100644
--- a/app/javascript/styles/material-v2-dark/config.scss
+++ b/app/javascript/styles/material-v2-dark/config.scss
@@ -30,32 +30,10 @@
 
 
 // Favorite icon settings
-// If you exclude 'material-icons.scss', please comment out this section.
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star:before { content: "star_border" }  // Star
-    //.fa.fa-star:before { content: "favorite_border" }  // Heart
-    //.fa.fa-star:before { content: "plus_one" }  // +1
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star:before { content: "star" }  // Star
-        //.fa.fa-star:before { content: "favorite" }  // Heart
-        //.fa.fa-star:before { content: "plus_one" }  // +1
-    }
-}
\ No newline at end of file
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/emoji-picker.scss b/app/javascript/styles/material-v2-dark/emoji-picker.scss
index d57c5c041..2c17701cf 100644
--- a/app/javascript/styles/material-v2-dark/emoji-picker.scss
+++ b/app/javascript/styles/material-v2-dark/emoji-picker.scss
@@ -46,7 +46,7 @@
         }
 
         &-bar {
-            background-color: $tab-indicator-color;
+            background-color: $tab-indicator-active-color;
         }
 
         &:hover {
@@ -63,7 +63,7 @@
             background: $search-bar-color;
             color: $ui-text-color;
             border: 0;
-            border-radius: $bar-radius;
+            border-radius: $search-bar-radius;
 
             &:focus {
                 @include shadow-2dp;
@@ -82,7 +82,7 @@
         background: $menu-background-color;
     }
 
-    &-emoji:hover:before {
+    &-emoji:hover::before {
         background-color: $icon-background-hover-color;
     }
 
diff --git a/app/javascript/styles/material-v2-dark/icons.scss b/app/javascript/styles/material-v2-dark/icons.scss
index 6778e3d2c..beca11a6f 100644
--- a/app/javascript/styles/material-v2-dark/icons.scss
+++ b/app/javascript/styles/material-v2-dark/icons.scss
@@ -15,16 +15,21 @@
 }
 
 
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
 
 .fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
 
 .fa.fa-lock { text-transform: none }
 
 .fa-fw { width: 16px }
 
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
     font-size: 20px;
     margin-right: 16px;
 }
@@ -34,4 +39,10 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
\ No newline at end of file
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/material-icons.scss b/app/javascript/styles/material-v2-dark/material-icons.scss
index 52b959485..e473dfe31 100644
--- a/app/javascript/styles/material-v2-dark/material-icons.scss
+++ b/app/javascript/styles/material-v2-dark/material-icons.scss
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 @import 'config';
+@import 'functions';
 
 
 .fa {
@@ -31,6 +32,7 @@
     &.fa-chevron-right,
     &.fa-reply,
     &.fa-reply-all,
+    &.fa-share-alt,
     &.fa-star,
     &.fa-bookmark,
     &.fa-ellipsis-h,
@@ -46,51 +48,99 @@
     &.fa-eye,
     &.fa-eye-slash,
     &.fa-pencil,
-    &.fa-trash {
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
         font-family: "Material Icons";
     }
 }
 
 .fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-address-book-o:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
 }
 
+// bookmark icon
 .status__action-bar-button.icon-button,
 .bookmark-icon.icon-button {
-    .fa.fa-bookmark:before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark:before { content: "bookmark" }
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/media.scss b/app/javascript/styles/material-v2-dark/media.scss
index 74dfd8dcc..64a69a129 100644
--- a/app/javascript/styles/material-v2-dark/media.scss
+++ b/app/javascript/styles/material-v2-dark/media.scss
@@ -26,13 +26,74 @@
     }
 }
 
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
+.media-modal {
+    &__nav {
         background: $media-icon-background-color;
-        color: $media-icon-hover-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
     }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/mobile.scss b/app/javascript/styles/material-v2-dark/mobile.scss
index 448f80585..de6f4e94c 100644
--- a/app/javascript/styles/material-v2-dark/mobile.scss
+++ b/app/javascript/styles/material-v2-dark/mobile.scss
@@ -12,14 +12,17 @@
         border-bottom: 4px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-indicator-color;
-            color: $tab-indicator-color;
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
         }
 
         .fa { font-size: 20px }
     }
 
-    &__wrapper { @include shadow-4dp }
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
 }
 
 
diff --git a/app/javascript/styles/material-v2-dark/modal.scss b/app/javascript/styles/material-v2-dark/modal.scss
index 40710fe43..7734c8dfa 100644
--- a/app/javascript/styles/material-v2-dark/modal.scss
+++ b/app/javascript/styles/material-v2-dark/modal.scss
@@ -29,10 +29,25 @@
         color: $ui-text-color;
         font-size: 16px;
 
-        &:hover { background: $card-background-hover-color }
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
     }
 
     .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
 }
 
 .report-modal {
diff --git a/app/javascript/styles/material-v2-dark/statuses.scss b/app/javascript/styles/material-v2-dark/statuses.scss
index c569b3b92..f60c2d859 100644
--- a/app/javascript/styles/material-v2-dark/statuses.scss
+++ b/app/javascript/styles/material-v2-dark/statuses.scss
@@ -73,6 +73,8 @@
         }
     }
 
+    &__prepend { color: $secondary-text-color }
+
     &.status-direct:not(.read) {
         background: transparent;
         border-bottom-color: $border-color;
@@ -99,9 +101,25 @@
 
     &__description { color: $secondary-text-color }
 
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
     &.compact {
         border-color: $border-color;
         outline: none;
+        background: transparent;
         
         .status-card {
             &__content { padding: 12px }
@@ -114,8 +132,16 @@
     &:hover { background-color: $card-background-color }
 }
 
+// Detailed status in mobile
 .status.light {
-    .display-name span { color: $info-text-color }
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-v2-light/_functions.scss b/app/javascript/styles/material-v2-light/_functions.scss
new file mode 100644
index 000000000..54750d029
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/_functions.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+@function to-string($value) {
+    @return inspect($value);
+}
+
+// convert hex color code to svg styled color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(to-string($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/account.scss b/app/javascript/styles/material-v2-light/account.scss
index 2d8f2f210..b43194729 100644
--- a/app/javascript/styles/material-v2-light/account.scss
+++ b/app/javascript/styles/material-v2-light/account.scss
@@ -5,7 +5,7 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name,
+    .account__display-name { color: $primary-text-color }
     .account__display-name strong { color: $secondary-text-color }
 
     &__avatar {
@@ -13,11 +13,15 @@
         width: 40px;
         height: 40px;
 
-        &-overlay-base {
-            border-radius: 50%;
-            width: 44px;
-            height: 44px;
-            background-size: 44px;
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
         }
     }
 
@@ -109,24 +113,24 @@
     }
 
     &__section-headline {
-        background: $card-background-color;
+        background: $text-tab-background-color;
         border-bottom: 1px solid $border-color;
 
         a {
             padding: 16px 0;
-            color: $secondary-text-color;
+            color: $text-tab-indicator-color;
 
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
 
-                &:before,
+                &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-background-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-background-hover-color }
         }
     }
 }
diff --git a/app/javascript/styles/material-v2-light/button.scss b/app/javascript/styles/material-v2-light/button.scss
index 6bb6bfa29..38fd1a3c1 100644
--- a/app/javascript/styles/material-v2-light/button.scss
+++ b/app/javascript/styles/material-v2-light/button.scss
@@ -23,6 +23,17 @@
         }
     }
 
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
     &:hover {
         color: $icon-button-hover-color;
         background-color: $icon-background-hover-color;
@@ -75,4 +86,10 @@
     &:hover { background: $text-button-hover-color }
 
     &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
deleted file mode 100644
index 14ef148f4..000000000
--- a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #444b5d;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #42485a;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.7);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.6);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-light.scss b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
deleted file mode 100644
index 62a064b87..000000000
--- a/app/javascript/styles/material-v2-light/color/mastodon-light.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: lighten($tab-indicator-color, 36%);
-$tab-indicator-background-focus-color: lighten($tab-indicator-color, 30%);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-dark.scss b/app/javascript/styles/material-v2-light/color/v1-dark.scss
deleted file mode 100644
index f6168a35e..000000000
--- a/app/javascript/styles/material-v2-light/color/v1-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #303030;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: lighten($background-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-light.scss b/app/javascript/styles/material-v2-light/color/v1-light.scss
deleted file mode 100644
index 3a09d2a5d..000000000
--- a/app/javascript/styles/material-v2-light/color/v1-light.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-dark.scss b/app/javascript/styles/material-v2-light/color/v2-dark.scss
deleted file mode 100644
index aae145b3b..000000000
--- a/app/javascript/styles/material-v2-light/color/v2-dark.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #1e1e1e;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #5f6368;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-light.scss b/app/javascript/styles/material-v2-light/color/v2-light.scss
index 99d502543..74115f87c 100644
--- a/app/javascript/styles/material-v2-light/color/v2-light.scss
+++ b/app/javascript/styles/material-v2-light/color/v2-light.scss
@@ -60,7 +60,7 @@ $top-bar-icon-active-color: $primary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#ffffff, 0.8);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -102,6 +102,28 @@ $search-bar-color: darken($background-color, 6%);
 $search-bar-focus-color: $background-color;
 
 // Tab color
-$tab-indicator-color: $primary-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-color, 0.8);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-color, 0.7);
\ No newline at end of file
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/columns.scss b/app/javascript/styles/material-v2-light/columns.scss
index dc61167dc..689028581 100644
--- a/app/javascript/styles/material-v2-light/columns.scss
+++ b/app/javascript/styles/material-v2-light/columns.scss
@@ -22,6 +22,8 @@
         color: $top-bar-text-color;
     }
 
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
     &.active {
         .column-header__icon {
             color: $secondary-color;
@@ -62,14 +64,29 @@
 
     &__setting-btn {
         color: $icon-button-color;
+        padding: 8px 0;
 
         &:hover {
             color: $icon-button-hover-color;
-            background: $icon-background-hover-color;
+            text-decoration: none;
         }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
     }
 
-    &__setting-arrows { font-size: 16px }
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
 
     &__wrapper {
         @include shadow-4dp;
@@ -80,12 +97,13 @@
         &.active {
             @include shadow-4dp;
 
-            &:before { background: transparent }
+            &::before { background: transparent }
         }
     }
 
     &__collapsible {
         color: $ui-text-color;
+        background: $card-background-color;
         border-top: 1px solid $border-color;
 
         &-inner {
@@ -98,7 +116,7 @@
 
     &__back-button {
         background: $top-bar-color;
-        color: $icon-color;
+        color: $top-bar-icon-color;
         padding: 8px;
         margin: auto 0;
         border-radius: 50%;
@@ -156,6 +174,8 @@
         margin-bottom: 0;
         margin-top: 8px;
     }
+
+    &__row .text-btn { margin-bottom: 0 }
 }
 
 .column-back-button {
@@ -163,6 +183,8 @@
     background: $top-bar-color;
     color: $top-bar-icon-color;
     padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
 }
 
 .column-inline-form {
@@ -222,17 +244,31 @@
     }
 }
 
+// read status in notification column
 .muted {
     .status {
         &__content {
-            color: $primary-text-color;
+            color: $read-primary-text-color;
     
-            p { color: $primary-text-color }
+            p { color: $read-primary-text-color }
     
-            a { color: $secondary-text-color }
+            a { color: $read-secondary-text-color }
         }
 
-        &__display-name strong { color: $primary-text-color }
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
     }
 }
 
@@ -267,7 +303,42 @@
         a { color: $ui-text-color }
 
         p a { color: $link-text-color }
+    }
 
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends__item {
+    padding: 16px;
+    border-bottom: none;
+
+    &__name {
+        color: $secondary-text-color;
+        font-size: 12px;
+
+        a { color: $primary-text-color }
+    }
+
+    &__current {
+        padding-right: 16px;
+        margin-left: 4px;
+        color: $secondary-text-color;
+    }
+
+    &__sparkline path {
+        stroke: $primary-color;
+        fill: $primary-color;
+        fill-opacity: 0.5;
     }
 }
 
@@ -330,22 +401,22 @@
 
 .notification {
     &__filter-bar {
-        background: $top-bar-color;
+        background: $tab-background-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
     
         button {
-            background: $top-bar-color;
-            color: $top-bar-icon-color;
+            background: $tab-background-color;
+            color: $tab-indicator-color;
             font-size: 16px;
 
             span { font-size: 14px }
     
             &.active {
-                color: $tab-indicator-color;
-                border-bottom: 4px solid $tab-indicator-color;
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
     
-                &:before,
+                &::before,
                 &:after { border: none }
 
                 &:focus { background: $tab-indicator-background-focus-color }
@@ -370,6 +441,7 @@
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
+// read notification
 .notification.notification-favourite.focusable,
 .notification.notification-follow.focusable { background: $list-background-inactive-color }
 
@@ -384,8 +456,6 @@
 
 .react-swipeable-view-container { height: auto }
 
-.tabs-bar__wrapper { background: transparent }
-
 .attachment-list__list a { color: $secondary-text-color }
 
 .focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/components.scss b/app/javascript/styles/material-v2-light/components.scss
index f1e594e3c..92d2801f4 100644
--- a/app/javascript/styles/material-v2-light/components.scss
+++ b/app/javascript/styles/material-v2-light/components.scss
@@ -149,7 +149,7 @@
 
     &__item a {
         font-size: 14px;
-        padding: 9px 16px;
+        padding: 8px 16px;
         background: $menu-background-color;
         color: $menu-text-color;
 
@@ -166,11 +166,33 @@
 }
 
 .compose-form {
-    .autosuggest-textarea__textarea {
-        background: $card-background-color;
-        color: $ui-text-color;
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
 
-        &::placeholder { color: $tips-text-color }
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
     }
 
     .spoiler-input__input {
@@ -234,20 +256,42 @@
     }
 }
 
-.poll__input {
-    border: 2px solid $control-border-color;
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
 }
 
-.poll__text input[type=text] {
-    color: $ui-text-color;
-    background: $background-color;
-    border: 1px solid $border-color;
-    padding: 8px 12px;
 
-    &:focus { border-color: $border-active-color }
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
 }
 
 .privacy-dropdown {
@@ -336,4 +380,10 @@
     }
 
     &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/config.scss b/app/javascript/styles/material-v2-light/config.scss
index f823bad9a..f53c47791 100644
--- a/app/javascript/styles/material-v2-light/config.scss
+++ b/app/javascript/styles/material-v2-light/config.scss
@@ -30,32 +30,10 @@
 
 
 // Favorite icon settings
-// If you exclude 'material-icons.scss', please comment out this section.
-.fa {
-    &.fa-star:before { content: "star" }  // Star
-    //&.fa-star:before { content: "favorite" }  // Heart
-    //&.fa-star:before { content: "plus_one" }  // +1
-}
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active {
-    color: #ffd600;  // Star
-    //color: #ff4081;  // Heart
-    //color: #db4437;  // +1
-}
-
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star:before { content: "star_border" }  // Star
-    //.fa.fa-star:before { content: "favorite_border" }  // Heart
-    //.fa.fa-star:before { content: "plus_one" }  // +1
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star:before { content: "star" }  // Star
-        //.fa.fa-star:before { content: "favorite" }  // Heart
-        //.fa.fa-star:before { content: "plus_one" }  // +1
-    }
-}
\ No newline at end of file
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/emoji-picker.scss b/app/javascript/styles/material-v2-light/emoji-picker.scss
index d57c5c041..2c17701cf 100644
--- a/app/javascript/styles/material-v2-light/emoji-picker.scss
+++ b/app/javascript/styles/material-v2-light/emoji-picker.scss
@@ -46,7 +46,7 @@
         }
 
         &-bar {
-            background-color: $tab-indicator-color;
+            background-color: $tab-indicator-active-color;
         }
 
         &:hover {
@@ -63,7 +63,7 @@
             background: $search-bar-color;
             color: $ui-text-color;
             border: 0;
-            border-radius: $bar-radius;
+            border-radius: $search-bar-radius;
 
             &:focus {
                 @include shadow-2dp;
@@ -82,7 +82,7 @@
         background: $menu-background-color;
     }
 
-    &-emoji:hover:before {
+    &-emoji:hover::before {
         background-color: $icon-background-hover-color;
     }
 
diff --git a/app/javascript/styles/material-v2-light/icons.scss b/app/javascript/styles/material-v2-light/icons.scss
index 6778e3d2c..beca11a6f 100644
--- a/app/javascript/styles/material-v2-light/icons.scss
+++ b/app/javascript/styles/material-v2-light/icons.scss
@@ -15,16 +15,21 @@
 }
 
 
-.fa { vertical-align: sub }  //マテリアルアイコンを文字の高さにそろえる
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
 
 .fa.fa-times,
-.fa.fa-eraser { vertical-align: middle }  //↑の例外
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
 
 .fa.fa-lock { text-transform: none }
 
 .fa-fw { width: 16px }
 
-.fa.fa-chevron-left.column-back-button__icon.fa-fw {
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
     font-size: 20px;
     margin-right: 16px;
 }
@@ -34,4 +39,10 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
\ No newline at end of file
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/material-icons.scss b/app/javascript/styles/material-v2-light/material-icons.scss
index 52b959485..e473dfe31 100644
--- a/app/javascript/styles/material-v2-light/material-icons.scss
+++ b/app/javascript/styles/material-v2-light/material-icons.scss
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 @import 'config';
+@import 'functions';
 
 
 .fa {
@@ -31,6 +32,7 @@
     &.fa-chevron-right,
     &.fa-reply,
     &.fa-reply-all,
+    &.fa-share-alt,
     &.fa-star,
     &.fa-bookmark,
     &.fa-ellipsis-h,
@@ -46,51 +48,99 @@
     &.fa-eye,
     &.fa-eye-slash,
     &.fa-pencil,
-    &.fa-trash {
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check {
         font-family: "Material Icons";
     }
 }
 
 .fa {
-    &.fa-bars:before, &.fa-navicon:before,&.fa-reorder:before { content: "menu" }
-    &.fa-globe:before { content: "public" }
-    &.fa-cog:before, &.fa-cogs:before, &.fa-gears:before { content: "settings" }
-    &.fa-sign-out:before { content: "exit_to_app" }
-    &.fa-search:before { content: "search" }
-    &.fa-times:before, &.fa-times-circle:before, &.fa-close:before, &.fa-remove:before { content: "close" }
-    &.fa-chevron-down:before, &.fa-ellipsis-v:before { content: "more_vert" }
-    &.fa-paperclip:before { content: "attach_file" }
-    &.fa-tasks:before { content: "poll" }
-    &.fa-plus:before { content: "add" }
-    &.fa-unlock:before { content: "lock_open" }
-    &.fa-lock:before { content: "lock" }
-    &.fa-envelope:before { content: "mail" }
-    &.fa-home:before { content: "home" }
-    &.fa-bullhorn:before { content: "announcement" }
-    &.fa-sliders:before { content: "tune" }
-    &.fa-chevron-left:before { content: "arrow_back" }
-    &.fa-chevron-right:before { content: "arrow_forward" }
-    &.fa-reply:before { content: "reply" }
-    &.fa-reply-all:before { content: "reply_all" }
-    &.fa-bookmark:before { content: "bookmark" }
-    &.fa-ellipsis-h:before { content: "more_horiz" }
-    &.fa-bell:before { content: "notifications" }
-    &.fa-eraser:before { content: "clear_all" }
-    &.fa-users:before { content: "people" }
-    &.fa-file-text:before { content: "web" }
-    &.fa-user-plus:before { content: "person_add" }
-    &.fa-address-book:before { content: "explore" }
-    &.fa-address-book-o:before { content: "explore" }
-    &.fa-list:before { content: "list" }
-    &.fa-list-ul:before { content: "list" }
-    &.fa-eye:before { content: "visibility" }
-    &.fa-eye-slash:before { content : "visibility_off" }
-    &.fa-pencil:before { content: "create" }
-    &.fa-trash:before { content: "delete" }
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: "reply" }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
 }
 
+// bookmark icon
 .status__action-bar-button.icon-button,
 .bookmark-icon.icon-button {
-    .fa.fa-bookmark:before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark:before { content: "bookmark" }
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/media.scss b/app/javascript/styles/material-v2-light/media.scss
index 74dfd8dcc..64a69a129 100644
--- a/app/javascript/styles/material-v2-light/media.scss
+++ b/app/javascript/styles/material-v2-light/media.scss
@@ -26,13 +26,74 @@
     }
 }
 
-.icon-button.overlayed {
-    border-radius: 50%;
-    background: $media-icon-background-color;
-    color: $media-icon-color;
-
-    &:hover {
+.media-modal {
+    &__nav {
         background: $media-icon-background-color;
-        color: $media-icon-hover-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
     }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/mobile.scss b/app/javascript/styles/material-v2-light/mobile.scss
index 448f80585..de6f4e94c 100644
--- a/app/javascript/styles/material-v2-light/mobile.scss
+++ b/app/javascript/styles/material-v2-light/mobile.scss
@@ -12,14 +12,17 @@
         border-bottom: 4px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-indicator-color;
-            color: $tab-indicator-color;
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
         }
 
         .fa { font-size: 20px }
     }
 
-    &__wrapper { @include shadow-4dp }
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
 }
 
 
diff --git a/app/javascript/styles/material-v2-light/modal.scss b/app/javascript/styles/material-v2-light/modal.scss
index 40710fe43..7734c8dfa 100644
--- a/app/javascript/styles/material-v2-light/modal.scss
+++ b/app/javascript/styles/material-v2-light/modal.scss
@@ -29,10 +29,25 @@
         color: $ui-text-color;
         font-size: 16px;
 
-        &:hover { background: $card-background-hover-color }
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
     }
 
     .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
 }
 
 .report-modal {
diff --git a/app/javascript/styles/material-v2-light/statuses.scss b/app/javascript/styles/material-v2-light/statuses.scss
index c569b3b92..f60c2d859 100644
--- a/app/javascript/styles/material-v2-light/statuses.scss
+++ b/app/javascript/styles/material-v2-light/statuses.scss
@@ -73,6 +73,8 @@
         }
     }
 
+    &__prepend { color: $secondary-text-color }
+
     &.status-direct:not(.read) {
         background: transparent;
         border-bottom-color: $border-color;
@@ -99,9 +101,25 @@
 
     &__description { color: $secondary-text-color }
 
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
     &.compact {
         border-color: $border-color;
         outline: none;
+        background: transparent;
         
         .status-card {
             &__content { padding: 12px }
@@ -114,8 +132,16 @@
     &:hover { background-color: $card-background-color }
 }
 
+// Detailed status in mobile
 .status.light {
-    .display-name span { color: $info-text-color }
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
 }
 
 .detailed-status {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c5cb6a7ed..cacb9cfcd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1245,6 +1245,8 @@ en:
     material-v1-light: Material v1 (Light)
     material-v2-dark: Material v2 (Dark)
     material-v2-light: Material v2 (Light)
+    mastodon-material-dark: Mastodon Material (Dark)
+    mastodon-material-light: Mastodon Material (Light)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 489463ed6..e187149e8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1226,6 +1226,8 @@ ja:
     material-v1-light: Material v1 (ライト)
     material-v2-dark: Material v2 (ダーク)
     material-v2-light: Material v2 (ライト)
+    mastodon-material-dark: Mastodon Material (ダーク)
+    mastodon-material-light: Mastodon Material (ライト)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index 015c9ddf7..cfd4d16fa 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -7,3 +7,5 @@ material-v1-dark: styles/material-v1-dark.scss
 material-v1-light: styles/material-v1-light.scss
 material-v2-dark: styles/material-v2-dark.scss
 material-v2-light: styles/material-v2-light.scss
+mastodon-material-dark: styles/mastodon-material-dark.scss
+mastodon-material-light: styles/mastodon-material-light.scss

From 414bd398caeafe3f81b8de023f54eabcf8fd4e30 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 17 May 2020 15:47:52 +0900
Subject: [PATCH 038/200] update material theme add plus theme

---
 .../styles/mastodon-material-dark.scss        |  17 +-
 .../mastodon-material-dark/_functions.scss    |  12 -
 .../color/mastodon-dark.scss                  |   1 +
 .../color/mastodon-light.scss                 | 129 +++++
 .../color/plus-classic.scss                   | 129 +++++
 .../mastodon-material-dark/color/v1-dark.scss | 129 +++++
 .../color/v1-light.scss                       | 130 +++++
 .../mastodon-material-dark/color/v2-dark.scss | 130 +++++
 .../color/v2-light.scss                       | 130 +++++
 .../styles/mastodon-material-dark/config.scss |  39 --
 .../mastodon-material-dark/custom_color.scss  |   4 +
 .../mastodon-material-dark/custom_config.scss |   5 +
 .../mastodon-material-dark/custom_layout.scss |   4 +
 .../icon_config.scss}                         |  43 +-
 .../layout/material-v1.scss                   |   2 +-
 .../layout/material-v2.scss                   |  65 +++
 .../styles/mastodon-material-dark/loader.scss |  12 +
 .../{ => plugins}/cards.scss                  |  15 +-
 .../mastodon-material-dark/plugins/dense.scss |  63 +++
 .../mastodon-material-dark/plugins/plus.scss  |  33 ++
 .../theme/_functions.scss                     |   8 +
 .../{ => theme}/_mixins.scss                  |   0
 .../theme}/account.scss                       |   4 +-
 .../theme/base_config.scss                    |  34 ++
 .../theme}/basics.scss                        |   4 +-
 .../theme}/button.scss                        |   4 +-
 .../{ => theme}/columns.scss                  |  99 +++-
 .../theme}/components.scss                    |  11 +-
 .../theme}/control.scss                       |   4 +-
 .../{ => theme}/emoji-picker.scss             |   6 +-
 .../theme}/icons.scss                         |  12 +-
 .../theme}/material-icons.scss                |  16 +-
 .../theme}/media.scss                         |   4 +-
 .../theme}/mobile.scss                        |  16 +-
 .../theme}/modal.scss                         |  10 +-
 .../{ => theme}/statuses.scss                 |  21 +-
 .../mastodon-material-dark/theme/theme.scss   |   4 +
 .../theme/variables.scss                      |   7 +
 .../styles/mastodon-material-light.scss       |  17 +-
 .../mastodon-material-light/_functions.scss   |  12 -
 .../color/mastodon-dark.scss                  | 130 +++++
 .../color/mastodon-light.scss                 |   1 +
 .../color/plus-classic.scss                   | 129 +++++
 .../color/v1-dark.scss                        | 129 +++++
 .../color/v1-light.scss                       | 130 +++++
 .../color/v2-dark.scss                        | 130 +++++
 .../color/v2-light.scss                       | 130 +++++
 .../mastodon-material-light/config.scss       |  39 --
 .../mastodon-material-light/custom_color.scss |   4 +
 .../custom_config.scss                        |   5 +
 .../custom_layout.scss                        |   4 +
 .../icon_config.scss}                         |  43 +-
 .../layout/material-v1.scss                   |   2 +-
 .../layout/material-v2.scss                   |  65 +++
 .../mastodon-material-light/loader.scss       |  12 +
 .../{ => plugins}/cards.scss                  |  15 +-
 .../plugins/dense.scss                        |  63 +++
 .../mastodon-material-light/plugins/plus.scss |  33 ++
 .../theme/_functions.scss                     |   8 +
 .../{ => theme}/_mixins.scss                  |   0
 .../theme}/account.scss                       |   4 +-
 .../theme/base_config.scss                    |  34 ++
 .../{ => theme}/basics.scss                   |   4 +-
 .../theme}/button.scss                        |   4 +-
 .../theme}/columns.scss                       |  99 +++-
 .../theme}/components.scss                    |  11 +-
 .../theme}/control.scss                       |   4 +-
 .../theme}/emoji-picker.scss                  |   6 +-
 .../theme}/icons.scss                         |  12 +-
 .../{ => theme}/material-icons.scss           |  16 +-
 .../theme}/media.scss                         |   4 +-
 .../theme}/mobile.scss                        |  16 +-
 .../theme}/modal.scss                         |  10 +-
 .../theme}/statuses.scss                      |  21 +-
 .../mastodon-material-light/theme/theme.scss  |   4 +
 .../theme/variables.scss                      |   7 +
 app/javascript/styles/material-v1-dark.scss   |  17 +-
 .../styles/material-v1-dark/_functions.scss   |  12 -
 .../material-v1-dark/color/mastodon-dark.scss | 130 +++++
 .../color/mastodon-light.scss                 | 129 +++++
 .../material-v1-dark/color/plus-classic.scss  | 129 +++++
 .../material-v1-dark/color/v1-dark.scss       |  10 +-
 .../material-v1-dark/color/v1-light.scss      | 130 +++++
 .../material-v1-dark/color/v2-dark.scss       | 130 +++++
 .../material-v1-dark/color/v2-light.scss      | 130 +++++
 .../styles/material-v1-dark/custom_color.scss |   4 +
 .../material-v1-dark/custom_config.scss       |   5 +
 .../material-v1-dark/custom_layout.scss       |   4 +
 .../icon_config.scss}                         |  43 +-
 .../material-v1-dark/layout/material-v1.scss  |   2 +-
 .../material-v1-dark/layout/material-v2.scss  |  65 +++
 .../styles/material-v1-dark/loader.scss       |  12 +
 .../material-v1-dark/{ => plugins}/cards.scss |  15 +-
 .../material-v1-dark/plugins/dense.scss       |  63 +++
 .../styles/material-v1-dark/plugins/plus.scss |  33 ++
 .../material-v1-dark/theme/_functions.scss    |   8 +
 .../material-v1-dark/{ => theme}/_mixins.scss |   0
 .../theme}/account.scss                       |   4 +-
 .../material-v1-dark/theme/base_config.scss   |  34 ++
 .../theme}/basics.scss                        |   4 +-
 .../theme}/button.scss                        |   4 +-
 .../theme}/columns.scss                       |  99 +++-
 .../theme}/components.scss                    |  11 +-
 .../theme}/control.scss                       |   4 +-
 .../theme}/emoji-picker.scss                  |   6 +-
 .../material-v1-dark/{ => theme}/icons.scss   |  12 +-
 .../theme}/material-icons.scss                |  16 +-
 .../material-v1-dark/{ => theme}/media.scss   |   4 +-
 .../theme}/mobile.scss                        |  16 +-
 .../theme}/modal.scss                         |  10 +-
 .../theme}/statuses.scss                      |  21 +-
 .../styles/material-v1-dark/theme/theme.scss  |   4 +
 .../material-v1-dark/theme/variables.scss     |   7 +
 app/javascript/styles/material-v1-light.scss  |  17 +-
 .../styles/material-v1-light/_functions.scss  |  12 -
 .../color/mastodon-dark.scss                  | 130 +++++
 .../color/mastodon-light.scss                 | 129 +++++
 .../material-v1-light/color/plus-classic.scss | 129 +++++
 .../material-v1-light/color/v1-dark.scss      | 129 +++++
 .../material-v1-light/color/v1-light.scss     |   1 +
 .../material-v1-light/color/v2-dark.scss      | 130 +++++
 .../material-v1-light/color/v2-light.scss     | 130 +++++
 .../material-v1-light/custom_color.scss       |   4 +
 .../material-v1-light/custom_config.scss      |   4 +
 .../material-v1-light/custom_layout.scss      |   4 +
 .../{config.scss => icon_config.scss}         |  43 +-
 .../material-v1-light/layout/material-v1.scss |   2 +-
 .../material-v1-light/layout/material-v2.scss |  65 +++
 .../styles/material-v1-light/loader.scss      |  12 +
 .../{ => plugins}/cards.scss                  |  15 +-
 .../material-v1-light/plugins/dense.scss      |  63 +++
 .../material-v1-light/plugins/plus.scss       |  33 ++
 .../material-v1-light/theme/_functions.scss   |   8 +
 .../{ => theme}/_mixins.scss                  |   0
 .../theme}/account.scss                       |   4 +-
 .../material-v1-light/theme/base_config.scss  |  34 ++
 .../material-v1-light/{ => theme}/basics.scss |   4 +-
 .../theme}/button.scss                        |   4 +-
 .../{ => theme}/columns.scss                  |  99 +++-
 .../{ => theme}/components.scss               |  11 +-
 .../theme}/control.scss                       |   4 +-
 .../{ => theme}/emoji-picker.scss             |   6 +-
 .../material-v1-light/{ => theme}/icons.scss  |  12 +-
 .../theme}/material-icons.scss                |  16 +-
 .../material-v1-light/{ => theme}/media.scss  |   4 +-
 .../material-v1-light/{ => theme}/mobile.scss |  16 +-
 .../theme}/modal.scss                         |  10 +-
 .../{ => theme}/statuses.scss                 |  21 +-
 .../styles/material-v1-light/theme/theme.scss |   4 +
 .../material-v1-light/theme/variables.scss    |   7 +
 app/javascript/styles/material-v2-dark.scss   |  17 +-
 .../styles/material-v2-dark/_functions.scss   |  12 -
 .../styles/material-v2-dark/account.scss      | 143 -----
 .../styles/material-v2-dark/basics.scss       |  24 -
 .../styles/material-v2-dark/button.scss       |  95 ----
 .../styles/material-v2-dark/cards.scss        |  29 -
 .../material-v2-dark/color/mastodon-dark.scss | 130 +++++
 .../color/mastodon-light.scss                 | 129 +++++
 .../material-v2-dark/color/plus-classic.scss  | 129 +++++
 .../material-v2-dark/color/v1-dark.scss       | 129 +++++
 .../material-v2-dark/color/v1-light.scss      | 130 +++++
 .../material-v2-dark/color/v2-dark.scss       |   3 +-
 .../material-v2-dark/color/v2-light.scss      | 130 +++++
 .../styles/material-v2-dark/columns.scss      | 461 ----------------
 .../styles/material-v2-dark/components.scss   | 389 --------------
 .../styles/material-v2-dark/control.scss      |  69 ---
 .../styles/material-v2-dark/custom_color.scss |   4 +
 .../material-v2-dark/custom_config.scss       |   7 +
 .../material-v2-dark/custom_layout.scss       |   4 +
 .../styles/material-v2-dark/emoji-picker.scss |  90 ----
 .../styles/material-v2-dark/icon_config.scss  |  26 +
 .../styles/material-v2-dark/icons.scss        |  48 --
 .../material-v2-dark/layout/material-v1.scss  |  45 ++
 .../material-v2-dark/layout/material-v2.scss  |   2 +-
 .../styles/material-v2-dark/loader.scss       |  12 +
 .../material-v2-dark/material-icons.scss      | 146 -----
 .../styles/material-v2-dark/media.scss        |  99 ----
 .../styles/material-v2-dark/mobile.scss       |  48 --
 .../styles/material-v2-dark/modal.scss        |  76 ---
 .../material-v2-dark/plugins/cards.scss       |  38 ++
 .../material-v2-dark/plugins/dense.scss       |  63 +++
 .../styles/material-v2-dark/plugins/plus.scss |  33 ++
 .../styles/material-v2-dark/statuses.scss     | 172 ------
 .../material-v2-dark/theme/_functions.scss    |   8 +
 .../material-v2-dark/{ => theme}/_mixins.scss |   0
 .../material-v2-dark/theme/account.scss       | 145 +++++
 .../material-v2-dark/theme/base_config.scss   |  34 ++
 .../styles/material-v2-dark/theme/basics.scss |  26 +
 .../styles/material-v2-dark/theme/button.scss |  97 ++++
 .../material-v2-dark/theme/columns.scss       | 502 ++++++++++++++++++
 .../material-v2-dark/theme/components.scss    | 394 ++++++++++++++
 .../material-v2-dark/theme/control.scss       |  71 +++
 .../material-v2-dark/theme/emoji-picker.scss  |  92 ++++
 .../styles/material-v2-dark/theme/icons.scss  |  44 ++
 .../theme/material-icons.scss                 | 156 ++++++
 .../styles/material-v2-dark/theme/media.scss  | 101 ++++
 .../styles/material-v2-dark/theme/mobile.scss |  58 ++
 .../styles/material-v2-dark/theme/modal.scss  |  84 +++
 .../material-v2-dark/theme/statuses.scss      | 185 +++++++
 .../styles/material-v2-dark/theme/theme.scss  |   4 +
 .../material-v2-dark/theme/variables.scss     |   7 +
 app/javascript/styles/material-v2-light.scss  |  17 +-
 .../styles/material-v2-light/_functions.scss  |  12 -
 .../styles/material-v2-light/account.scss     | 143 -----
 .../styles/material-v2-light/basics.scss      |  24 -
 .../styles/material-v2-light/button.scss      |  95 ----
 .../styles/material-v2-light/cards.scss       |  29 -
 .../color/mastodon-dark.scss                  | 130 +++++
 .../color/mastodon-light.scss                 | 129 +++++
 .../material-v2-light/color/plus-classic.scss | 129 +++++
 .../material-v2-light/color/v1-dark.scss      | 129 +++++
 .../material-v2-light/color/v1-light.scss     | 130 +++++
 .../material-v2-light/color/v2-dark.scss      | 130 +++++
 .../material-v2-light/color/v2-light.scss     |   1 +
 .../styles/material-v2-light/columns.scss     | 461 ----------------
 .../styles/material-v2-light/components.scss  | 389 --------------
 .../styles/material-v2-light/control.scss     |  69 ---
 .../material-v2-light/custom_color.scss       |   4 +
 .../material-v2-light/custom_config.scss      |   7 +
 .../material-v2-light/custom_layout.scss      |   4 +
 .../material-v2-light/emoji-picker.scss       |  90 ----
 .../styles/material-v2-light/icon_config.scss |  26 +
 .../styles/material-v2-light/icons.scss       |  48 --
 .../material-v2-light/layout/material-v1.scss |  45 ++
 .../material-v2-light/layout/material-v2.scss |   2 +-
 .../styles/material-v2-light/loader.scss      |  12 +
 .../material-v2-light/material-icons.scss     | 146 -----
 .../styles/material-v2-light/media.scss       |  99 ----
 .../styles/material-v2-light/mobile.scss      |  48 --
 .../styles/material-v2-light/modal.scss       |  76 ---
 .../material-v2-light/plugins/cards.scss      |  38 ++
 .../material-v2-light/plugins/dense.scss      |  63 +++
 .../material-v2-light/plugins/plus.scss       |  33 ++
 .../styles/material-v2-light/statuses.scss    | 172 ------
 .../material-v2-light/theme/_functions.scss   |   8 +
 .../{ => theme}/_mixins.scss                  |   0
 .../material-v2-light/theme/account.scss      | 145 +++++
 .../material-v2-light/theme/base_config.scss  |  34 ++
 .../material-v2-light/theme/basics.scss       |  26 +
 .../material-v2-light/theme/button.scss       |  97 ++++
 .../material-v2-light/theme/columns.scss      | 502 ++++++++++++++++++
 .../material-v2-light/theme/components.scss   | 394 ++++++++++++++
 .../material-v2-light/theme/control.scss      |  71 +++
 .../material-v2-light/theme/emoji-picker.scss |  92 ++++
 .../styles/material-v2-light/theme/icons.scss |  44 ++
 .../theme/material-icons.scss                 | 156 ++++++
 .../styles/material-v2-light/theme/media.scss | 101 ++++
 .../material-v2-light/theme/mobile.scss       |  58 ++
 .../styles/material-v2-light/theme/modal.scss |  84 +++
 .../material-v2-light/theme/statuses.scss     | 185 +++++++
 .../styles/material-v2-light/theme/theme.scss |   4 +
 .../material-v2-light/theme/variables.scss    |   7 +
 app/javascript/styles/plus.scss               |   3 +
 .../styles/plus/color/mastodon-dark.scss      | 130 +++++
 .../styles/plus/color/mastodon-light.scss     | 129 +++++
 .../styles/plus/color/plus-classic.scss       | 129 +++++
 app/javascript/styles/plus/color/v1-dark.scss | 129 +++++
 .../styles/plus/color/v1-light.scss           | 130 +++++
 app/javascript/styles/plus/color/v2-dark.scss | 130 +++++
 .../styles/plus/color/v2-light.scss           | 130 +++++
 app/javascript/styles/plus/custom_color.scss  |   4 +
 app/javascript/styles/plus/custom_config.scss |   5 +
 app/javascript/styles/plus/custom_layout.scss |   4 +
 app/javascript/styles/plus/icon_config.scss   |  26 +
 .../styles/plus/layout/material-v1.scss       |  45 ++
 .../styles/plus/layout/material-v2.scss       |  65 +++
 app/javascript/styles/plus/loader.scss        |  12 +
 app/javascript/styles/plus/plugins/cards.scss |  38 ++
 app/javascript/styles/plus/plugins/dense.scss |  63 +++
 app/javascript/styles/plus/plugins/plus.scss  |  33 ++
 .../styles/plus/theme/_functions.scss         |   8 +
 app/javascript/styles/plus/theme/_mixins.scss |  25 +
 app/javascript/styles/plus/theme/account.scss | 145 +++++
 .../styles/plus/theme/base_config.scss        |  34 ++
 app/javascript/styles/plus/theme/basics.scss  |  26 +
 app/javascript/styles/plus/theme/button.scss  |  97 ++++
 app/javascript/styles/plus/theme/columns.scss | 502 ++++++++++++++++++
 .../styles/plus/theme/components.scss         | 394 ++++++++++++++
 app/javascript/styles/plus/theme/control.scss |  71 +++
 .../styles/plus/theme/emoji-picker.scss       |  92 ++++
 app/javascript/styles/plus/theme/icons.scss   |  44 ++
 .../styles/plus/theme/material-icons.scss     | 156 ++++++
 app/javascript/styles/plus/theme/media.scss   | 101 ++++
 app/javascript/styles/plus/theme/mobile.scss  |  58 ++
 app/javascript/styles/plus/theme/modal.scss   |  84 +++
 .../styles/plus/theme/statuses.scss           | 185 +++++++
 app/javascript/styles/plus/theme/theme.scss   |   4 +
 .../styles/plus/theme/variables.scss          |   7 +
 config/locales/en.yml                         |   1 +
 config/locales/ja.yml                         |   1 +
 config/themes.yml                             |   1 +
 291 files changed, 14083 insertions(+), 4392 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-material-dark/_functions.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/color/v2-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/config.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/custom_color.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/custom_config.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/custom_layout.scss
 rename app/javascript/styles/{material-v2-dark/config.scss => mastodon-material-dark/icon_config.scss} (57%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/loader.scss
 rename app/javascript/styles/mastodon-material-dark/{ => plugins}/cards.scss (56%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/plugins/dense.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/plugins/plus.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/_functions.scss
 rename app/javascript/styles/mastodon-material-dark/{ => theme}/_mixins.scss (100%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/account.scss (97%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/base_config.scss
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/basics.scss (83%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/button.scss (95%)
 rename app/javascript/styles/mastodon-material-dark/{ => theme}/columns.scss (83%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/components.scss (97%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/control.scss (93%)
 rename app/javascript/styles/mastodon-material-dark/{ => theme}/emoji-picker.scss (93%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material-dark/theme}/icons.scss (78%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-dark/theme}/material-icons.scss (90%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material-dark/theme}/media.scss (95%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material-dark/theme}/mobile.scss (74%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material-dark/theme}/modal.scss (87%)
 rename app/javascript/styles/mastodon-material-dark/{ => theme}/statuses.scss (87%)
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/theme.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/_functions.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/plus-classic.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/config.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/custom_color.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/custom_config.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/custom_layout.scss
 rename app/javascript/styles/{material-v1-dark/config.scss => mastodon-material-light/icon_config.scss} (57%)
 create mode 100644 app/javascript/styles/mastodon-material-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/loader.scss
 rename app/javascript/styles/mastodon-material-light/{ => plugins}/cards.scss (56%)
 create mode 100644 app/javascript/styles/mastodon-material-light/plugins/dense.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/plugins/plus.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/_functions.scss
 rename app/javascript/styles/mastodon-material-light/{ => theme}/_mixins.scss (100%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material-light/theme}/account.scss (97%)
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/base_config.scss
 rename app/javascript/styles/mastodon-material-light/{ => theme}/basics.scss (83%)
 rename app/javascript/styles/{material-v1-light => mastodon-material-light/theme}/button.scss (95%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-light/theme}/columns.scss (83%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material-light/theme}/components.scss (97%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material-light/theme}/control.scss (93%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-light/theme}/emoji-picker.scss (93%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material-light/theme}/icons.scss (78%)
 rename app/javascript/styles/mastodon-material-light/{ => theme}/material-icons.scss (90%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material-light/theme}/media.scss (95%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-light/theme}/mobile.scss (74%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-light/theme}/modal.scss (87%)
 rename app/javascript/styles/{material-v1-dark => mastodon-material-light/theme}/statuses.scss (87%)
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/theme.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/_functions.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/plus-classic.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-dark/custom_color.scss
 create mode 100644 app/javascript/styles/material-v1-dark/custom_config.scss
 create mode 100644 app/javascript/styles/material-v1-dark/custom_layout.scss
 rename app/javascript/styles/{material-v2-light/config.scss => material-v1-dark/icon_config.scss} (57%)
 create mode 100644 app/javascript/styles/material-v1-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-dark/loader.scss
 rename app/javascript/styles/material-v1-dark/{ => plugins}/cards.scss (56%)
 create mode 100644 app/javascript/styles/material-v1-dark/plugins/dense.scss
 create mode 100644 app/javascript/styles/material-v1-dark/plugins/plus.scss
 create mode 100644 app/javascript/styles/material-v1-dark/theme/_functions.scss
 rename app/javascript/styles/material-v1-dark/{ => theme}/_mixins.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-v1-dark/theme}/account.scss (97%)
 create mode 100644 app/javascript/styles/material-v1-dark/theme/base_config.scss
 rename app/javascript/styles/{mastodon-material-dark => material-v1-dark/theme}/basics.scss (83%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-dark/theme}/button.scss (95%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-dark/theme}/columns.scss (83%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-dark/theme}/components.scss (97%)
 rename app/javascript/styles/{material-v1-light => material-v1-dark/theme}/control.scss (93%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-dark/theme}/emoji-picker.scss (93%)
 rename app/javascript/styles/material-v1-dark/{ => theme}/icons.scss (78%)
 rename app/javascript/styles/{material-v1-light => material-v1-dark/theme}/material-icons.scss (90%)
 rename app/javascript/styles/material-v1-dark/{ => theme}/media.scss (95%)
 rename app/javascript/styles/{mastodon-material-dark => material-v1-dark/theme}/mobile.scss (74%)
 rename app/javascript/styles/{material-v1-light => material-v1-dark/theme}/modal.scss (87%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-dark/theme}/statuses.scss (87%)
 create mode 100644 app/javascript/styles/material-v1-dark/theme/theme.scss
 create mode 100644 app/javascript/styles/material-v1-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-v1-light/_functions.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/plus-classic.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/material-v1-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/material-v1-light/custom_color.scss
 create mode 100644 app/javascript/styles/material-v1-light/custom_config.scss
 create mode 100644 app/javascript/styles/material-v1-light/custom_layout.scss
 rename app/javascript/styles/material-v1-light/{config.scss => icon_config.scss} (57%)
 create mode 100644 app/javascript/styles/material-v1-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/material-v1-light/loader.scss
 rename app/javascript/styles/material-v1-light/{ => plugins}/cards.scss (56%)
 create mode 100644 app/javascript/styles/material-v1-light/plugins/dense.scss
 create mode 100644 app/javascript/styles/material-v1-light/plugins/plus.scss
 create mode 100644 app/javascript/styles/material-v1-light/theme/_functions.scss
 rename app/javascript/styles/material-v1-light/{ => theme}/_mixins.scss (100%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-light/theme}/account.scss (97%)
 create mode 100644 app/javascript/styles/material-v1-light/theme/base_config.scss
 rename app/javascript/styles/material-v1-light/{ => theme}/basics.scss (83%)
 rename app/javascript/styles/{mastodon-material-dark => material-v1-light/theme}/button.scss (95%)
 rename app/javascript/styles/material-v1-light/{ => theme}/columns.scss (83%)
 rename app/javascript/styles/material-v1-light/{ => theme}/components.scss (97%)
 rename app/javascript/styles/{mastodon-material-light => material-v1-light/theme}/control.scss (93%)
 rename app/javascript/styles/material-v1-light/{ => theme}/emoji-picker.scss (93%)
 rename app/javascript/styles/material-v1-light/{ => theme}/icons.scss (78%)
 rename app/javascript/styles/{mastodon-material-dark => material-v1-light/theme}/material-icons.scss (90%)
 rename app/javascript/styles/material-v1-light/{ => theme}/media.scss (95%)
 rename app/javascript/styles/material-v1-light/{ => theme}/mobile.scss (74%)
 rename app/javascript/styles/{mastodon-material-dark => material-v1-light/theme}/modal.scss (87%)
 rename app/javascript/styles/material-v1-light/{ => theme}/statuses.scss (87%)
 create mode 100644 app/javascript/styles/material-v1-light/theme/theme.scss
 create mode 100644 app/javascript/styles/material-v1-light/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/_functions.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/account.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/basics.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/button.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/cards.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/plus-classic.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-dark/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/columns.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/components.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/control.scss
 create mode 100644 app/javascript/styles/material-v2-dark/custom_color.scss
 create mode 100644 app/javascript/styles/material-v2-dark/custom_config.scss
 create mode 100644 app/javascript/styles/material-v2-dark/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-dark/icon_config.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-dark/loader.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/material-icons.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/media.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/mobile.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/modal.scss
 create mode 100644 app/javascript/styles/material-v2-dark/plugins/cards.scss
 create mode 100644 app/javascript/styles/material-v2-dark/plugins/dense.scss
 create mode 100644 app/javascript/styles/material-v2-dark/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/_functions.scss
 rename app/javascript/styles/material-v2-dark/{ => theme}/_mixins.scss (100%)
 create mode 100644 app/javascript/styles/material-v2-dark/theme/account.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/base_config.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/basics.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/button.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/columns.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/components.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/control.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/media.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/modal.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/theme.scss
 create mode 100644 app/javascript/styles/material-v2-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-v2-light/_functions.scss
 delete mode 100644 app/javascript/styles/material-v2-light/account.scss
 delete mode 100644 app/javascript/styles/material-v2-light/basics.scss
 delete mode 100644 app/javascript/styles/material-v2-light/button.scss
 delete mode 100644 app/javascript/styles/material-v2-light/cards.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/plus-classic.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/material-v2-light/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-light/columns.scss
 delete mode 100644 app/javascript/styles/material-v2-light/components.scss
 delete mode 100644 app/javascript/styles/material-v2-light/control.scss
 create mode 100644 app/javascript/styles/material-v2-light/custom_color.scss
 create mode 100644 app/javascript/styles/material-v2-light/custom_config.scss
 create mode 100644 app/javascript/styles/material-v2-light/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-v2-light/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-light/icon_config.scss
 delete mode 100644 app/javascript/styles/material-v2-light/icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/material-v2-light/loader.scss
 delete mode 100644 app/javascript/styles/material-v2-light/material-icons.scss
 delete mode 100644 app/javascript/styles/material-v2-light/media.scss
 delete mode 100644 app/javascript/styles/material-v2-light/mobile.scss
 delete mode 100644 app/javascript/styles/material-v2-light/modal.scss
 create mode 100644 app/javascript/styles/material-v2-light/plugins/cards.scss
 create mode 100644 app/javascript/styles/material-v2-light/plugins/dense.scss
 create mode 100644 app/javascript/styles/material-v2-light/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-v2-light/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/_functions.scss
 rename app/javascript/styles/material-v2-light/{ => theme}/_mixins.scss (100%)
 create mode 100644 app/javascript/styles/material-v2-light/theme/account.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/base_config.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/basics.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/button.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/columns.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/components.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/control.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/emoji-picker.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/material-icons.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/media.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/mobile.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/modal.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/statuses.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/theme.scss
 create mode 100644 app/javascript/styles/material-v2-light/theme/variables.scss
 create mode 100644 app/javascript/styles/plus.scss
 create mode 100644 app/javascript/styles/plus/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/plus/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/plus/color/plus-classic.scss
 create mode 100644 app/javascript/styles/plus/color/v1-dark.scss
 create mode 100644 app/javascript/styles/plus/color/v1-light.scss
 create mode 100644 app/javascript/styles/plus/color/v2-dark.scss
 create mode 100644 app/javascript/styles/plus/color/v2-light.scss
 create mode 100644 app/javascript/styles/plus/custom_color.scss
 create mode 100644 app/javascript/styles/plus/custom_config.scss
 create mode 100644 app/javascript/styles/plus/custom_layout.scss
 create mode 100644 app/javascript/styles/plus/icon_config.scss
 create mode 100644 app/javascript/styles/plus/layout/material-v1.scss
 create mode 100644 app/javascript/styles/plus/layout/material-v2.scss
 create mode 100644 app/javascript/styles/plus/loader.scss
 create mode 100644 app/javascript/styles/plus/plugins/cards.scss
 create mode 100644 app/javascript/styles/plus/plugins/dense.scss
 create mode 100644 app/javascript/styles/plus/plugins/plus.scss
 create mode 100644 app/javascript/styles/plus/theme/_functions.scss
 create mode 100644 app/javascript/styles/plus/theme/_mixins.scss
 create mode 100644 app/javascript/styles/plus/theme/account.scss
 create mode 100644 app/javascript/styles/plus/theme/base_config.scss
 create mode 100644 app/javascript/styles/plus/theme/basics.scss
 create mode 100644 app/javascript/styles/plus/theme/button.scss
 create mode 100644 app/javascript/styles/plus/theme/columns.scss
 create mode 100644 app/javascript/styles/plus/theme/components.scss
 create mode 100644 app/javascript/styles/plus/theme/control.scss
 create mode 100644 app/javascript/styles/plus/theme/emoji-picker.scss
 create mode 100644 app/javascript/styles/plus/theme/icons.scss
 create mode 100644 app/javascript/styles/plus/theme/material-icons.scss
 create mode 100644 app/javascript/styles/plus/theme/media.scss
 create mode 100644 app/javascript/styles/plus/theme/mobile.scss
 create mode 100644 app/javascript/styles/plus/theme/modal.scss
 create mode 100644 app/javascript/styles/plus/theme/statuses.scss
 create mode 100644 app/javascript/styles/plus/theme/theme.scss
 create mode 100644 app/javascript/styles/plus/theme/variables.scss

diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
index 901a441be..f35131435 100644
--- a/app/javascript/styles/mastodon-material-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'mastodon-material-dark/account';
-@import 'mastodon-material-dark/basics';
-@import 'mastodon-material-dark/button';
-//@import 'mastodon-material-dark/cards';
-@import 'mastodon-material-dark/columns';
-@import 'mastodon-material-dark/components';
-@import 'mastodon-material-dark/config';
-@import 'mastodon-material-dark/control';
-@import 'mastodon-material-dark/emoji-picker';
-@import 'mastodon-material-dark/icons';
-@import 'mastodon-material-dark/material-icons';
-@import 'mastodon-material-dark/media';
-@import 'mastodon-material-dark/mobile';
-@import 'mastodon-material-dark/modal';
-@import 'mastodon-material-dark/statuses';
\ No newline at end of file
+@import 'mastodon-material-dark/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/_functions.scss b/app/javascript/styles/mastodon-material-dark/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/mastodon-material-dark/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index 47f990072..de22c451b 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -57,6 +57,7 @@ $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/config.scss b/app/javascript/styles/mastodon-material-dark/config.scss
deleted file mode 100644
index 77d7982e4..000000000
--- a/app/javascript/styles/mastodon-material-dark/config.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-@charset "UTF-8";
-
-
-// Color scheme
-@import 'color/mastodon-dark';
-
-
-// Layout profile
-@import 'layout/material-v1';
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_color.scss b/app/javascript/styles/mastodon-material-dark/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_config.scss b/app/javascript/styles/mastodon-material-dark/custom_config.scss
new file mode 100644
index 000000000..03e8e0c81
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/custom_config.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/mastodon-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_layout.scss b/app/javascript/styles/mastodon-material-dark/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/config.scss b/app/javascript/styles/mastodon-material-dark/icon_config.scss
similarity index 57%
rename from app/javascript/styles/material-v2-dark/config.scss
rename to app/javascript/styles/mastodon-material-dark/icon_config.scss
index 25becc639..3274efde8 100644
--- a/app/javascript/styles/material-v2-dark/config.scss
+++ b/app/javascript/styles/mastodon-material-dark/icon_config.scss
@@ -1,12 +1,17 @@
-@charset "UTF-8";
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
 
 
-// Color scheme
-@import 'color/v2-dark';
-
-
-// Layout profile
-@import 'layout/material-v2';
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
 
 
 // Material Design Icon settings
@@ -15,25 +20,7 @@
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
index 92f369245..825deaf8c 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
new file mode 100644
index 000000000..6c81dc3e4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/loader.scss b/app/javascript/styles/mastodon-material-dark/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/cards.scss b/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
similarity index 56%
rename from app/javascript/styles/mastodon-material-dark/cards.scss
rename to app/javascript/styles/mastodon-material-dark/plugins/cards.scss
index 96988f2c9..c134cbeeb 100644
--- a/app/javascript/styles/mastodon-material-dark/cards.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
@@ -1,17 +1,24 @@
 @charset "UTF-8";
-@import 'config';
-@import 'mixins';
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
 
 
 .column {
     box-shadow: none !important;
     margin: 2px 0 !important;
     padding: 8px !important;
+
+    > .scrollable { background: $background-color }
 }
 
 .status {
-    border-bottom: 0 !important;
+    border-bottom: 0;
     border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
 }
 
 .account { border-bottom: 0 !important }
@@ -20,6 +27,8 @@
 .notification.notification {
     @include shadow-1dp;
     margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_functions.scss b/app/javascript/styles/mastodon-material-dark/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/mastodon-material-dark/_mixins.scss
rename to app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v1-dark/account.scss b/app/javascript/styles/mastodon-material-dark/theme/account.scss
similarity index 97%
rename from app/javascript/styles/material-v1-dark/account.scss
rename to app/javascript/styles/mastodon-material-dark/theme/account.scss
index b43194729..44d68d1e9 100644
--- a/app/javascript/styles/material-v1-dark/account.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/account.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .account {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/basics.scss b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
similarity index 83%
rename from app/javascript/styles/material-v1-dark/basics.scss
rename to app/javascript/styles/mastodon-material-dark/theme/basics.scss
index 5c7c3dc04..4c122d1c6 100644
--- a/app/javascript/styles/material-v1-dark/basics.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 
 
 body { background: $background-color }
diff --git a/app/javascript/styles/material-v1-dark/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
similarity index 95%
rename from app/javascript/styles/material-v1-dark/button.scss
rename to app/javascript/styles/mastodon-material-dark/theme/button.scss
index 38fd1a3c1..1231bac98 100644
--- a/app/javascript/styles/material-v1-dark/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .icon-button {
diff --git a/app/javascript/styles/mastodon-material-dark/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
similarity index 83%
rename from app/javascript/styles/mastodon-material-dark/columns.scss
rename to app/javascript/styles/mastodon-material-dark/theme/columns.scss
index 689028581..a6892adf2 100644
--- a/app/javascript/styles/mastodon-material-dark/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .column {
@@ -26,7 +28,7 @@
 
     &.active {
         .column-header__icon {
-            color: $secondary-color;
+            color: $top-bar-unread-icon-color;
             text-shadow: none;
         }
     }
@@ -318,27 +320,38 @@
     }
 }
 
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
 
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
+        .fa { margin-right: 8px }
     }
 
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
     }
 }
 
@@ -361,8 +374,12 @@
 
         &__unread { background: $badge-color }
     }
+
+    &__pagination { color: $ui-text-color }
 }
 
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -436,15 +453,9 @@
 }
 
 .notification-favourite .status.status-direct {
-    background: transparent;
-
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
 .relationship-tag {
     color: $ui-text-color;
     background-color: $contained-chip-color;
@@ -454,8 +465,38 @@
     opacity: 1;
 }
 
-.react-swipeable-view-container { height: auto }
-
 .attachment-list__list a { color: $secondary-text-color }
 
-.focusable { background: transparent !important }
\ No newline at end of file
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
similarity index 97%
rename from app/javascript/styles/material-v1-dark/components.scss
rename to app/javascript/styles/mastodon-material-dark/theme/components.scss
index 92d2801f4..4f844229c 100644
--- a/app/javascript/styles/material-v1-dark/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -40,7 +42,10 @@
     &__inner {
         background: $card-background-color;
 
-        &.darker { background: $card-background-color }
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
 
         &__mastodon { background: $card-background-color }
     }
@@ -79,7 +84,7 @@
                 opacity: 1;
             }
             &-times-circle.active {
-                right: 10px;
+                right: 16px;
                 left: unset;
                 transform: none;
             }
diff --git a/app/javascript/styles/material-v1-dark/control.scss b/app/javascript/styles/mastodon-material-dark/theme/control.scss
similarity index 93%
rename from app/javascript/styles/material-v1-dark/control.scss
rename to app/javascript/styles/mastodon-material-dark/theme/control.scss
index 7bd251291..a205a4cb7 100644
--- a/app/javascript/styles/material-v1-dark/control.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/control.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/mastodon-material-dark/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
similarity index 93%
rename from app/javascript/styles/mastodon-material-dark/emoji-picker.scss
rename to app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
index 2c17701cf..70e22752d 100644
--- a/app/javascript/styles/mastodon-material-dark/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .emoji-picker-dropdown {
@@ -23,7 +25,7 @@
 .emoji-mart {
     width: 388px !important;
     font-size: 14px;
-    color: $ui-text-color;
+    color: $menu-text-color;
 
     &-bar {
         border: 0 solid $border-color;
diff --git a/app/javascript/styles/mastodon-material-light/icons.scss b/app/javascript/styles/mastodon-material-dark/theme/icons.scss
similarity index 78%
rename from app/javascript/styles/mastodon-material-light/icons.scss
rename to app/javascript/styles/mastodon-material-dark/theme/icons.scss
index beca11a6f..1367647ec 100644
--- a/app/javascript/styles/mastodon-material-light/icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -39,10 +41,4 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
similarity index 90%
rename from app/javascript/styles/material-v1-dark/material-icons.scss
rename to app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index e473dfe31..51631eab5 100644
--- a/app/javascript/styles/material-v1-dark/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
 @import 'functions';
 
 
@@ -61,7 +63,8 @@
     &.fa-arrows-alt,
     &.fa-compress,
     &.fa-user-times,
-    &.fa-check {
+    &.fa-check,
+    &.fa-quote-right {
         font-family: "Material Icons";
     }
 }
@@ -85,7 +88,7 @@
     &.fa-sliders::before { content: "tune" }
     &.fa-chevron-left::before { content: "arrow_back" }
     &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
+    &.fa-reply::before { content: $reply-icon }
     &.fa-reply-all::before { content: "reply_all" }
     &.fa-share-alt::before { content: "share" }
     &.fa-star::before { content: $favorite-icon }
@@ -117,6 +120,7 @@
     &.fa-compress::before { content: "fullscreen_exit" }
     &.fa-user-times::before { content: "delete" }
     &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
 }
 
 // bookmark icon
@@ -137,6 +141,12 @@
     }
 }
 
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
 // boost icon
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
diff --git a/app/javascript/styles/mastodon-material-light/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
similarity index 95%
rename from app/javascript/styles/mastodon-material-light/media.scss
rename to app/javascript/styles/mastodon-material-dark/theme/media.scss
index 64a69a129..28de8db85 100644
--- a/app/javascript/styles/mastodon-material-light/media.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/media.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/mastodon-material-light/mobile.scss b/app/javascript/styles/mastodon-material-dark/theme/mobile.scss
similarity index 74%
rename from app/javascript/styles/mastodon-material-light/mobile.scss
rename to app/javascript/styles/mastodon-material-dark/theme/mobile.scss
index de6f4e94c..ed6467ebc 100644
--- a/app/javascript/styles/mastodon-material-light/mobile.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/mobile.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -17,6 +19,11 @@
         }
 
         .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
     }
 
     &__wrapper {
@@ -41,8 +48,11 @@
 }
 
 .columns-area--mobile {
-    
     .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
 
-    .search__input { padding: 16px 38px }
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
similarity index 87%
rename from app/javascript/styles/mastodon-material-light/modal.scss
rename to app/javascript/styles/mastodon-material-dark/theme/modal.scss
index 7734c8dfa..287dcf804 100644
--- a/app/javascript/styles/mastodon-material-light/modal.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -64,6 +66,12 @@
     &__container {
         border-top: none;
     }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
 }
 
 .embed-modal .embed-modal__container {
diff --git a/app/javascript/styles/mastodon-material-dark/statuses.scss b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
similarity index 87%
rename from app/javascript/styles/mastodon-material-dark/statuses.scss
rename to app/javascript/styles/mastodon-material-dark/theme/statuses.scss
index f60c2d859..65b5fcc41 100644
--- a/app/javascript/styles/mastodon-material-dark/statuses.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -10,7 +12,7 @@
     &__expand { width: 70px }
 
     &__info {
-        font-size: 16px;
+        font-size: $name-font-size;
         padding-right: 4px;
     }
 
@@ -28,7 +30,7 @@
     }
 
     &__content {
-        font-size: 16px;
+        font-size: $status-font-size;
         padding-top: 4px;
         color: $primary-text-color;
 
@@ -73,7 +75,12 @@
         }
     }
 
-    &__prepend { color: $secondary-text-color }
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
 
     &.status-direct:not(.read) {
         background: transparent;
@@ -169,4 +176,10 @@
     &__button {
         .icon-button { font-size: 20px !important }
     }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/theme.scss b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/variables.scss b/app/javascript/styles/mastodon-material-dark/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
index 7a725f929..49340df17 100644
--- a/app/javascript/styles/mastodon-material-light.scss
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'mastodon-material-light/account';
-@import 'mastodon-material-light/basics';
-@import 'mastodon-material-light/button';
-//@import 'mastodon-material-light/cards';
-@import 'mastodon-material-light/columns';
-@import 'mastodon-material-light/components';
-@import 'mastodon-material-light/config';
-@import 'mastodon-material-light/control';
-@import 'mastodon-material-light/emoji-picker';
-@import 'mastodon-material-light/icons';
-@import 'mastodon-material-light/material-icons';
-@import 'mastodon-material-light/media';
-@import 'mastodon-material-light/mobile';
-@import 'mastodon-material-light/modal';
-@import 'mastodon-material-light/statuses';
\ No newline at end of file
+@import 'mastodon-material-light/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/_functions.scss b/app/javascript/styles/mastodon-material-light/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/mastodon-material-light/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 22bcc9f91..134b18e10 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -56,6 +56,7 @@ $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/config.scss b/app/javascript/styles/mastodon-material-light/config.scss
deleted file mode 100644
index 3bcd48014..000000000
--- a/app/javascript/styles/mastodon-material-light/config.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-@charset "UTF-8";
-
-
-// Color scheme
-@import 'color/mastodon-light';
-
-
-// Layout profile
-@import 'layout/material-v1';
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_color.scss b/app/javascript/styles/mastodon-material-light/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_config.scss b/app/javascript/styles/mastodon-material-light/custom_config.scss
new file mode 100644
index 000000000..cf51584fc
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/custom_config.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/mastodon-light';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_layout.scss b/app/javascript/styles/mastodon-material-light/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/config.scss b/app/javascript/styles/mastodon-material-light/icon_config.scss
similarity index 57%
rename from app/javascript/styles/material-v1-dark/config.scss
rename to app/javascript/styles/mastodon-material-light/icon_config.scss
index c8cc5eef4..3274efde8 100644
--- a/app/javascript/styles/material-v1-dark/config.scss
+++ b/app/javascript/styles/mastodon-material-light/icon_config.scss
@@ -1,12 +1,17 @@
-@charset "UTF-8";
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
 
 
-// Color scheme
-@import 'color/v1-dark';
-
-
-// Layout profile
-@import 'layout/material-v1';
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
 
 
 // Material Design Icon settings
@@ -15,25 +20,7 @@
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
index 92f369245..825deaf8c 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
new file mode 100644
index 000000000..6c81dc3e4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/loader.scss b/app/javascript/styles/mastodon-material-light/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/cards.scss b/app/javascript/styles/mastodon-material-light/plugins/cards.scss
similarity index 56%
rename from app/javascript/styles/mastodon-material-light/cards.scss
rename to app/javascript/styles/mastodon-material-light/plugins/cards.scss
index 96988f2c9..c134cbeeb 100644
--- a/app/javascript/styles/mastodon-material-light/cards.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/cards.scss
@@ -1,17 +1,24 @@
 @charset "UTF-8";
-@import 'config';
-@import 'mixins';
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
 
 
 .column {
     box-shadow: none !important;
     margin: 2px 0 !important;
     padding: 8px !important;
+
+    > .scrollable { background: $background-color }
 }
 
 .status {
-    border-bottom: 0 !important;
+    border-bottom: 0;
     border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
 }
 
 .account { border-bottom: 0 !important }
@@ -20,6 +27,8 @@
 .notification.notification {
     @include shadow-1dp;
     margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/plus.scss b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/_functions.scss b/app/javascript/styles/mastodon-material-light/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/mastodon-material-light/_mixins.scss
rename to app/javascript/styles/mastodon-material-light/theme/_mixins.scss
diff --git a/app/javascript/styles/mastodon-material-dark/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
similarity index 97%
rename from app/javascript/styles/mastodon-material-dark/account.scss
rename to app/javascript/styles/mastodon-material-light/theme/account.scss
index b43194729..44d68d1e9 100644
--- a/app/javascript/styles/mastodon-material-dark/account.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/account.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .account {
diff --git a/app/javascript/styles/mastodon-material-light/theme/base_config.scss b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/basics.scss b/app/javascript/styles/mastodon-material-light/theme/basics.scss
similarity index 83%
rename from app/javascript/styles/mastodon-material-light/basics.scss
rename to app/javascript/styles/mastodon-material-light/theme/basics.scss
index 5c7c3dc04..4c122d1c6 100644
--- a/app/javascript/styles/mastodon-material-light/basics.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/basics.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 
 
 body { background: $background-color }
diff --git a/app/javascript/styles/material-v1-light/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
similarity index 95%
rename from app/javascript/styles/material-v1-light/button.scss
rename to app/javascript/styles/mastodon-material-light/theme/button.scss
index 38fd1a3c1..1231bac98 100644
--- a/app/javascript/styles/material-v1-light/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .icon-button {
diff --git a/app/javascript/styles/material-v1-dark/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
similarity index 83%
rename from app/javascript/styles/material-v1-dark/columns.scss
rename to app/javascript/styles/mastodon-material-light/theme/columns.scss
index 689028581..a6892adf2 100644
--- a/app/javascript/styles/material-v1-dark/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .column {
@@ -26,7 +28,7 @@
 
     &.active {
         .column-header__icon {
-            color: $secondary-color;
+            color: $top-bar-unread-icon-color;
             text-shadow: none;
         }
     }
@@ -318,27 +320,38 @@
     }
 }
 
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
 
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
+        .fa { margin-right: 8px }
     }
 
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
     }
 }
 
@@ -361,8 +374,12 @@
 
         &__unread { background: $badge-color }
     }
+
+    &__pagination { color: $ui-text-color }
 }
 
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -436,15 +453,9 @@
 }
 
 .notification-favourite .status.status-direct {
-    background: transparent;
-
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
 .relationship-tag {
     color: $ui-text-color;
     background-color: $contained-chip-color;
@@ -454,8 +465,38 @@
     opacity: 1;
 }
 
-.react-swipeable-view-container { height: auto }
-
 .attachment-list__list a { color: $secondary-text-color }
 
-.focusable { background: transparent !important }
\ No newline at end of file
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
similarity index 97%
rename from app/javascript/styles/mastodon-material-dark/components.scss
rename to app/javascript/styles/mastodon-material-light/theme/components.scss
index 92d2801f4..4f844229c 100644
--- a/app/javascript/styles/mastodon-material-dark/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -40,7 +42,10 @@
     &__inner {
         background: $card-background-color;
 
-        &.darker { background: $card-background-color }
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
 
         &__mastodon { background: $card-background-color }
     }
@@ -79,7 +84,7 @@
                 opacity: 1;
             }
             &-times-circle.active {
-                right: 10px;
+                right: 16px;
                 left: unset;
                 transform: none;
             }
diff --git a/app/javascript/styles/mastodon-material-dark/control.scss b/app/javascript/styles/mastodon-material-light/theme/control.scss
similarity index 93%
rename from app/javascript/styles/mastodon-material-dark/control.scss
rename to app/javascript/styles/mastodon-material-light/theme/control.scss
index 7bd251291..a205a4cb7 100644
--- a/app/javascript/styles/mastodon-material-dark/control.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/control.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/material-v1-dark/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
similarity index 93%
rename from app/javascript/styles/material-v1-dark/emoji-picker.scss
rename to app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
index 2c17701cf..70e22752d 100644
--- a/app/javascript/styles/material-v1-dark/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .emoji-picker-dropdown {
@@ -23,7 +25,7 @@
 .emoji-mart {
     width: 388px !important;
     font-size: 14px;
-    color: $ui-text-color;
+    color: $menu-text-color;
 
     &-bar {
         border: 0 solid $border-color;
diff --git a/app/javascript/styles/mastodon-material-dark/icons.scss b/app/javascript/styles/mastodon-material-light/theme/icons.scss
similarity index 78%
rename from app/javascript/styles/mastodon-material-dark/icons.scss
rename to app/javascript/styles/mastodon-material-light/theme/icons.scss
index beca11a6f..1367647ec 100644
--- a/app/javascript/styles/mastodon-material-dark/icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -39,10 +41,4 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
similarity index 90%
rename from app/javascript/styles/mastodon-material-light/material-icons.scss
rename to app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index e473dfe31..51631eab5 100644
--- a/app/javascript/styles/mastodon-material-light/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
 @import 'functions';
 
 
@@ -61,7 +63,8 @@
     &.fa-arrows-alt,
     &.fa-compress,
     &.fa-user-times,
-    &.fa-check {
+    &.fa-check,
+    &.fa-quote-right {
         font-family: "Material Icons";
     }
 }
@@ -85,7 +88,7 @@
     &.fa-sliders::before { content: "tune" }
     &.fa-chevron-left::before { content: "arrow_back" }
     &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
+    &.fa-reply::before { content: $reply-icon }
     &.fa-reply-all::before { content: "reply_all" }
     &.fa-share-alt::before { content: "share" }
     &.fa-star::before { content: $favorite-icon }
@@ -117,6 +120,7 @@
     &.fa-compress::before { content: "fullscreen_exit" }
     &.fa-user-times::before { content: "delete" }
     &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
 }
 
 // bookmark icon
@@ -137,6 +141,12 @@
     }
 }
 
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
 // boost icon
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
diff --git a/app/javascript/styles/mastodon-material-dark/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
similarity index 95%
rename from app/javascript/styles/mastodon-material-dark/media.scss
rename to app/javascript/styles/mastodon-material-light/theme/media.scss
index 64a69a129..28de8db85 100644
--- a/app/javascript/styles/mastodon-material-dark/media.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/media.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/material-v1-dark/mobile.scss b/app/javascript/styles/mastodon-material-light/theme/mobile.scss
similarity index 74%
rename from app/javascript/styles/material-v1-dark/mobile.scss
rename to app/javascript/styles/mastodon-material-light/theme/mobile.scss
index de6f4e94c..ed6467ebc 100644
--- a/app/javascript/styles/material-v1-dark/mobile.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/mobile.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -17,6 +19,11 @@
         }
 
         .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
     }
 
     &__wrapper {
@@ -41,8 +48,11 @@
 }
 
 .columns-area--mobile {
-    
     .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
 
-    .search__input { padding: 16px 38px }
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
similarity index 87%
rename from app/javascript/styles/material-v1-dark/modal.scss
rename to app/javascript/styles/mastodon-material-light/theme/modal.scss
index 7734c8dfa..287dcf804 100644
--- a/app/javascript/styles/material-v1-dark/modal.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/modal.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -64,6 +66,12 @@
     &__container {
         border-top: none;
     }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
 }
 
 .embed-modal .embed-modal__container {
diff --git a/app/javascript/styles/material-v1-dark/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
similarity index 87%
rename from app/javascript/styles/material-v1-dark/statuses.scss
rename to app/javascript/styles/mastodon-material-light/theme/statuses.scss
index f60c2d859..65b5fcc41 100644
--- a/app/javascript/styles/material-v1-dark/statuses.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -10,7 +12,7 @@
     &__expand { width: 70px }
 
     &__info {
-        font-size: 16px;
+        font-size: $name-font-size;
         padding-right: 4px;
     }
 
@@ -28,7 +30,7 @@
     }
 
     &__content {
-        font-size: 16px;
+        font-size: $status-font-size;
         padding-top: 4px;
         color: $primary-text-color;
 
@@ -73,7 +75,12 @@
         }
     }
 
-    &__prepend { color: $secondary-text-color }
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
 
     &.status-direct:not(.read) {
         background: transparent;
@@ -169,4 +176,10 @@
     &__button {
         .icon-button { font-size: 20px !important }
     }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/theme.scss b/app/javascript/styles/mastodon-material-light/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/variables.scss b/app/javascript/styles/mastodon-material-light/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
index 98d8aaf28..e7071bb85 100644
--- a/app/javascript/styles/material-v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'material-v1-dark/account';
-@import 'material-v1-dark/basics';
-@import 'material-v1-dark/button';
-//@import 'material-v1-dark/cards';
-@import 'material-v1-dark/columns';
-@import 'material-v1-dark/components';
-@import 'material-v1-dark/config';
-@import 'material-v1-dark/control';
-@import 'material-v1-dark/emoji-picker';
-@import 'material-v1-dark/icons';
-@import 'material-v1-dark/material-icons';
-@import 'material-v1-dark/media';
-@import 'material-v1-dark/mobile';
-@import 'material-v1-dark/modal';
-@import 'material-v1-dark/statuses';
\ No newline at end of file
+@import 'material-v1-dark/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/_functions.scss b/app/javascript/styles/material-v1-dark/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/material-v1-dark/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/plus-classic.scss b/app/javascript/styles/material-v1-dark/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-dark.scss b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
index a9289ce25..652ffe37e 100644
--- a/app/javascript/styles/material-v1-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-v1-dark/color/v1-dark.scss
@@ -23,14 +23,14 @@ $search-bar-text-color: $inverted-text-color;
 
 // Background-color
 $background-color: #303030;
-$menu-background-color: #1e1e1e;
+$menu-background-color: #424242;
 $menu-background-hover-color: lighten($menu-background-color, 6%);
 $menu-background-active-color: lighten($menu-background-color, 10%);
 $menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
+$card-background-color: #424242;
 $card-background-hover-color: lighten($card-background-color, 6%);
 $card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
+$list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
@@ -88,7 +88,7 @@ $toggle-thumb-active-color: #1a73e8;
 $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
-$border-color: #5f6368;
+$border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
@@ -109,7 +109,7 @@ $tab-indicator-background-hover-color: transparentize($tab-indicator-active-colo
 $tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #1e1e1e;
+$text-tab-background-color: #424242;
 $text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
 $text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
 
diff --git a/app/javascript/styles/material-v1-dark/color/v1-light.scss b/app/javascript/styles/material-v1-dark/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-dark.scss b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v2-light.scss b/app/javascript/styles/material-v1-dark/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/custom_color.scss b/app/javascript/styles/material-v1-dark/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/custom_config.scss b/app/javascript/styles/material-v1-dark/custom_config.scss
new file mode 100644
index 000000000..9b055476b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/custom_config.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/v1-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/custom_layout.scss b/app/javascript/styles/material-v1-dark/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/config.scss b/app/javascript/styles/material-v1-dark/icon_config.scss
similarity index 57%
rename from app/javascript/styles/material-v2-light/config.scss
rename to app/javascript/styles/material-v1-dark/icon_config.scss
index f53c47791..3274efde8 100644
--- a/app/javascript/styles/material-v2-light/config.scss
+++ b/app/javascript/styles/material-v1-dark/icon_config.scss
@@ -1,12 +1,17 @@
-@charset "UTF-8";
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
 
 
-// Color scheme
-@import 'color/v2-light';
-
-
-// Layout profile
-@import 'layout/material-v2';
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
 
 
 // Material Design Icon settings
@@ -15,25 +20,7 @@
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v1.scss b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
index 92f369245..825deaf8c 100644
--- a/app/javascript/styles/material-v1-dark/layout/material-v1.scss
+++ b/app/javascript/styles/material-v1-dark/layout/material-v1.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v2.scss b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
new file mode 100644
index 000000000..6c81dc3e4
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/loader.scss b/app/javascript/styles/material-v1-dark/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/cards.scss b/app/javascript/styles/material-v1-dark/plugins/cards.scss
similarity index 56%
rename from app/javascript/styles/material-v1-dark/cards.scss
rename to app/javascript/styles/material-v1-dark/plugins/cards.scss
index 96988f2c9..c134cbeeb 100644
--- a/app/javascript/styles/material-v1-dark/cards.scss
+++ b/app/javascript/styles/material-v1-dark/plugins/cards.scss
@@ -1,17 +1,24 @@
 @charset "UTF-8";
-@import 'config';
-@import 'mixins';
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
 
 
 .column {
     box-shadow: none !important;
     margin: 2px 0 !important;
     padding: 8px !important;
+
+    > .scrollable { background: $background-color }
 }
 
 .status {
-    border-bottom: 0 !important;
+    border-bottom: 0;
     border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
 }
 
 .account { border-bottom: 0 !important }
@@ -20,6 +27,8 @@
 .notification.notification {
     @include shadow-1dp;
     margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/material-v1-dark/plugins/dense.scss b/app/javascript/styles/material-v1-dark/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/plugins/plus.scss b/app/javascript/styles/material-v1-dark/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/_functions.scss b/app/javascript/styles/material-v1-dark/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/_mixins.scss b/app/javascript/styles/material-v1-dark/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/_mixins.scss
rename to app/javascript/styles/material-v1-dark/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v1-light/account.scss b/app/javascript/styles/material-v1-dark/theme/account.scss
similarity index 97%
rename from app/javascript/styles/material-v1-light/account.scss
rename to app/javascript/styles/material-v1-dark/theme/account.scss
index b43194729..44d68d1e9 100644
--- a/app/javascript/styles/material-v1-light/account.scss
+++ b/app/javascript/styles/material-v1-dark/theme/account.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .account {
diff --git a/app/javascript/styles/material-v1-dark/theme/base_config.scss b/app/javascript/styles/material-v1-dark/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/basics.scss b/app/javascript/styles/material-v1-dark/theme/basics.scss
similarity index 83%
rename from app/javascript/styles/mastodon-material-dark/basics.scss
rename to app/javascript/styles/material-v1-dark/theme/basics.scss
index 5c7c3dc04..4c122d1c6 100644
--- a/app/javascript/styles/mastodon-material-dark/basics.scss
+++ b/app/javascript/styles/material-v1-dark/theme/basics.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 
 
 body { background: $background-color }
diff --git a/app/javascript/styles/mastodon-material-light/button.scss b/app/javascript/styles/material-v1-dark/theme/button.scss
similarity index 95%
rename from app/javascript/styles/mastodon-material-light/button.scss
rename to app/javascript/styles/material-v1-dark/theme/button.scss
index 38fd1a3c1..1231bac98 100644
--- a/app/javascript/styles/mastodon-material-light/button.scss
+++ b/app/javascript/styles/material-v1-dark/theme/button.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .icon-button {
diff --git a/app/javascript/styles/mastodon-material-light/columns.scss b/app/javascript/styles/material-v1-dark/theme/columns.scss
similarity index 83%
rename from app/javascript/styles/mastodon-material-light/columns.scss
rename to app/javascript/styles/material-v1-dark/theme/columns.scss
index 689028581..a6892adf2 100644
--- a/app/javascript/styles/mastodon-material-light/columns.scss
+++ b/app/javascript/styles/material-v1-dark/theme/columns.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .column {
@@ -26,7 +28,7 @@
 
     &.active {
         .column-header__icon {
-            color: $secondary-color;
+            color: $top-bar-unread-icon-color;
             text-shadow: none;
         }
     }
@@ -318,27 +320,38 @@
     }
 }
 
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
 
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
+        .fa { margin-right: 8px }
     }
 
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
     }
 }
 
@@ -361,8 +374,12 @@
 
         &__unread { background: $badge-color }
     }
+
+    &__pagination { color: $ui-text-color }
 }
 
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -436,15 +453,9 @@
 }
 
 .notification-favourite .status.status-direct {
-    background: transparent;
-
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
 .relationship-tag {
     color: $ui-text-color;
     background-color: $contained-chip-color;
@@ -454,8 +465,38 @@
     opacity: 1;
 }
 
-.react-swipeable-view-container { height: auto }
-
 .attachment-list__list a { color: $secondary-text-color }
 
-.focusable { background: transparent !important }
\ No newline at end of file
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/components.scss b/app/javascript/styles/material-v1-dark/theme/components.scss
similarity index 97%
rename from app/javascript/styles/mastodon-material-light/components.scss
rename to app/javascript/styles/material-v1-dark/theme/components.scss
index 92d2801f4..4f844229c 100644
--- a/app/javascript/styles/mastodon-material-light/components.scss
+++ b/app/javascript/styles/material-v1-dark/theme/components.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -40,7 +42,10 @@
     &__inner {
         background: $card-background-color;
 
-        &.darker { background: $card-background-color }
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
 
         &__mastodon { background: $card-background-color }
     }
@@ -79,7 +84,7 @@
                 opacity: 1;
             }
             &-times-circle.active {
-                right: 10px;
+                right: 16px;
                 left: unset;
                 transform: none;
             }
diff --git a/app/javascript/styles/material-v1-light/control.scss b/app/javascript/styles/material-v1-dark/theme/control.scss
similarity index 93%
rename from app/javascript/styles/material-v1-light/control.scss
rename to app/javascript/styles/material-v1-dark/theme/control.scss
index 7bd251291..a205a4cb7 100644
--- a/app/javascript/styles/material-v1-light/control.scss
+++ b/app/javascript/styles/material-v1-dark/theme/control.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/mastodon-material-light/emoji-picker.scss b/app/javascript/styles/material-v1-dark/theme/emoji-picker.scss
similarity index 93%
rename from app/javascript/styles/mastodon-material-light/emoji-picker.scss
rename to app/javascript/styles/material-v1-dark/theme/emoji-picker.scss
index 2c17701cf..70e22752d 100644
--- a/app/javascript/styles/mastodon-material-light/emoji-picker.scss
+++ b/app/javascript/styles/material-v1-dark/theme/emoji-picker.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .emoji-picker-dropdown {
@@ -23,7 +25,7 @@
 .emoji-mart {
     width: 388px !important;
     font-size: 14px;
-    color: $ui-text-color;
+    color: $menu-text-color;
 
     &-bar {
         border: 0 solid $border-color;
diff --git a/app/javascript/styles/material-v1-dark/icons.scss b/app/javascript/styles/material-v1-dark/theme/icons.scss
similarity index 78%
rename from app/javascript/styles/material-v1-dark/icons.scss
rename to app/javascript/styles/material-v1-dark/theme/icons.scss
index beca11a6f..1367647ec 100644
--- a/app/javascript/styles/material-v1-dark/icons.scss
+++ b/app/javascript/styles/material-v1-dark/theme/icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -39,10 +41,4 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/material-icons.scss b/app/javascript/styles/material-v1-dark/theme/material-icons.scss
similarity index 90%
rename from app/javascript/styles/material-v1-light/material-icons.scss
rename to app/javascript/styles/material-v1-dark/theme/material-icons.scss
index e473dfe31..51631eab5 100644
--- a/app/javascript/styles/material-v1-light/material-icons.scss
+++ b/app/javascript/styles/material-v1-dark/theme/material-icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
 @import 'functions';
 
 
@@ -61,7 +63,8 @@
     &.fa-arrows-alt,
     &.fa-compress,
     &.fa-user-times,
-    &.fa-check {
+    &.fa-check,
+    &.fa-quote-right {
         font-family: "Material Icons";
     }
 }
@@ -85,7 +88,7 @@
     &.fa-sliders::before { content: "tune" }
     &.fa-chevron-left::before { content: "arrow_back" }
     &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
+    &.fa-reply::before { content: $reply-icon }
     &.fa-reply-all::before { content: "reply_all" }
     &.fa-share-alt::before { content: "share" }
     &.fa-star::before { content: $favorite-icon }
@@ -117,6 +120,7 @@
     &.fa-compress::before { content: "fullscreen_exit" }
     &.fa-user-times::before { content: "delete" }
     &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
 }
 
 // bookmark icon
@@ -137,6 +141,12 @@
     }
 }
 
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
 // boost icon
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
diff --git a/app/javascript/styles/material-v1-dark/media.scss b/app/javascript/styles/material-v1-dark/theme/media.scss
similarity index 95%
rename from app/javascript/styles/material-v1-dark/media.scss
rename to app/javascript/styles/material-v1-dark/theme/media.scss
index 64a69a129..28de8db85 100644
--- a/app/javascript/styles/material-v1-dark/media.scss
+++ b/app/javascript/styles/material-v1-dark/theme/media.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/mastodon-material-dark/mobile.scss b/app/javascript/styles/material-v1-dark/theme/mobile.scss
similarity index 74%
rename from app/javascript/styles/mastodon-material-dark/mobile.scss
rename to app/javascript/styles/material-v1-dark/theme/mobile.scss
index de6f4e94c..ed6467ebc 100644
--- a/app/javascript/styles/mastodon-material-dark/mobile.scss
+++ b/app/javascript/styles/material-v1-dark/theme/mobile.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -17,6 +19,11 @@
         }
 
         .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
     }
 
     &__wrapper {
@@ -41,8 +48,11 @@
 }
 
 .columns-area--mobile {
-    
     .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
 
-    .search__input { padding: 16px 38px }
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/modal.scss b/app/javascript/styles/material-v1-dark/theme/modal.scss
similarity index 87%
rename from app/javascript/styles/material-v1-light/modal.scss
rename to app/javascript/styles/material-v1-dark/theme/modal.scss
index 7734c8dfa..287dcf804 100644
--- a/app/javascript/styles/material-v1-light/modal.scss
+++ b/app/javascript/styles/material-v1-dark/theme/modal.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -64,6 +66,12 @@
     &__container {
         border-top: none;
     }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
 }
 
 .embed-modal .embed-modal__container {
diff --git a/app/javascript/styles/mastodon-material-light/statuses.scss b/app/javascript/styles/material-v1-dark/theme/statuses.scss
similarity index 87%
rename from app/javascript/styles/mastodon-material-light/statuses.scss
rename to app/javascript/styles/material-v1-dark/theme/statuses.scss
index f60c2d859..65b5fcc41 100644
--- a/app/javascript/styles/mastodon-material-light/statuses.scss
+++ b/app/javascript/styles/material-v1-dark/theme/statuses.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -10,7 +12,7 @@
     &__expand { width: 70px }
 
     &__info {
-        font-size: 16px;
+        font-size: $name-font-size;
         padding-right: 4px;
     }
 
@@ -28,7 +30,7 @@
     }
 
     &__content {
-        font-size: 16px;
+        font-size: $status-font-size;
         padding-top: 4px;
         color: $primary-text-color;
 
@@ -73,7 +75,12 @@
         }
     }
 
-    &__prepend { color: $secondary-text-color }
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
 
     &.status-direct:not(.read) {
         background: transparent;
@@ -169,4 +176,10 @@
     &__button {
         .icon-button { font-size: 20px !important }
     }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/theme.scss b/app/javascript/styles/material-v1-dark/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/variables.scss b/app/javascript/styles/material-v1-dark/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/material-v1-dark/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
index 8668288e4..b56b4408a 100644
--- a/app/javascript/styles/material-v1-light.scss
+++ b/app/javascript/styles/material-v1-light.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'material-v1-light/account';
-@import 'material-v1-light/basics';
-@import 'material-v1-light/button';
-//@import 'material-v1-light/cards';
-@import 'material-v1-light/columns';
-@import 'material-v1-light/components';
-@import 'material-v1-light/config';
-@import 'material-v1-light/control';
-@import 'material-v1-light/emoji-picker';
-@import 'material-v1-light/icons';
-@import 'material-v1-light/material-icons';
-@import 'material-v1-light/media';
-@import 'material-v1-light/mobile';
-@import 'material-v1-light/modal';
-@import 'material-v1-light/statuses';
\ No newline at end of file
+@import 'material-v1-light/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/_functions.scss b/app/javascript/styles/material-v1-light/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/material-v1-light/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-light.scss b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/plus-classic.scss b/app/javascript/styles/material-v1-light/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-dark.scss b/app/javascript/styles/material-v1-light/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v1-light.scss b/app/javascript/styles/material-v1-light/color/v1-light.scss
index e672b5640..4000eead0 100644
--- a/app/javascript/styles/material-v1-light/color/v1-light.scss
+++ b/app/javascript/styles/material-v1-light/color/v1-light.scss
@@ -57,6 +57,7 @@ $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
diff --git a/app/javascript/styles/material-v1-light/color/v2-dark.scss b/app/javascript/styles/material-v1-light/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-light.scss b/app/javascript/styles/material-v1-light/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/custom_color.scss b/app/javascript/styles/material-v1-light/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/custom_config.scss b/app/javascript/styles/material-v1-light/custom_config.scss
new file mode 100644
index 000000000..43b6488b6
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/custom_config.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your settings below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/custom_layout.scss b/app/javascript/styles/material-v1-light/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/config.scss b/app/javascript/styles/material-v1-light/icon_config.scss
similarity index 57%
rename from app/javascript/styles/material-v1-light/config.scss
rename to app/javascript/styles/material-v1-light/icon_config.scss
index 294c254c3..3274efde8 100644
--- a/app/javascript/styles/material-v1-light/config.scss
+++ b/app/javascript/styles/material-v1-light/icon_config.scss
@@ -1,12 +1,17 @@
-@charset "UTF-8";
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
 
 
-// Color scheme
-@import 'color/v1-light';
-
-
-// Layout profile
-@import 'layout/material-v1';
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
 
 
 // Material Design Icon settings
@@ -15,25 +20,7 @@
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
\ No newline at end of file
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/layout/material-v1.scss b/app/javascript/styles/material-v1-light/layout/material-v1.scss
index 92f369245..825deaf8c 100644
--- a/app/javascript/styles/material-v1-light/layout/material-v1.scss
+++ b/app/javascript/styles/material-v1-light/layout/material-v1.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/material-v1-light/layout/material-v2.scss b/app/javascript/styles/material-v1-light/layout/material-v2.scss
new file mode 100644
index 000000000..6c81dc3e4
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/loader.scss b/app/javascript/styles/material-v1-light/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/cards.scss b/app/javascript/styles/material-v1-light/plugins/cards.scss
similarity index 56%
rename from app/javascript/styles/material-v1-light/cards.scss
rename to app/javascript/styles/material-v1-light/plugins/cards.scss
index 96988f2c9..c134cbeeb 100644
--- a/app/javascript/styles/material-v1-light/cards.scss
+++ b/app/javascript/styles/material-v1-light/plugins/cards.scss
@@ -1,17 +1,24 @@
 @charset "UTF-8";
-@import 'config';
-@import 'mixins';
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
 
 
 .column {
     box-shadow: none !important;
     margin: 2px 0 !important;
     padding: 8px !important;
+
+    > .scrollable { background: $background-color }
 }
 
 .status {
-    border-bottom: 0 !important;
+    border-bottom: 0;
     border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
 }
 
 .account { border-bottom: 0 !important }
@@ -20,6 +27,8 @@
 .notification.notification {
     @include shadow-1dp;
     margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/material-v1-light/plugins/dense.scss b/app/javascript/styles/material-v1-light/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/plugins/plus.scss b/app/javascript/styles/material-v1-light/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/_functions.scss b/app/javascript/styles/material-v1-light/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/_mixins.scss b/app/javascript/styles/material-v1-light/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/_mixins.scss
rename to app/javascript/styles/material-v1-light/theme/_mixins.scss
diff --git a/app/javascript/styles/mastodon-material-light/account.scss b/app/javascript/styles/material-v1-light/theme/account.scss
similarity index 97%
rename from app/javascript/styles/mastodon-material-light/account.scss
rename to app/javascript/styles/material-v1-light/theme/account.scss
index b43194729..44d68d1e9 100644
--- a/app/javascript/styles/mastodon-material-light/account.scss
+++ b/app/javascript/styles/material-v1-light/theme/account.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .account {
diff --git a/app/javascript/styles/material-v1-light/theme/base_config.scss b/app/javascript/styles/material-v1-light/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/basics.scss b/app/javascript/styles/material-v1-light/theme/basics.scss
similarity index 83%
rename from app/javascript/styles/material-v1-light/basics.scss
rename to app/javascript/styles/material-v1-light/theme/basics.scss
index 5c7c3dc04..4c122d1c6 100644
--- a/app/javascript/styles/material-v1-light/basics.scss
+++ b/app/javascript/styles/material-v1-light/theme/basics.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 
 
 body { background: $background-color }
diff --git a/app/javascript/styles/mastodon-material-dark/button.scss b/app/javascript/styles/material-v1-light/theme/button.scss
similarity index 95%
rename from app/javascript/styles/mastodon-material-dark/button.scss
rename to app/javascript/styles/material-v1-light/theme/button.scss
index 38fd1a3c1..1231bac98 100644
--- a/app/javascript/styles/mastodon-material-dark/button.scss
+++ b/app/javascript/styles/material-v1-light/theme/button.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .icon-button {
diff --git a/app/javascript/styles/material-v1-light/columns.scss b/app/javascript/styles/material-v1-light/theme/columns.scss
similarity index 83%
rename from app/javascript/styles/material-v1-light/columns.scss
rename to app/javascript/styles/material-v1-light/theme/columns.scss
index 689028581..a6892adf2 100644
--- a/app/javascript/styles/material-v1-light/columns.scss
+++ b/app/javascript/styles/material-v1-light/theme/columns.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .column {
@@ -26,7 +28,7 @@
 
     &.active {
         .column-header__icon {
-            color: $secondary-color;
+            color: $top-bar-unread-icon-color;
             text-shadow: none;
         }
     }
@@ -318,27 +320,38 @@
     }
 }
 
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
 
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
+        .fa { margin-right: 8px }
     }
 
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
     }
 }
 
@@ -361,8 +374,12 @@
 
         &__unread { background: $badge-color }
     }
+
+    &__pagination { color: $ui-text-color }
 }
 
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -436,15 +453,9 @@
 }
 
 .notification-favourite .status.status-direct {
-    background: transparent;
-
     .icon-button.disabled { color: $disabled-icon-color }
 }
 
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
 .relationship-tag {
     color: $ui-text-color;
     background-color: $contained-chip-color;
@@ -454,8 +465,38 @@
     opacity: 1;
 }
 
-.react-swipeable-view-container { height: auto }
-
 .attachment-list__list a { color: $secondary-text-color }
 
-.focusable { background: transparent !important }
\ No newline at end of file
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/components.scss b/app/javascript/styles/material-v1-light/theme/components.scss
similarity index 97%
rename from app/javascript/styles/material-v1-light/components.scss
rename to app/javascript/styles/material-v1-light/theme/components.scss
index 92d2801f4..4f844229c 100644
--- a/app/javascript/styles/material-v1-light/components.scss
+++ b/app/javascript/styles/material-v1-light/theme/components.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -40,7 +42,10 @@
     &__inner {
         background: $card-background-color;
 
-        &.darker { background: $card-background-color }
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
 
         &__mastodon { background: $card-background-color }
     }
@@ -79,7 +84,7 @@
                 opacity: 1;
             }
             &-times-circle.active {
-                right: 10px;
+                right: 16px;
                 left: unset;
                 transform: none;
             }
diff --git a/app/javascript/styles/mastodon-material-light/control.scss b/app/javascript/styles/material-v1-light/theme/control.scss
similarity index 93%
rename from app/javascript/styles/mastodon-material-light/control.scss
rename to app/javascript/styles/material-v1-light/theme/control.scss
index 7bd251291..a205a4cb7 100644
--- a/app/javascript/styles/mastodon-material-light/control.scss
+++ b/app/javascript/styles/material-v1-light/theme/control.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/material-v1-light/emoji-picker.scss b/app/javascript/styles/material-v1-light/theme/emoji-picker.scss
similarity index 93%
rename from app/javascript/styles/material-v1-light/emoji-picker.scss
rename to app/javascript/styles/material-v1-light/theme/emoji-picker.scss
index 2c17701cf..70e22752d 100644
--- a/app/javascript/styles/material-v1-light/emoji-picker.scss
+++ b/app/javascript/styles/material-v1-light/theme/emoji-picker.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 .emoji-picker-dropdown {
@@ -23,7 +25,7 @@
 .emoji-mart {
     width: 388px !important;
     font-size: 14px;
-    color: $ui-text-color;
+    color: $menu-text-color;
 
     &-bar {
         border: 0 solid $border-color;
diff --git a/app/javascript/styles/material-v1-light/icons.scss b/app/javascript/styles/material-v1-light/theme/icons.scss
similarity index 78%
rename from app/javascript/styles/material-v1-light/icons.scss
rename to app/javascript/styles/material-v1-light/theme/icons.scss
index beca11a6f..1367647ec 100644
--- a/app/javascript/styles/material-v1-light/icons.scss
+++ b/app/javascript/styles/material-v1-light/theme/icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -39,10 +41,4 @@
     border: none;
     padding: 2px 6px;
     border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/material-icons.scss b/app/javascript/styles/material-v1-light/theme/material-icons.scss
similarity index 90%
rename from app/javascript/styles/mastodon-material-dark/material-icons.scss
rename to app/javascript/styles/material-v1-light/theme/material-icons.scss
index e473dfe31..51631eab5 100644
--- a/app/javascript/styles/mastodon-material-dark/material-icons.scss
+++ b/app/javascript/styles/material-v1-light/theme/material-icons.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
 @import 'functions';
 
 
@@ -61,7 +63,8 @@
     &.fa-arrows-alt,
     &.fa-compress,
     &.fa-user-times,
-    &.fa-check {
+    &.fa-check,
+    &.fa-quote-right {
         font-family: "Material Icons";
     }
 }
@@ -85,7 +88,7 @@
     &.fa-sliders::before { content: "tune" }
     &.fa-chevron-left::before { content: "arrow_back" }
     &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
+    &.fa-reply::before { content: $reply-icon }
     &.fa-reply-all::before { content: "reply_all" }
     &.fa-share-alt::before { content: "share" }
     &.fa-star::before { content: $favorite-icon }
@@ -117,6 +120,7 @@
     &.fa-compress::before { content: "fullscreen_exit" }
     &.fa-user-times::before { content: "delete" }
     &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
 }
 
 // bookmark icon
@@ -137,6 +141,12 @@
     }
 }
 
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
 // boost icon
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
diff --git a/app/javascript/styles/material-v1-light/media.scss b/app/javascript/styles/material-v1-light/theme/media.scss
similarity index 95%
rename from app/javascript/styles/material-v1-light/media.scss
rename to app/javascript/styles/material-v1-light/theme/media.scss
index 64a69a129..28de8db85 100644
--- a/app/javascript/styles/material-v1-light/media.scss
+++ b/app/javascript/styles/material-v1-light/theme/media.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
diff --git a/app/javascript/styles/material-v1-light/mobile.scss b/app/javascript/styles/material-v1-light/theme/mobile.scss
similarity index 74%
rename from app/javascript/styles/material-v1-light/mobile.scss
rename to app/javascript/styles/material-v1-light/theme/mobile.scss
index de6f4e94c..ed6467ebc 100644
--- a/app/javascript/styles/material-v1-light/mobile.scss
+++ b/app/javascript/styles/material-v1-light/theme/mobile.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -17,6 +19,11 @@
         }
 
         .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
     }
 
     &__wrapper {
@@ -41,8 +48,11 @@
 }
 
 .columns-area--mobile {
-    
     .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
 
-    .search__input { padding: 16px 38px }
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/modal.scss b/app/javascript/styles/material-v1-light/theme/modal.scss
similarity index 87%
rename from app/javascript/styles/mastodon-material-dark/modal.scss
rename to app/javascript/styles/material-v1-light/theme/modal.scss
index 7734c8dfa..287dcf804 100644
--- a/app/javascript/styles/mastodon-material-dark/modal.scss
+++ b/app/javascript/styles/material-v1-light/theme/modal.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -64,6 +66,12 @@
     &__container {
         border-top: none;
     }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
 }
 
 .embed-modal .embed-modal__container {
diff --git a/app/javascript/styles/material-v1-light/statuses.scss b/app/javascript/styles/material-v1-light/theme/statuses.scss
similarity index 87%
rename from app/javascript/styles/material-v1-light/statuses.scss
rename to app/javascript/styles/material-v1-light/theme/statuses.scss
index f60c2d859..65b5fcc41 100644
--- a/app/javascript/styles/material-v1-light/statuses.scss
+++ b/app/javascript/styles/material-v1-light/theme/statuses.scss
@@ -1,5 +1,7 @@
 @charset "UTF-8";
-@import 'config';
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
 @import 'mixins';
 
 
@@ -10,7 +12,7 @@
     &__expand { width: 70px }
 
     &__info {
-        font-size: 16px;
+        font-size: $name-font-size;
         padding-right: 4px;
     }
 
@@ -28,7 +30,7 @@
     }
 
     &__content {
-        font-size: 16px;
+        font-size: $status-font-size;
         padding-top: 4px;
         color: $primary-text-color;
 
@@ -73,7 +75,12 @@
         }
     }
 
-    &__prepend { color: $secondary-text-color }
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
 
     &.status-direct:not(.read) {
         background: transparent;
@@ -169,4 +176,10 @@
     &__button {
         .icon-button { font-size: 20px !important }
     }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/theme.scss b/app/javascript/styles/material-v1-light/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/variables.scss b/app/javascript/styles/material-v1-light/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/material-v1-light/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
index 351cf8a73..6a342731c 100644
--- a/app/javascript/styles/material-v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'material-v2-dark/account';
-@import 'material-v2-dark/basics';
-@import 'material-v2-dark/button';
-//@import 'material-v2-dark/cards';
-@import 'material-v2-dark/columns';
-@import 'material-v2-dark/components';
-@import 'material-v2-dark/config';
-@import 'material-v2-dark/control';
-@import 'material-v2-dark/emoji-picker';
-@import 'material-v2-dark/icons';
-@import 'material-v2-dark/material-icons';
-@import 'material-v2-dark/media';
-@import 'material-v2-dark/mobile';
-@import 'material-v2-dark/modal';
-@import 'material-v2-dark/statuses';
\ No newline at end of file
+@import 'material-v2-dark/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/_functions.scss b/app/javascript/styles/material-v2-dark/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/material-v2-dark/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/account.scss b/app/javascript/styles/material-v2-dark/account.scss
deleted file mode 100644
index b43194729..000000000
--- a/app/javascript/styles/material-v2-dark/account.scss
+++ /dev/null
@@ -1,143 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: 50%;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $text-tab-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/basics.scss b/app/javascript/styles/material-v2-dark/basics.scss
deleted file mode 100644
index 5c7c3dc04..000000000
--- a/app/javascript/styles/material-v2-dark/basics.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-body { background: $background-color }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/button.scss b/app/javascript/styles/material-v2-dark/button.scss
deleted file mode 100644
index 38fd1a3c1..000000000
--- a/app/javascript/styles/material-v2-dark/button.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &.overlayed {
-        border-radius: 50%;
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-    
-        &:hover {
-            background: $media-icon-background-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
-
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-background-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/cards.scss b/app/javascript/styles/material-v2-dark/cards.scss
deleted file mode 100644
index 96988f2c9..000000000
--- a/app/javascript/styles/material-v2-dark/cards.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-}
-
-.status {
-    border-bottom: 0 !important;
-    border-radius: $card-radius;
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/plus-classic.scss b/app/javascript/styles/material-v2-dark/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-dark.scss b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v1-light.scss b/app/javascript/styles/material-v2-dark/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/v2-dark.scss b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
index 3c0de2770..c990d6b1e 100644
--- a/app/javascript/styles/material-v2-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-v2-dark/color/v2-dark.scss
@@ -57,6 +57,7 @@ $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
@@ -88,7 +89,7 @@ $toggle-thumb-active-color: #1a73e8;
 $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
-$border-color: #5f6368;
+$border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
diff --git a/app/javascript/styles/material-v2-dark/color/v2-light.scss b/app/javascript/styles/material-v2-dark/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/columns.scss b/app/javascript/styles/material-v2-dark/columns.scss
deleted file mode 100644
index 689028581..000000000
--- a/app/javascript/styles/material-v2-dark/columns.scss
+++ /dev/null
@@ -1,461 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $secondary-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-background-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-background-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-background-hover-color }
-
-    &:active,
-    &:focus { background: $list-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-background-active-color;
-
-            &:hover { background: $menu-background-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $background-color;
-        margin-bottom: 0;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
-
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
-    }
-
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-}
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-background-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-    
-        button {
-            background: $tab-background-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    background: transparent;
-
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.react-swipeable-view-container { height: auto }
-
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/components.scss b/app/javascript/styles/material-v2-dark/components.scss
deleted file mode 100644
index 92d2801f4..000000000
--- a/app/javascript/styles/material-v2-dark/components.scss
+++ /dev/null
@@ -1,389 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-background-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-background-color;
-
-        &.darker { background: $card-background-color }
-
-        &__mastodon { background: $card-background-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 10px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-background-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $card-background-color;
-            color: $ui-text-color;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-background-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-background-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-background-active-color }
-            }
-        }
-    }
-
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
-
-
-.poll {
-    &__input {
-        border: 2px solid $control-border-color;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $background-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-active-color }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $poll-bar-color;
-    
-        &.leading { background: $poll-bar-leading-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/control.scss b/app/javascript/styles/material-v2-dark/control.scss
deleted file mode 100644
index 7bd251291..000000000
--- a/app/javascript/styles/material-v2-dark/control.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/custom_color.scss b/app/javascript/styles/material-v2-dark/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/custom_config.scss b/app/javascript/styles/material-v2-dark/custom_config.scss
new file mode 100644
index 000000000..c0e23398a
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/custom_config.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/v2-dark';
+
+@import 'layout/material-v2';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/custom_layout.scss b/app/javascript/styles/material-v2-dark/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/emoji-picker.scss b/app/javascript/styles/material-v2-dark/emoji-picker.scss
deleted file mode 100644
index 2c17701cf..000000000
--- a/app/javascript/styles/material-v2-dark/emoji-picker.scss
+++ /dev/null
@@ -1,90 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $ui-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icon_config.scss b/app/javascript/styles/material-v2-dark/icon_config.scss
new file mode 100644
index 000000000..3274efde8
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/icon_config.scss
@@ -0,0 +1,26 @@
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
+
+
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icons.scss b/app/javascript/styles/material-v2-dark/icons.scss
deleted file mode 100644
index beca11a6f..000000000
--- a/app/javascript/styles/material-v2-dark/icons.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v1.scss b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
new file mode 100644
index 000000000..825deaf8c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v2.scss b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
index 86d2c496f..6c81dc3e4 100644
--- a/app/javascript/styles/material-v2-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-v2-dark/layout/material-v2.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/material-v2-dark/loader.scss b/app/javascript/styles/material-v2-dark/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/material-icons.scss b/app/javascript/styles/material-v2-dark/material-icons.scss
deleted file mode 100644
index e473dfe31..000000000
--- a/app/javascript/styles/material-v2-dark/material-icons.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'functions';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
-    &.fa-check::before { content: "check" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
-    height: 18px;
-    width: 18px;
-    transition: background-position .3s steps(1);
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/media.scss b/app/javascript/styles/material-v2-dark/media.scss
deleted file mode 100644
index 64a69a129..000000000
--- a/app/javascript/styles/material-v2-dark/media.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.media-modal__close {
-    align-content: center;
-
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        text-align: center !important;
-        font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
-
-        &:hover {
-            background: $media-icon-background-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw { width: 24px }
-    }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/mobile.scss b/app/javascript/styles/material-v2-dark/mobile.scss
deleted file mode 100644
index de6f4e94c..000000000
--- a/app/javascript/styles/material-v2-dark/mobile.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    
-    .column { margin: 0 !important }
-
-    .search__input { padding: 16px 38px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/modal.scss b/app/javascript/styles/material-v2-dark/modal.scss
deleted file mode 100644
index 7734c8dfa..000000000
--- a/app/javascript/styles/material-v2-dark/modal.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.confirmation-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-    width: 280px;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-background-color;
-        padding: 8px;
-    }
-}
-
-.actions-modal {
-    background: $card-background-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-background-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/plugins/cards.scss b/app/javascript/styles/material-v2-dark/plugins/cards.scss
new file mode 100644
index 000000000..c134cbeeb
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/plugins/cards.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+
+    > .scrollable { background: $background-color }
+}
+
+.status {
+    border-bottom: 0;
+    border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/plugins/dense.scss b/app/javascript/styles/material-v2-dark/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/plugins/plus.scss b/app/javascript/styles/material-v2-dark/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/statuses.scss b/app/javascript/styles/material-v2-dark/statuses.scss
deleted file mode 100644
index f60c2d859..000000000
--- a/app/javascript/styles/material-v2-dark/statuses.scss
+++ /dev/null
@@ -1,172 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: 16px;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: 16px;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &__prepend { color: $secondary-text-color }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-background-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/_functions.scss b/app/javascript/styles/material-v2-dark/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/_mixins.scss b/app/javascript/styles/material-v2-dark/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/_mixins.scss
rename to app/javascript/styles/material-v2-dark/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/account.scss b/app/javascript/styles/material-v2-dark/theme/account.scss
new file mode 100644
index 000000000..44d68d1e9
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/account.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name { color: $primary-text-color }
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $text-tab-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/base_config.scss b/app/javascript/styles/material-v2-dark/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/basics.scss b/app/javascript/styles/material-v2-dark/theme/basics.scss
new file mode 100644
index 000000000..4c122d1c6
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/basics.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/button.scss b/app/javascript/styles/material-v2-dark/theme/button.scss
new file mode 100644
index 000000000..1231bac98
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/button.scss
@@ -0,0 +1,97 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/columns.scss b/app/javascript/styles/material-v2-dark/theme/columns.scss
new file mode 100644
index 000000000..a6892adf2
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/columns.scss
@@ -0,0 +1,502 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $top-bar-unread-icon-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-background-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+
+    &__pagination { color: $ui-text-color }
+}
+
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-background-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $tab-background-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/components.scss b/app/javascript/styles/material-v2-dark/theme/components.scss
new file mode 100644
index 000000000..4f844229c
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/components.scss
@@ -0,0 +1,394 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 16px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
+}
+
+
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/control.scss b/app/javascript/styles/material-v2-dark/theme/control.scss
new file mode 100644
index 000000000..a205a4cb7
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/control.scss
@@ -0,0 +1,71 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/emoji-picker.scss b/app/javascript/styles/material-v2-dark/theme/emoji-picker.scss
new file mode 100644
index 000000000..70e22752d
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/emoji-picker.scss
@@ -0,0 +1,92 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $menu-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-active-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover::before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/icons.scss b/app/javascript/styles/material-v2-dark/theme/icons.scss
new file mode 100644
index 000000000..1367647ec
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/icons.scss
@@ -0,0 +1,44 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
+
+.fa.fa-times,
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/material-icons.scss b/app/javascript/styles/material-v2-dark/theme/material-icons.scss
new file mode 100644
index 000000000..51631eab5
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/material-icons.scss
@@ -0,0 +1,156 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
+@import 'functions';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check,
+    &.fa-quote-right {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: $reply-icon }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/media.scss b/app/javascript/styles/material-v2-dark/theme/media.scss
new file mode 100644
index 000000000..28de8db85
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/media.scss
@@ -0,0 +1,101 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/mobile.scss b/app/javascript/styles/material-v2-dark/theme/mobile.scss
new file mode 100644
index 000000000..ed6467ebc
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/mobile.scss
@@ -0,0 +1,58 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/modal.scss b/app/javascript/styles/material-v2-dark/theme/modal.scss
new file mode 100644
index 000000000..287dcf804
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/modal.scss
@@ -0,0 +1,84 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/statuses.scss b/app/javascript/styles/material-v2-dark/theme/statuses.scss
new file mode 100644
index 000000000..65b5fcc41
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/statuses.scss
@@ -0,0 +1,185 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: $name-font-size;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: $status-font-size;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/theme.scss b/app/javascript/styles/material-v2-dark/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/variables.scss b/app/javascript/styles/material-v2-dark/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/material-v2-dark/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
index 3c7ccb250..e8875d39d 100644
--- a/app/javascript/styles/material-v2-light.scss
+++ b/app/javascript/styles/material-v2-light.scss
@@ -1,18 +1,3 @@
 @charset "UTF-8";
 
-@import 'application';
-@import 'material-v2-light/account';
-@import 'material-v2-light/basics';
-@import 'material-v2-light/button';
-//@import 'material-v2-light/cards';
-@import 'material-v2-light/columns';
-@import 'material-v2-light/components';
-@import 'material-v2-light/config';
-@import 'material-v2-light/control';
-@import 'material-v2-light/emoji-picker';
-@import 'material-v2-light/icons';
-@import 'material-v2-light/material-icons';
-@import 'material-v2-light/media';
-@import 'material-v2-light/mobile';
-@import 'material-v2-light/modal';
-@import 'material-v2-light/statuses';
\ No newline at end of file
+@import 'material-v2-light/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/_functions.scss b/app/javascript/styles/material-v2-light/_functions.scss
deleted file mode 100644
index 54750d029..000000000
--- a/app/javascript/styles/material-v2-light/_functions.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-@function to-string($value) {
-    @return inspect($value);
-}
-
-// convert hex color code to svg styled color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(to-string($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/account.scss b/app/javascript/styles/material-v2-light/account.scss
deleted file mode 100644
index b43194729..000000000
--- a/app/javascript/styles/material-v2-light/account.scss
+++ /dev/null
@@ -1,143 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: 50%;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $text-tab-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/basics.scss b/app/javascript/styles/material-v2-light/basics.scss
deleted file mode 100644
index 5c7c3dc04..000000000
--- a/app/javascript/styles/material-v2-light/basics.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-
-
-body { background: $background-color }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/button.scss b/app/javascript/styles/material-v2-light/button.scss
deleted file mode 100644
index 38fd1a3c1..000000000
--- a/app/javascript/styles/material-v2-light/button.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &.overlayed {
-        border-radius: 50%;
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-    
-        &:hover {
-            background: $media-icon-background-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
-
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-background-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/cards.scss b/app/javascript/styles/material-v2-light/cards.scss
deleted file mode 100644
index 96988f2c9..000000000
--- a/app/javascript/styles/material-v2-light/cards.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-}
-
-.status {
-    border-bottom: 0 !important;
-    border-radius: $card-radius;
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-light.scss b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/plus-classic.scss b/app/javascript/styles/material-v2-light/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-dark.scss b/app/javascript/styles/material-v2-light/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-light.scss b/app/javascript/styles/material-v2-light/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-dark.scss b/app/javascript/styles/material-v2-light/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-light.scss b/app/javascript/styles/material-v2-light/color/v2-light.scss
index 74115f87c..6fd1dea9e 100644
--- a/app/javascript/styles/material-v2-light/color/v2-light.scss
+++ b/app/javascript/styles/material-v2-light/color/v2-light.scss
@@ -57,6 +57,7 @@ $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-background-color: transparentize(#000000, 0.5);
diff --git a/app/javascript/styles/material-v2-light/columns.scss b/app/javascript/styles/material-v2-light/columns.scss
deleted file mode 100644
index 689028581..000000000
--- a/app/javascript/styles/material-v2-light/columns.scss
+++ /dev/null
@@ -1,461 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $secondary-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-background-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-background-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-background-hover-color }
-
-    &:active,
-    &:focus { background: $list-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-background-active-color;
-
-            &:hover { background: $menu-background-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $background-color;
-        margin-bottom: 0;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends__item {
-    padding: 16px;
-    border-bottom: none;
-
-    &__name {
-        color: $secondary-text-color;
-        font-size: 12px;
-
-        a { color: $primary-text-color }
-    }
-
-    &__current {
-        padding-right: 16px;
-        margin-left: 4px;
-        color: $secondary-text-color;
-    }
-
-    &__sparkline path {
-        stroke: $primary-color;
-        fill: $primary-color;
-        fill-opacity: 0.5;
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-}
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-background-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-    
-        button {
-            background: $tab-background-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    background: transparent;
-
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-// read notification
-.notification.notification-favourite.focusable,
-.notification.notification-follow.focusable { background: $list-background-inactive-color }
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.react-swipeable-view-container { height: auto }
-
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable { background: transparent !important }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/components.scss b/app/javascript/styles/material-v2-light/components.scss
deleted file mode 100644
index 92d2801f4..000000000
--- a/app/javascript/styles/material-v2-light/components.scss
+++ /dev/null
@@ -1,389 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-background-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-background-color;
-
-        &.darker { background: $card-background-color }
-
-        &__mastodon { background: $card-background-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 10px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-background-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $card-background-color;
-            color: $ui-text-color;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-background-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-background-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-background-active-color }
-            }
-        }
-    }
-
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
-
-
-.poll {
-    &__input {
-        border: 2px solid $control-border-color;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $background-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-active-color }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $poll-bar-color;
-    
-        &.leading { background: $poll-bar-leading-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/control.scss b/app/javascript/styles/material-v2-light/control.scss
deleted file mode 100644
index 7bd251291..000000000
--- a/app/javascript/styles/material-v2-light/control.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_color.scss b/app/javascript/styles/material-v2-light/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_config.scss b/app/javascript/styles/material-v2-light/custom_config.scss
new file mode 100644
index 000000000..38d8cd324
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/custom_config.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/v2-light';
+
+@import 'layout/material-v2';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_layout.scss b/app/javascript/styles/material-v2-light/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/emoji-picker.scss b/app/javascript/styles/material-v2-light/emoji-picker.scss
deleted file mode 100644
index 2c17701cf..000000000
--- a/app/javascript/styles/material-v2-light/emoji-picker.scss
+++ /dev/null
@@ -1,90 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $ui-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icon_config.scss b/app/javascript/styles/material-v2-light/icon_config.scss
new file mode 100644
index 000000000..3274efde8
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/icon_config.scss
@@ -0,0 +1,26 @@
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
+
+
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icons.scss b/app/javascript/styles/material-v2-light/icons.scss
deleted file mode 100644
index beca11a6f..000000000
--- a/app/javascript/styles/material-v2-light/icons.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v1.scss b/app/javascript/styles/material-v2-light/layout/material-v1.scss
new file mode 100644
index 000000000..825deaf8c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v2.scss b/app/javascript/styles/material-v2-light/layout/material-v2.scss
index 86d2c496f..6c81dc3e4 100644
--- a/app/javascript/styles/material-v2-light/layout/material-v2.scss
+++ b/app/javascript/styles/material-v2-light/layout/material-v2.scss
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '../mixins';
+@import '../theme/mixins';
 
 
 // Navigation bar radius
diff --git a/app/javascript/styles/material-v2-light/loader.scss b/app/javascript/styles/material-v2-light/loader.scss
new file mode 100644
index 000000000..04d588001
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/material-icons.scss b/app/javascript/styles/material-v2-light/material-icons.scss
deleted file mode 100644
index e473dfe31..000000000
--- a/app/javascript/styles/material-v2-light/material-icons.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'functions';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: "reply" }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
-    &.fa-check::before { content: "check" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
-    height: 18px;
-    width: 18px;
-    transition: background-position .3s steps(1);
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/media.scss b/app/javascript/styles/material-v2-light/media.scss
deleted file mode 100644
index 64a69a129..000000000
--- a/app/javascript/styles/material-v2-light/media.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.media-modal__close {
-    align-content: center;
-
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        text-align: center !important;
-        font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
-
-        &:hover {
-            background: $media-icon-background-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw { width: 24px }
-    }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/mobile.scss b/app/javascript/styles/material-v2-light/mobile.scss
deleted file mode 100644
index de6f4e94c..000000000
--- a/app/javascript/styles/material-v2-light/mobile.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    
-    .column { margin: 0 !important }
-
-    .search__input { padding: 16px 38px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/modal.scss b/app/javascript/styles/material-v2-light/modal.scss
deleted file mode 100644
index 7734c8dfa..000000000
--- a/app/javascript/styles/material-v2-light/modal.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.confirmation-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-    width: 280px;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-background-color;
-        padding: 8px;
-    }
-}
-
-.actions-modal {
-    background: $card-background-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-background-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/plugins/cards.scss b/app/javascript/styles/material-v2-light/plugins/cards.scss
new file mode 100644
index 000000000..c134cbeeb
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/plugins/cards.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+
+    > .scrollable { background: $background-color }
+}
+
+.status {
+    border-bottom: 0;
+    border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/plugins/dense.scss b/app/javascript/styles/material-v2-light/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/plugins/plus.scss b/app/javascript/styles/material-v2-light/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/statuses.scss b/app/javascript/styles/material-v2-light/statuses.scss
deleted file mode 100644
index f60c2d859..000000000
--- a/app/javascript/styles/material-v2-light/statuses.scss
+++ /dev/null
@@ -1,172 +0,0 @@
-@charset "UTF-8";
-@import 'config';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: 16px;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: 16px;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &__prepend { color: $secondary-text-color }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-background-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/_functions.scss b/app/javascript/styles/material-v2-light/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/_mixins.scss b/app/javascript/styles/material-v2-light/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v2-light/_mixins.scss
rename to app/javascript/styles/material-v2-light/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v2-light/theme/account.scss b/app/javascript/styles/material-v2-light/theme/account.scss
new file mode 100644
index 000000000..44d68d1e9
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/account.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name { color: $primary-text-color }
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $text-tab-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/base_config.scss b/app/javascript/styles/material-v2-light/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/basics.scss b/app/javascript/styles/material-v2-light/theme/basics.scss
new file mode 100644
index 000000000..4c122d1c6
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/basics.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/button.scss b/app/javascript/styles/material-v2-light/theme/button.scss
new file mode 100644
index 000000000..1231bac98
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/button.scss
@@ -0,0 +1,97 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/columns.scss b/app/javascript/styles/material-v2-light/theme/columns.scss
new file mode 100644
index 000000000..a6892adf2
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/columns.scss
@@ -0,0 +1,502 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $top-bar-unread-icon-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-background-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+
+    &__pagination { color: $ui-text-color }
+}
+
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-background-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $tab-background-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/components.scss b/app/javascript/styles/material-v2-light/theme/components.scss
new file mode 100644
index 000000000..4f844229c
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/components.scss
@@ -0,0 +1,394 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 16px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
+}
+
+
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/control.scss b/app/javascript/styles/material-v2-light/theme/control.scss
new file mode 100644
index 000000000..a205a4cb7
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/control.scss
@@ -0,0 +1,71 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/emoji-picker.scss b/app/javascript/styles/material-v2-light/theme/emoji-picker.scss
new file mode 100644
index 000000000..70e22752d
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/emoji-picker.scss
@@ -0,0 +1,92 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $menu-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-active-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover::before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/icons.scss b/app/javascript/styles/material-v2-light/theme/icons.scss
new file mode 100644
index 000000000..1367647ec
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/icons.scss
@@ -0,0 +1,44 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
+
+.fa.fa-times,
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/material-icons.scss b/app/javascript/styles/material-v2-light/theme/material-icons.scss
new file mode 100644
index 000000000..51631eab5
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/material-icons.scss
@@ -0,0 +1,156 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
+@import 'functions';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check,
+    &.fa-quote-right {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: $reply-icon }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/media.scss b/app/javascript/styles/material-v2-light/theme/media.scss
new file mode 100644
index 000000000..28de8db85
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/media.scss
@@ -0,0 +1,101 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/mobile.scss b/app/javascript/styles/material-v2-light/theme/mobile.scss
new file mode 100644
index 000000000..ed6467ebc
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/mobile.scss
@@ -0,0 +1,58 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/modal.scss b/app/javascript/styles/material-v2-light/theme/modal.scss
new file mode 100644
index 000000000..287dcf804
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/modal.scss
@@ -0,0 +1,84 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/statuses.scss b/app/javascript/styles/material-v2-light/theme/statuses.scss
new file mode 100644
index 000000000..65b5fcc41
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/statuses.scss
@@ -0,0 +1,185 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: $name-font-size;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: $status-font-size;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/theme.scss b/app/javascript/styles/material-v2-light/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/variables.scss b/app/javascript/styles/material-v2-light/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/material-v2-light/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus.scss b/app/javascript/styles/plus.scss
new file mode 100644
index 000000000..a78e9e34e
--- /dev/null
+++ b/app/javascript/styles/plus.scss
@@ -0,0 +1,3 @@
+@charset "UTF-8";
+
+@import 'plus/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
new file mode 100644
index 000000000..de22c451b
--- /dev/null
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #191b22;
+$menu-background-color: #d9e1e8;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #313543;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #282c37;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #42485a;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: lighten($background-color, 14%);
+$icon-background-active-color: lighten($background-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
+$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #1f232b;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
new file mode 100644
index 000000000..134b18e10
--- /dev/null
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #eff3f5;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($background-color, 6%);
+$menu-background-active-color: darken($background-color, 10%);
+$menu-background-active-hover-color: darken($background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: darken($background-color, 4%);
+$icon-background-active-color: darken($background-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: #e6ebf0;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-background-color: $tab-background-color;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
new file mode 100644
index 000000000..3e817cde4
--- /dev/null
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
new file mode 100644
index 000000000..652ffe37e
--- /dev/null
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -0,0 +1,129 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #303030;
+$menu-background-color: #424242;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #424242;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #424242;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
+$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($background-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #424242;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
new file mode 100644
index 000000000..4000eead0
--- /dev/null
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #fafafa;
+$menu-background-color: #ffffff;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: #ffffff;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: #ffffff;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
new file mode 100644
index 000000000..c990d6b1e
--- /dev/null
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+
+// Background-color
+$background-color: #121212;
+$menu-background-color: #1e1e1e;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #1e1e1e;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #1e1e1e;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #1e1e1e;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
new file mode 100644
index 000000000..6fd1dea9e
--- /dev/null
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -0,0 +1,130 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+
+// Background-color
+$background-color: #ffffff;
+$menu-background-color: $background-color;
+$menu-background-hover-color: darken($menu-background-color, 6%);
+$menu-background-active-color: darken($menu-background-color, 10%);
+$menu-background-active-hover-color: darken($menu-background-color, 16%);
+$card-background-color: $background-color;
+$card-background-hover-color: darken($card-background-color, 6%);
+$card-background-inactive-color: darken($card-background-color, 10%);
+$list-background-color: $background-color;
+$list-background-hover-color: darken($list-background-color, 6%);
+$list-background-active-color: darken($list-background-color, 10%);
+$list-background-inactive-color: darken($list-background-color, 10%);
+$verified-background-color: lighten($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-background-hover-color: transparentize(#000000, 0.9);
+$icon-background-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $secondary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-active-color: darken($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-hover-color: darken($background-color, 30%);
+$scroll-bar-thumb-active-color: darken($background-color, 38%);
+
+// App bar color
+$top-bar-color: $background-color;
+$search-bar-color: darken($background-color, 6%);
+$search-bar-focus-color: $background-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #ffffff;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_color.scss b/app/javascript/styles/plus/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/plus/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_config.scss b/app/javascript/styles/plus/custom_config.scss
new file mode 100644
index 000000000..cd403efed
--- /dev/null
+++ b/app/javascript/styles/plus/custom_config.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/plus-classic';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_layout.scss b/app/javascript/styles/plus/custom_layout.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/plus/custom_layout.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
new file mode 100644
index 000000000..3274efde8
--- /dev/null
+++ b/app/javascript/styles/plus/icon_config.scss
@@ -0,0 +1,26 @@
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1
+
+
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+@font-face {
+    font-family: "Material Icons";
+    src:
+        local("Material Icons"),
+        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
+        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v1.scss b/app/javascript/styles/plus/layout/material-v1.scss
new file mode 100644
index 000000000..825deaf8c
--- /dev/null
+++ b/app/javascript/styles/plus/layout/material-v1.scss
@@ -0,0 +1,45 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
new file mode 100644
index 000000000..6c81dc3e4
--- /dev/null
+++ b/app/javascript/styles/plus/layout/material-v2.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+// If you want to use contained-chip, please comment out below.
+.reactions-bar__item {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+
+    &.active { background-color: $outlined-chip-selected-color !important }
+
+    &:hover { background: $outlined-chip-hover-color !important }
+}
+.relationship-tag,
+.account-role {
+    background: $outlined-chip-color !important;
+    border: 1px solid $border-color !important;
+}
+
+
+// Button shadow
+// If you want to use material v2 styled non-shadow button, please comment out this section.
+.button,
+.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/loader.scss b/app/javascript/styles/plus/loader.scss
new file mode 100644
index 000000000..ab6ad96b5
--- /dev/null
+++ b/app/javascript/styles/plus/loader.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+
+@import '../application';
+
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+@import 'plugins/cards';
+@import 'plugins/dense';
+@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/cards.scss b/app/javascript/styles/plus/plugins/cards.scss
new file mode 100644
index 000000000..c134cbeeb
--- /dev/null
+++ b/app/javascript/styles/plus/plugins/cards.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+
+    > .scrollable { background: $background-color }
+}
+
+.status {
+    border-bottom: 0;
+    border-radius: $card-radius;
+    background: $card-background-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-background-color;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
new file mode 100644
index 000000000..42417124b
--- /dev/null
+++ b/app/javascript/styles/plus/plugins/dense.scss
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__tab { margin: 8px auto 8px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    &__buttons { height: 48px }
+
+    &__button {
+        margin: 8px;
+        padding: 10px 8px;
+
+        .fa { vertical-align: text-top }
+    }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form__publish { padding-top: 8px }
+}
+
+.status {
+    padding: 8px 8px 8px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/plus.scss b/app/javascript/styles/plus/plugins/plus.scss
new file mode 100644
index 000000000..5b220631b
--- /dev/null
+++ b/app/javascript/styles/plus/plugins/plus.scss
@@ -0,0 +1,33 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/_functions.scss b/app/javascript/styles/plus/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/plus/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
new file mode 100644
index 000000000..5f573e339
--- /dev/null
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
new file mode 100644
index 000000000..44d68d1e9
--- /dev/null
+++ b/app/javascript/styles/plus/theme/account.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+
+    .account__display-name { color: $primary-text-color }
+    .account__display-name strong { color: $secondary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: 50%;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__header {
+        &__bar {
+            background: $card-background-color;
+            padding: 8px;
+            border-bottom: 1px solid $border-color;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    border: none;
+                    border-radius: 50%;
+                    padding: 0;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-background-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-background-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+    }
+
+    &__section-headline {
+        background: $text-tab-background-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-background-hover-color }
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/base_config.scss b/app/javascript/styles/plus/theme/base_config.scss
new file mode 100644
index 000000000..73ff009e1
--- /dev/null
+++ b/app/javascript/styles/plus/theme/base_config.scss
@@ -0,0 +1,34 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+/*.search__input:hover {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+}*/
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/basics.scss b/app/javascript/styles/plus/theme/basics.scss
new file mode 100644
index 000000000..4c122d1c6
--- /dev/null
+++ b/app/javascript/styles/plus/theme/basics.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+body { background: $background-color }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html {
+    scrollbar-color: $scroll-bar-thumb-color transparent;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
new file mode 100644
index 000000000..1231bac98
--- /dev/null
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -0,0 +1,97 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-background-hover-color;
+        }
+    }
+
+    &.overlayed {
+        border-radius: 50%;
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+    
+        &:hover {
+            background: $media-icon-background-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &:hover {
+        color: $icon-button-hover-color;
+        background-color: $icon-background-hover-color;
+    }
+
+    &:active,
+    &:focus { background-color: transparent }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 12px;
+
+    &:hover {
+        background-color: $icon-background-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button,
+.button:active,
+.button:focus {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+}
+
+.button:hover {
+    @include shadow-2dp;
+    background-color: $contained-button-hover-color;
+}
+
+.button.logo-button {
+    background: $contained-button-color;
+    margin: 2px;
+
+    &:hover { background: $contained-button-hover-color }
+
+    .button--destructive:hover { background: $contained-button-hover-color }
+}
+
+.button.button--block { margin: 8px 0 }
+
+.button.confirmation-modal__cancel-button {
+    box-shadow: none;
+    background-color: transparent;
+    margin: 0 8px;
+    color: $text-button-color;
+
+    &:hover { background: $text-button-hover-color }
+
+    &:focus { background: $text-button-focus-color }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-background-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
new file mode 100644
index 000000000..a6892adf2
--- /dev/null
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -0,0 +1,502 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable { background: $list-background-color }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+
+    > button {
+        padding: 16px 0 16px 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $top-bar-unread-icon-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px 12px;
+        border-radius: 50%;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-background-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-background-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-background-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-background-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-background-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: auto 0;
+        border-radius: 50%;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $background-color;
+    padding: 12px 16px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $background-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-background-hover-color }
+
+    &:active,
+    &:focus { background: $list-background-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-background-active-color;
+
+            &:hover { background: $menu-background-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-background-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $search-bar-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+
+    &:focus {
+        @include shadow-1dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-background-color;
+    font-size: 16px;
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-background-inactive-color;
+
+    &--unread {
+        background: $list-background-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-background-hover-color }
+}
+
+.getting-started {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__wrapper {
+        background: $background-color;
+        height: auto !important;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $background-color;
+        margin-bottom: 0;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-background-color;
+    padding: 0;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+
+    &__pagination { color: $ui-text-color }
+}
+
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
+.reactions-bar {
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+            .reactions-bar__item__count { color: $ui-text-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-background-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+    
+        button {
+            background: $tab-background-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-background-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-background-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.attachment-list__list a { color: $secondary-text-color }
+
+.focusable {
+    &:focus { background: $card-background-color }
+}
+
+// single column mode
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper { padding-top: 0 }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+        margin: 12px 12px 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
new file mode 100644
index 000000000..4f844229c
--- /dev/null
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -0,0 +1,394 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-background-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-background-color;
+
+        &.darker {
+            background: $card-background-color;
+            position: inherit;
+        }
+
+        &__mastodon { background: $card-background-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 16px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-background-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-background-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-background-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-background-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-background-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $card-background-color;
+            color: $ui-text-color;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-background-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-background-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-background-active-color }
+            }
+        }
+    }
+
+    .spoiler-input__input {
+        color: $ui-text-color;
+        background: $card-background-color;
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    .compose-form {
+        &__warning {
+            @include shadow-1dp;
+            color: $secondary-text-color;
+            background: $card-background-color;
+            padding: 16px;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__buttons-wrapper {
+            background: $card-background-color;
+            color: $tips-text-color;
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 12px }
+
+            select {
+                color: $ui-text-color;
+                background-color: $background-color;
+                border: 0;
+
+                &:focus { border-color: $border-active-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $outlined-button-color;
+                border-color: $outlined-button-color;
+
+                &:hover { background-color: $outlined-button-hover-color }
+
+                &:active { background-color: $outlined-button-active-color }
+
+                &:focus { background-color: $outlined-button-color }
+
+
+            }
+        }
+
+        &__utilBtns { padding-top: 0 }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input {
+    transition-duration: .2s, .2s;
+}
+
+
+.poll {
+    &__input {
+        border: 2px solid $control-border-color;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $background-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-active-color }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $poll-bar-color;
+    
+        &.leading { background: $poll-bar-leading-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-background-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-background-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-background-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-background-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    @include shadow-1dp;
+    border-radius: $card-radius;
+    background: $card-background-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content { color: $primary-text-color }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/control.scss b/app/javascript/styles/plus/theme/control.scss
new file mode 100644
index 000000000..a205a4cb7
--- /dev/null
+++ b/app/javascript/styles/plus/theme/control.scss
@@ -0,0 +1,71 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/emoji-picker.scss b/app/javascript/styles/plus/theme/emoji-picker.scss
new file mode 100644
index 000000000..70e22752d
--- /dev/null
+++ b/app/javascript/styles/plus/theme/emoji-picker.scss
@@ -0,0 +1,92 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-background-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $menu-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-background-color;
+        }
+    }
+
+    &-anchors {
+        color: $icon-button-color;
+        padding: 0;
+    }
+
+    &-anchor {
+        padding: 10px 4px;
+
+        &-selected {
+            color: $icon-button-active-color;
+        }
+
+        &-bar {
+            background-color: $tab-indicator-active-color;
+        }
+
+        &:hover {
+            color: $icon-button-hover-color;
+        }
+    }
+
+    &-search {
+        background: $menu-background-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-background-color;
+    }
+
+    &-category-label span {
+        padding: 4px 6px;
+        background: $menu-background-color;
+    }
+
+    &-emoji:hover::before {
+        background-color: $icon-background-hover-color;
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/icons.scss b/app/javascript/styles/plus/theme/icons.scss
new file mode 100644
index 000000000..1367647ec
--- /dev/null
+++ b/app/javascript/styles/plus/theme/icons.scss
@@ -0,0 +1,44 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+
+.fa { vertical-align: sub }  // adjust material icon font baseline to other font
+
+.fa.fa-times,
+.fa.fa-eraser,
+.fa.fa-plus { vertical-align: middle }  // adjustment exception
+
+.fa.fa-check { vertical-align: initial }
+
+.fa.fa-lock { text-transform: none }
+
+.fa-fw { width: 16px }
+
+// icon in tab settings
+.fa.fa-chevron-left.column-back-button__icon.fa-fw,
+.text-btn.column-header__setting-btn .fa.fa-eraser {
+    font-size: 20px;
+    margin-right: 16px;
+}
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
new file mode 100644
index 000000000..51631eab5
--- /dev/null
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -0,0 +1,156 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
+@import 'functions';
+
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check,
+    &.fa-quote-right {
+        font-family: "Material Icons";
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: $reply-icon }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "delete" }
+    &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
+// boost icon
+.no-reduce-motion button.icon-button i.fa-retweet {
+    height: 18px;
+    width: 18px;
+    transition: background-position .3s steps(1);
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
new file mode 100644
index 000000000..28de8db85
--- /dev/null
+++ b/app/javascript/styles/plus/theme/media.scss
@@ -0,0 +1,101 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.media-gallery { border-radius: $card-radius }
+
+.media-modal__close {
+    align-content: center;
+
+    &.icon-button {
+        background: transparent;
+        color: $media-icon-color;
+        text-align: center !important;
+        font-size: 24px !important;
+        width: 48px !important;
+        height: 48px !important;
+        border: 12px;
+
+        &:hover {
+            background: $media-icon-background-hover-color;
+            color: $media-icon-hover-color;
+        }
+
+        .fa-fw { width: 24px }
+    }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-background-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/mobile.scss b/app/javascript/styles/plus/theme/mobile.scss
new file mode 100644
index 000000000..ed6467ebc
--- /dev/null
+++ b/app/javascript/styles/plus/theme/mobile.scss
@@ -0,0 +1,58 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon .fa {
+        top: 16px;
+        left: 16px;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
new file mode 100644
index 000000000..287dcf804
--- /dev/null
+++ b/app/javascript/styles/plus/theme/modal.scss
@@ -0,0 +1,84 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.confirmation-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+    width: 280px;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-background-color;
+        padding: 8px;
+    }
+}
+
+.actions-modal {
+    background: $card-background-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-background-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-background-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
new file mode 100644
index 000000000..65b5fcc41
--- /dev/null
+++ b/app/javascript/styles/plus/theme/statuses.scss
@@ -0,0 +1,185 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 12px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: $name-font-size;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: $status-font-size;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        &__counter__label {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+    }
+
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-background-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &:hover { background-color: $card-background-color }
+}
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-background-color;
+    padding: 16px;
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-background-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 12px 0;
+    }
+
+    &__button {
+        .icon-button { font-size: 20px !important }
+    }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color !important }
+    &__account { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/theme.scss b/app/javascript/styles/plus/theme/theme.scss
new file mode 100644
index 000000000..5b7daddf6
--- /dev/null
+++ b/app/javascript/styles/plus/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/variables.scss b/app/javascript/styles/plus/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/plus/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5e42bce4a..e8393484d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1249,6 +1249,7 @@ en:
     material-v2-light: Material v2 (Light)
     mastodon-material-dark: Mastodon Material (Dark)
     mastodon-material-light: Mastodon Material (Light)
+    plus: Plus
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 17c44ab69..9c7aeaa68 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1231,6 +1231,7 @@ ja:
     material-v2-light: Material v2 (ライト)
     mastodon-material-dark: Mastodon Material (ダーク)
     mastodon-material-light: Mastodon Material (ライト)
+    plus: Plus
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index cfd4d16fa..17945f652 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -9,3 +9,4 @@ material-v2-dark: styles/material-v2-dark.scss
 material-v2-light: styles/material-v2-light.scss
 mastodon-material-dark: styles/mastodon-material-dark.scss
 mastodon-material-light: styles/mastodon-material-light.scss
+plus: styles/plus.scss

From b9279a7a0b2a47d89843725b4caae3ac421e041f Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 17 May 2020 17:29:03 +0900
Subject: [PATCH 039/200] fix font reference

---
 app/javascript/styles/mastodon-material-dark/icon_config.scss | 4 ++--
 .../styles/mastodon-material-light/icon_config.scss           | 4 ++--
 app/javascript/styles/material-v1-dark/icon_config.scss       | 4 ++--
 app/javascript/styles/material-v1-light/icon_config.scss      | 4 ++--
 app/javascript/styles/material-v2-dark/icon_config.scss       | 4 ++--
 app/javascript/styles/material-v2-light/icon_config.scss      | 4 ++--
 app/javascript/styles/plus/icon_config.scss                   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/icon_config.scss b/app/javascript/styles/mastodon-material-dark/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/mastodon-material-dark/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-dark/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/icon_config.scss b/app/javascript/styles/mastodon-material-light/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/mastodon-material-light/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-light/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/icon_config.scss b/app/javascript/styles/material-v1-dark/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/material-v1-dark/icon_config.scss
+++ b/app/javascript/styles/material-v1-dark/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/icon_config.scss b/app/javascript/styles/material-v1-light/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/material-v1-light/icon_config.scss
+++ b/app/javascript/styles/material-v1-light/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icon_config.scss b/app/javascript/styles/material-v2-dark/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/material-v2-dark/icon_config.scss
+++ b/app/javascript/styles/material-v2-dark/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icon_config.scss b/app/javascript/styles/material-v2-light/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/material-v2-light/icon_config.scss
+++ b/app/javascript/styles/material-v2-light/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
index 3274efde8..fe42f985b 100644
--- a/app/javascript/styles/plus/icon_config.scss
+++ b/app/javascript/styles/plus/icon_config.scss
@@ -20,7 +20,7 @@ $reply-icon: "reply";
     font-family: "Material Icons";
     src:
         local("Material Icons"),
-        url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
+        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        //url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file

From 2bc4d2b5a6619341dc85a03e15cdbb83cffe2249 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 17 May 2020 21:49:42 +0900
Subject: [PATCH 040/200] fix relative path

---
 app/javascript/styles/mastodon-material-dark/icon_config.scss  | 2 +-
 app/javascript/styles/mastodon-material-light/icon_config.scss | 2 +-
 app/javascript/styles/material-v1-dark/icon_config.scss        | 2 +-
 app/javascript/styles/material-v1-light/icon_config.scss       | 2 +-
 app/javascript/styles/material-v2-dark/icon_config.scss        | 2 +-
 app/javascript/styles/material-v2-light/icon_config.scss       | 2 +-
 app/javascript/styles/plus/icon_config.scss                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/icon_config.scss b/app/javascript/styles/mastodon-material-dark/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/mastodon-material-dark/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-dark/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/icon_config.scss b/app/javascript/styles/mastodon-material-light/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/mastodon-material-light/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-light/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/icon_config.scss b/app/javascript/styles/material-v1-dark/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/material-v1-dark/icon_config.scss
+++ b/app/javascript/styles/material-v1-dark/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/icon_config.scss b/app/javascript/styles/material-v1-light/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/material-v1-light/icon_config.scss
+++ b/app/javascript/styles/material-v1-light/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/icon_config.scss b/app/javascript/styles/material-v2-dark/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/material-v2-dark/icon_config.scss
+++ b/app/javascript/styles/material-v2-dark/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icon_config.scss b/app/javascript/styles/material-v2-light/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/material-v2-light/icon_config.scss
+++ b/app/javascript/styles/material-v2-light/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
index fe42f985b..610c7e308 100644
--- a/app/javascript/styles/plus/icon_config.scss
+++ b/app/javascript/styles/plus/icon_config.scss
@@ -22,5 +22,5 @@ $reply-icon: "reply";
         local("Material Icons"),
         //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
         //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url(".../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
+        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
 }
\ No newline at end of file

From 030b8c157a31753f62444d3df598734c5d41efb9 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Mon, 18 May 2020 19:36:41 +0900
Subject: [PATCH 041/200] fix favorite icon change reply icon

---
 app/javascript/styles/plus/icon_config.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
index 610c7e308..e39986220 100644
--- a/app/javascript/styles/plus/icon_config.scss
+++ b/app/javascript/styles/plus/icon_config.scss
@@ -1,17 +1,17 @@
 // Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 //$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 
-$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+$favorite-icon-color: #ffffff;  // inverted +1
 
 
 // Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
+//$reply-icon: "reply";
+$reply-icon: "comment";  // blooming
 
 
 // Material Design Icon settings

From 820621e849bfd0db980ccdf89ad09b3330a11cce Mon Sep 17 00:00:00 2001
From: maa123 <maa123.lq@gmail.com>
Date: Wed, 6 May 2020 16:47:31 +0900
Subject: [PATCH 042/200] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?=
 =?UTF-8?q?=E3=81=9A=E9=9D=9E=E5=90=8C=E6=9C=9F=E5=87=A6=E7=90=86=E6=B6=88?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v2/media_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/api/v2/media_controller.rb b/app/controllers/api/v2/media_controller.rb
index 0c1baf01d..de2c72313 100644
--- a/app/controllers/api/v2/media_controller.rb
+++ b/app/controllers/api/v2/media_controller.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+class Api::V2::MediaController < Api::V1::MediaController
+end
+__END__
 class Api::V2::MediaController < Api::V1::MediaController
   def create
     @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))

From e1e7ffe2bcdad7b7aa99f219ab663d2ef4b6419b Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sat, 13 Jun 2020 16:32:19 +0900
Subject: [PATCH 043/200] add auto-configure mastodon theme

---
 app/javascript/styles/mastodon-auto.scss | 2 ++
 config/locales/en.yml                    | 1 +
 config/locales/ja.yml                    | 1 +
 config/themes.yml                        | 1 +
 4 files changed, 5 insertions(+)
 create mode 100644 app/javascript/styles/mastodon-auto.scss

diff --git a/app/javascript/styles/mastodon-auto.scss b/app/javascript/styles/mastodon-auto.scss
new file mode 100644
index 000000000..ccb5d24eb
--- /dev/null
+++ b/app/javascript/styles/mastodon-auto.scss
@@ -0,0 +1,2 @@
+@use 'application';
+@media (prefers-color-scheme: light) { @import 'mastodon-light'; }
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8393484d..d4b77535e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1242,6 +1242,7 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
+    mastodon-auto: Mastodon (Auto)
     # additional theme
     material-v1-dark: Material v1 (Dark)
     material-v1-light: Material v1 (Light)
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9c7aeaa68..699902665 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1224,6 +1224,7 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
+    mastodon-auto: Mastodon (自動)
     # 追加テーマ
     material-v1-dark: Material v1 (ダーク)
     material-v1-light: Material v1 (ライト)
diff --git a/config/themes.yml b/config/themes.yml
index 17945f652..5f6a22a6e 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,6 +1,7 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+mastodon-auto: styles/mastodon-auto.scss
 
 # 追加テーマ
 material-v1-dark: styles/material-v1-dark.scss

From 8ca33fa1f1c26d543215af194a0c561e99ec510b Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Wed, 17 Jun 2020 21:23:11 +0900
Subject: [PATCH 044/200] add material auto theme integrate material v2 into v1
 update themes

---
 .../styles/mastodon-material-auto.scss        |   2 +
 .../styles/mastodon-material-dark.scss        |   5 +-
 .../color/black.scss}                         |  25 +-
 .../color/mastodon-dark.scss                  |   7 +-
 .../color/mastodon-light.scss                 |   7 +-
 .../color/plus-classic.scss                   |   5 +
 .../mastodon-material-dark/color/v1-dark.scss |   9 +-
 .../color/v1-light.scss                       |   7 +-
 .../mastodon-material-dark/color/v2-dark.scss |   7 +-
 .../color/v2-light.scss                       |   7 +-
 .../layout/material-v2.scss                   |   5 -
 .../styles/mastodon-material-dark/loader.scss |   5 -
 .../mastodon-material-dark/plugins/dense.scss |   2 +
 .../mastodon-material-dark/theme/account.scss |   8 +
 .../mastodon-material-dark/theme/columns.scss |  58 +-
 .../theme/components.scss                     | 148 +++++-
 .../theme/material-icons.scss                 |   7 +-
 .../mastodon-material-dark/theme/media.scss   |   6 +-
 .../mastodon-material-dark/theme/modal.scss   |  20 +-
 .../theme/{mobile.scss => responsive.scss}    |  44 +-
 .../theme/statuses.scss                       |   2 +-
 .../mastodon-material-dark/theme/theme.scss   |   2 +-
 .../styles/mastodon-material-light.scss       |   5 +-
 .../mastodon-material-light/color/black.scss  | 135 +++++
 .../color/mastodon-dark.scss                  |   7 +-
 .../color/mastodon-light.scss                 |   7 +-
 .../color/plus-classic.scss                   |   5 +
 .../color/v1-dark.scss                        |   9 +-
 .../color/v1-light.scss                       |   7 +-
 .../color/v2-dark.scss                        |   7 +-
 .../color/v2-light.scss                       |   7 +-
 .../layout/material-v2.scss                   |   5 -
 .../mastodon-material-light/loader.scss       |   5 -
 .../plugins/dense.scss                        |   2 +
 .../theme/account.scss                        |   8 +
 .../theme/columns.scss                        |  58 +-
 .../theme/components.scss                     | 148 +++++-
 .../theme/material-icons.scss                 |   7 +-
 .../mastodon-material-light/theme/media.scss  |   6 +-
 .../mastodon-material-light/theme/modal.scss  |  20 +-
 .../theme/{mobile.scss => responsive.scss}    |  44 +-
 .../theme/statuses.scss                       |   2 +-
 .../mastodon-material-light/theme/theme.scss  |   2 +-
 app/javascript/styles/material-auto.scss      |   2 +
 app/javascript/styles/material-black.scss     |   2 +
 .../styles/material-black/color/black.scss    | 135 +++++
 .../color/mastodon-dark.scss                  |   7 +-
 .../color/mastodon-light.scss                 |   7 +-
 .../color/plus-classic.scss                   |   5 +
 .../color/v1-dark.scss                        |   9 +-
 .../color/v1-light.scss                       |   7 +-
 .../color/v2-dark.scss                        |   7 +-
 .../color/v2-light.scss                       |   7 +-
 .../custom_color.scss                         |   0
 .../custom_config.scss                        |   2 +-
 .../custom_layout.scss                        |   0
 .../icon_config.scss                          |   0
 .../layout/material-v1.scss                   |   0
 .../layout/material-v2.scss                   |   5 -
 .../loader.scss                               |   5 -
 .../plugins/cards.scss                        |   0
 .../plugins/dense.scss                        |   2 +
 .../plugins/plus.scss                         |   0
 .../theme/_functions.scss                     |   0
 .../theme/_mixins.scss                        |   0
 .../theme/account.scss                        |   8 +
 .../theme/base_config.scss                    |   0
 .../theme/basics.scss                         |   0
 .../theme/button.scss                         |   0
 .../theme/columns.scss                        |  58 +-
 .../theme/components.scss                     | 148 +++++-
 .../theme/control.scss                        |   0
 .../theme/emoji-picker.scss                   |   0
 .../theme/icons.scss                          |   0
 .../theme/material-icons.scss                 |   7 +-
 .../theme/media.scss                          |   6 +-
 .../theme/modal.scss                          |  20 +-
 .../theme/responsive.scss}                    |  44 +-
 .../theme/statuses.scss                       |   2 +-
 .../styles/material-black/theme/theme.scss    |   4 +
 .../theme/variables.scss                      |   0
 app/javascript/styles/material-dark.scss      |   2 +
 .../styles/material-dark/color/black.scss     | 135 +++++
 .../color/mastodon-dark.scss                  |   7 +-
 .../color/mastodon-light.scss                 |   7 +-
 .../color/plus-classic.scss                   |   5 +
 .../color/v1-dark.scss                        |   9 +-
 .../color/v1-light.scss                       |   7 +-
 .../color/v2-dark.scss                        |   7 +-
 .../color/v2-light.scss                       |   7 +-
 .../custom_color.scss                         |   0
 .../styles/material-dark/custom_config.scss   |   5 +
 .../custom_layout.scss                        |   0
 .../icon_config.scss                          |   0
 .../layout/material-v1.scss                   |   0
 .../layout/material-v2.scss                   |   5 -
 .../loader.scss                               |   5 -
 .../plugins/cards.scss                        |   0
 .../plugins/dense.scss                        |   2 +
 .../plugins/plus.scss                         |   0
 .../theme/_functions.scss                     |   0
 .../theme/_mixins.scss                        |   0
 .../theme/account.scss                        |   8 +
 .../theme/base_config.scss                    |   0
 .../theme/basics.scss                         |   0
 .../theme/button.scss                         |   0
 .../theme/columns.scss                        |  58 +-
 .../theme/components.scss                     | 148 +++++-
 .../theme/control.scss                        |   0
 .../theme/emoji-picker.scss                   |   0
 .../theme/icons.scss                          |   0
 .../theme/material-icons.scss                 |   7 +-
 .../theme/media.scss                          |   6 +-
 .../theme/modal.scss                          |  20 +-
 .../theme/responsive.scss}                    |  44 +-
 .../theme/statuses.scss                       |   2 +-
 .../styles/material-dark/theme/theme.scss     |   4 +
 .../theme/variables.scss                      |   0
 app/javascript/styles/material-light.scss     |   2 +
 .../styles/material-light/color/black.scss    | 135 +++++
 .../color/mastodon-dark.scss                  |   7 +-
 .../color/mastodon-light.scss                 |   7 +-
 .../color/plus-classic.scss                   |   5 +
 .../color/v1-dark.scss                        |   9 +-
 .../color/v1-light.scss                       |   7 +-
 .../color/v2-dark.scss                        |   7 +-
 .../color/v2-light.scss                       |   7 +-
 .../custom_color.scss                         |   0
 .../custom_config.scss                        |   0
 .../custom_layout.scss                        |   0
 .../icon_config.scss                          |   0
 .../layout/material-v1.scss                   |   0
 .../layout/material-v2.scss                   |   5 -
 .../loader.scss                               |   5 -
 .../plugins/cards.scss                        |   0
 .../plugins/dense.scss                        |   2 +
 .../plugins/plus.scss                         |   0
 .../theme/_functions.scss                     |   0
 .../theme/_mixins.scss                        |   0
 .../theme/account.scss                        |   8 +
 .../theme/base_config.scss                    |   0
 .../theme/basics.scss                         |   0
 .../theme/button.scss                         |   0
 .../theme/columns.scss                        |  58 +-
 .../theme/components.scss                     | 148 +++++-
 .../theme/control.scss                        |   0
 .../theme/emoji-picker.scss                   |   0
 .../theme/icons.scss                          |   0
 .../theme/material-icons.scss                 |   7 +-
 .../theme/media.scss                          |   6 +-
 .../theme/modal.scss                          |  20 +-
 .../material-light/theme/responsive.scss      |  94 ++++
 .../theme/statuses.scss                       |   2 +-
 .../styles/material-light/theme/theme.scss    |   4 +
 .../theme/variables.scss                      |   0
 app/javascript/styles/material-v1-dark.scss   |   3 -
 .../material-v1-dark/color/mastodon-dark.scss | 130 -----
 .../material-v1-dark/color/v1-light.scss      | 130 -----
 .../material-v1-dark/plugins/dense.scss       |  63 ---
 .../theme/material-icons.scss                 | 156 ------
 .../styles/material-v1-dark/theme/theme.scss  |   4 -
 app/javascript/styles/material-v1-light.scss  |   3 -
 .../material-v1-light/theme/columns.scss      | 502 ------------------
 .../material-v1-light/theme/components.scss   | 394 --------------
 .../styles/material-v1-light/theme/theme.scss |   4 -
 app/javascript/styles/material-v2-dark.scss   |   3 -
 .../material-v2-dark/custom_config.scss       |   7 -
 .../styles/material-v2-dark/loader.scss       |  12 -
 .../styles/material-v2-dark/theme/mobile.scss |  58 --
 .../styles/material-v2-dark/theme/theme.scss  |   4 -
 app/javascript/styles/material-v2-light.scss  |   3 -
 .../color/mastodon-light.scss                 | 129 -----
 .../material-v2-light/color/plus-classic.scss | 129 -----
 .../material-v2-light/color/v1-dark.scss      | 129 -----
 .../material-v2-light/color/v2-light.scss     | 130 -----
 .../material-v2-light/custom_color.scss       |   4 -
 .../material-v2-light/custom_config.scss      |   7 -
 .../material-v2-light/custom_layout.scss      |   4 -
 .../styles/material-v2-light/icon_config.scss |  26 -
 .../material-v2-light/layout/material-v1.scss |  45 --
 .../material-v2-light/layout/material-v2.scss |  65 ---
 .../material-v2-light/plugins/cards.scss      |  38 --
 .../material-v2-light/plugins/plus.scss       |  33 --
 .../material-v2-light/theme/_functions.scss   |   8 -
 .../material-v2-light/theme/_mixins.scss      |  25 -
 .../material-v2-light/theme/account.scss      | 145 -----
 .../material-v2-light/theme/base_config.scss  |  34 --
 .../material-v2-light/theme/basics.scss       |  26 -
 .../material-v2-light/theme/button.scss       |  97 ----
 .../material-v2-light/theme/control.scss      |  71 ---
 .../material-v2-light/theme/emoji-picker.scss |  92 ----
 .../styles/material-v2-light/theme/icons.scss |  44 --
 .../styles/material-v2-light/theme/media.scss | 101 ----
 .../material-v2-light/theme/mobile.scss       |  58 --
 .../styles/material-v2-light/theme/modal.scss |  84 ---
 .../material-v2-light/theme/statuses.scss     | 185 -------
 .../styles/material-v2-light/theme/theme.scss |   4 -
 .../material-v2-light/theme/variables.scss    |   7 -
 app/javascript/styles/plus.scss               |   5 +-
 app/javascript/styles/plus/color/black.scss   | 135 +++++
 .../styles/plus/color/mastodon-dark.scss      |   7 +-
 .../styles/plus/color/mastodon-light.scss     |   7 +-
 .../styles/plus/color/plus-classic.scss       |   5 +
 app/javascript/styles/plus/color/v1-dark.scss |   9 +-
 .../styles/plus/color/v1-light.scss           |   7 +-
 app/javascript/styles/plus/color/v2-dark.scss |   7 +-
 .../styles/plus/color/v2-light.scss           |   7 +-
 .../styles/plus/layout/material-v2.scss       |   5 -
 app/javascript/styles/plus/loader.scss        |  11 +-
 app/javascript/styles/plus/plugins/dense.scss |   2 +
 app/javascript/styles/plus/theme/account.scss |   8 +
 app/javascript/styles/plus/theme/columns.scss |  58 +-
 .../styles/plus/theme/components.scss         | 148 +++++-
 .../styles/plus/theme/material-icons.scss     |   7 +-
 app/javascript/styles/plus/theme/media.scss   |   6 +-
 app/javascript/styles/plus/theme/mobile.scss  |  58 --
 app/javascript/styles/plus/theme/modal.scss   |  20 +-
 .../styles/plus/theme/responsive.scss         |  94 ++++
 .../styles/plus/theme/statuses.scss           |   2 +-
 app/javascript/styles/plus/theme/theme.scss   |   2 +-
 config/locales/en.yml                         |   9 +-
 config/locales/ja.yml                         |   9 +-
 config/themes.yml                             |   9 +-
 223 files changed, 2539 insertions(+), 3722 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material-auto.scss
 rename app/javascript/styles/{material-v1-light/color/v2-dark.scss => mastodon-material-dark/color/black.scss} (89%)
 rename app/javascript/styles/mastodon-material-dark/theme/{mobile.scss => responsive.scss} (58%)
 create mode 100644 app/javascript/styles/mastodon-material-light/color/black.scss
 rename app/javascript/styles/mastodon-material-light/theme/{mobile.scss => responsive.scss} (58%)
 create mode 100644 app/javascript/styles/material-auto.scss
 create mode 100644 app/javascript/styles/material-black.scss
 create mode 100644 app/javascript/styles/material-black/color/black.scss
 rename app/javascript/styles/{material-v1-light => material-black}/color/mastodon-dark.scss (94%)
 rename app/javascript/styles/{material-v1-dark => material-black}/color/mastodon-light.scss (94%)
 rename app/javascript/styles/{material-v1-light => material-black}/color/plus-classic.scss (95%)
 rename app/javascript/styles/{material-v2-dark => material-black}/color/v1-dark.scss (93%)
 rename app/javascript/styles/{material-v2-dark => material-black}/color/v1-light.scss (94%)
 rename app/javascript/styles/{material-v1-dark => material-black}/color/v2-dark.scss (94%)
 rename app/javascript/styles/{material-v1-light => material-black}/color/v2-light.scss (94%)
 rename app/javascript/styles/{material-v1-dark => material-black}/custom_color.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/custom_config.scss (66%)
 rename app/javascript/styles/{material-v1-dark => material-black}/custom_layout.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/icon_config.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/layout/material-v1.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-black}/layout/material-v2.scss (89%)
 rename app/javascript/styles/{material-v1-dark => material-black}/loader.scss (62%)
 rename app/javascript/styles/{material-v1-dark => material-black}/plugins/cards.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-black}/plugins/dense.scss (92%)
 rename app/javascript/styles/{material-v1-dark => material-black}/plugins/plus.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/_functions.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/_mixins.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/account.scss (95%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/base_config.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/basics.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/button.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-black}/theme/columns.scss (90%)
 rename app/javascript/styles/{material-v2-dark => material-black}/theme/components.scss (73%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/control.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/emoji-picker.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/icons.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-black}/theme/material-icons.scss (93%)
 rename app/javascript/styles/{material-v2-dark => material-black}/theme/media.scss (96%)
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/modal.scss (78%)
 rename app/javascript/styles/{material-v1-light/theme/mobile.scss => material-black/theme/responsive.scss} (58%)
 rename app/javascript/styles/{material-v1-light => material-black}/theme/statuses.scss (98%)
 create mode 100644 app/javascript/styles/material-black/theme/theme.scss
 rename app/javascript/styles/{material-v1-dark => material-black}/theme/variables.scss (100%)
 create mode 100644 app/javascript/styles/material-dark.scss
 create mode 100644 app/javascript/styles/material-dark/color/black.scss
 rename app/javascript/styles/{material-v2-dark => material-dark}/color/mastodon-dark.scss (94%)
 rename app/javascript/styles/{material-v1-light => material-dark}/color/mastodon-light.scss (94%)
 rename app/javascript/styles/{material-v1-dark => material-dark}/color/plus-classic.scss (95%)
 rename app/javascript/styles/{material-v1-light => material-dark}/color/v1-dark.scss (93%)
 rename app/javascript/styles/{material-v2-light => material-dark}/color/v1-light.scss (94%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/color/v2-dark.scss (94%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/color/v2-light.scss (94%)
 rename app/javascript/styles/{material-v1-light => material-dark}/custom_color.scss (100%)
 create mode 100644 app/javascript/styles/material-dark/custom_config.scss
 rename app/javascript/styles/{material-v1-light => material-dark}/custom_layout.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/icon_config.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/layout/material-v1.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/layout/material-v2.scss (89%)
 rename app/javascript/styles/{material-v2-light => material-dark}/loader.scss (62%)
 rename app/javascript/styles/{material-v1-light => material-dark}/plugins/cards.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/plugins/dense.scss (92%)
 rename app/javascript/styles/{material-v1-light => material-dark}/plugins/plus.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/_functions.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/_mixins.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/account.scss (95%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/base_config.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/basics.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/button.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-dark}/theme/columns.scss (90%)
 rename app/javascript/styles/{material-v1-dark => material-dark}/theme/components.scss (73%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/control.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/emoji-picker.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/icons.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/theme/material-icons.scss (93%)
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/media.scss (96%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/theme/modal.scss (78%)
 rename app/javascript/styles/{material-v1-dark/theme/mobile.scss => material-dark/theme/responsive.scss} (58%)
 rename app/javascript/styles/{material-v2-dark => material-dark}/theme/statuses.scss (98%)
 create mode 100644 app/javascript/styles/material-dark/theme/theme.scss
 rename app/javascript/styles/{material-v1-light => material-dark}/theme/variables.scss (100%)
 create mode 100644 app/javascript/styles/material-light.scss
 create mode 100644 app/javascript/styles/material-light/color/black.scss
 rename app/javascript/styles/{material-v2-light => material-light}/color/mastodon-dark.scss (94%)
 rename app/javascript/styles/{material-v2-dark => material-light}/color/mastodon-light.scss (94%)
 rename app/javascript/styles/{material-v2-dark => material-light}/color/plus-classic.scss (95%)
 rename app/javascript/styles/{material-v1-dark => material-light}/color/v1-dark.scss (93%)
 rename app/javascript/styles/{material-v1-light => material-light}/color/v1-light.scss (94%)
 rename app/javascript/styles/{material-v2-light => material-light}/color/v2-dark.scss (94%)
 rename app/javascript/styles/{material-v1-dark => material-light}/color/v2-light.scss (94%)
 rename app/javascript/styles/{material-v2-dark => material-light}/custom_color.scss (100%)
 rename app/javascript/styles/{material-v1-light => material-light}/custom_config.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/custom_layout.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/icon_config.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/layout/material-v1.scss (100%)
 rename app/javascript/styles/{material-v1-dark => material-light}/layout/material-v2.scss (89%)
 rename app/javascript/styles/{material-v1-light => material-light}/loader.scss (62%)
 rename app/javascript/styles/{material-v2-dark => material-light}/plugins/cards.scss (100%)
 rename app/javascript/styles/{material-v2-light => material-light}/plugins/dense.scss (92%)
 rename app/javascript/styles/{material-v2-dark => material-light}/plugins/plus.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/_functions.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/_mixins.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/account.scss (95%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/base_config.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/basics.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/button.scss (100%)
 rename app/javascript/styles/{material-v2-light => material-light}/theme/columns.scss (90%)
 rename app/javascript/styles/{material-v2-light => material-light}/theme/components.scss (73%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/control.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/emoji-picker.scss (100%)
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/icons.scss (100%)
 rename app/javascript/styles/{material-v2-light => material-light}/theme/material-icons.scss (93%)
 rename app/javascript/styles/{material-v1-dark => material-light}/theme/media.scss (96%)
 rename app/javascript/styles/{material-v1-light => material-light}/theme/modal.scss (78%)
 create mode 100644 app/javascript/styles/material-light/theme/responsive.scss
 rename app/javascript/styles/{material-v1-dark => material-light}/theme/statuses.scss (98%)
 create mode 100644 app/javascript/styles/material-light/theme/theme.scss
 rename app/javascript/styles/{material-v2-dark => material-light}/theme/variables.scss (100%)
 delete mode 100644 app/javascript/styles/material-v1-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/plugins/dense.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/material-v1-dark/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-v1-light.scss
 delete mode 100644 app/javascript/styles/material-v1-light/theme/columns.scss
 delete mode 100644 app/javascript/styles/material-v1-light/theme/components.scss
 delete mode 100644 app/javascript/styles/material-v1-light/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-v2-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/custom_config.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/loader.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/theme/mobile.scss
 delete mode 100644 app/javascript/styles/material-v2-dark/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-v2-light.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-v2-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-v2-light/custom_color.scss
 delete mode 100644 app/javascript/styles/material-v2-light/custom_config.scss
 delete mode 100644 app/javascript/styles/material-v2-light/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-v2-light/icon_config.scss
 delete mode 100644 app/javascript/styles/material-v2-light/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/material-v2-light/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/material-v2-light/plugins/cards.scss
 delete mode 100644 app/javascript/styles/material-v2-light/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/_functions.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/account.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/base_config.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/basics.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/button.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/control.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/icons.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/media.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/mobile.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/modal.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/statuses.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-v2-light/theme/variables.scss
 create mode 100644 app/javascript/styles/plus/color/black.scss
 delete mode 100644 app/javascript/styles/plus/theme/mobile.scss
 create mode 100644 app/javascript/styles/plus/theme/responsive.scss

diff --git a/app/javascript/styles/mastodon-material-auto.scss b/app/javascript/styles/mastodon-material-auto.scss
new file mode 100644
index 000000000..189b2891c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-auto.scss
@@ -0,0 +1,2 @@
+@use 'mastodon-material-dark';
+@media (prefers-color-scheme: light) { @import 'mastodon-material-light'; }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
index f35131435..889983ed4 100644
--- a/app/javascript/styles/mastodon-material-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -1,3 +1,2 @@
-@charset "UTF-8";
-
-@import 'mastodon-material-dark/loader'
\ No newline at end of file
+@import 'application';
+@import 'mastodon-material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/black.scss
similarity index 89%
rename from app/javascript/styles/material-v1-light/color/v2-dark.scss
rename to app/javascript/styles/mastodon-material-dark/color/black.scss
index c990d6b1e..b299981b0 100644
--- a/app/javascript/styles/material-v1-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/black.scss
@@ -20,30 +20,35 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
+$background-color: #000000;
+$menu-background-color: #121212;
 $menu-background-hover-color: lighten($menu-background-color, 6%);
 $menu-background-active-color: lighten($menu-background-color, 10%);
 $menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
+$card-background-color: #121212;
 $card-background-hover-color: lighten($card-background-color, 6%);
 $card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
+$list-background-color: #000000;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
-$contained-chip-color: #2e2e2e;
+$contained-chip-color: #1e1e1e;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
+$outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
@@ -89,7 +94,7 @@ $toggle-thumb-active-color: #1a73e8;
 $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
-$border-color: #2e2e2e;
+$border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
@@ -98,7 +103,7 @@ $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
 // App bar color
-$top-bar-color: #272727;
+$top-bar-color: #1e1e1e;
 $search-bar-color: lighten($top-bar-color, 6%);
 $search-bar-focus-color: #ffffff;
 
@@ -110,7 +115,7 @@ $tab-indicator-background-hover-color: transparentize($tab-indicator-active-colo
 $tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
+$text-tab-background-color: #121212;
 $text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
 $text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
 
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/mastodon-material-dark/loader.scss b/app/javascript/styles/mastodon-material-dark/loader.scss
index 04d588001..e962aa921 100644
--- a/app/javascript/styles/mastodon-material-dark/loader.scss
+++ b/app/javascript/styles/mastodon-material-dark/loader.scss
@@ -1,8 +1,3 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/account.scss b/app/javascript/styles/mastodon-material-dark/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/mobile.scss b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
similarity index 58%
rename from app/javascript/styles/mastodon-material-dark/theme/mobile.scss
rename to app/javascript/styles/mastodon-material-dark/theme/responsive.scss
index ed6467ebc..9ae304041 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/mobile.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
@@ -32,7 +32,6 @@
     }
 }
 
-
 #tabs-bar__portal { overflow-y: hidden }
 
 .floating-action-button {
@@ -51,8 +50,45 @@
     .column { margin: 0 !important }
     .search__input { padding: 16px 46px }
 
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/theme.scss b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
index 5b7daddf6..f92276549 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
@@ -1,4 +1,4 @@
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
index 49340df17..5068d6386 100644
--- a/app/javascript/styles/mastodon-material-light.scss
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -1,3 +1,2 @@
-@charset "UTF-8";
-
-@import 'mastodon-material-light/loader'
\ No newline at end of file
+@import 'application';
+@import 'mastodon-material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
new file mode 100644
index 000000000..b299981b0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/color/black.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$background-color: #000000;
+$menu-background-color: #121212;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #121212;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #000000;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #121212;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/mastodon-material-light/loader.scss b/app/javascript/styles/mastodon-material-light/loader.scss
index 04d588001..e962aa921 100644
--- a/app/javascript/styles/mastodon-material-light/loader.scss
+++ b/app/javascript/styles/mastodon-material-light/loader.scss
@@ -1,8 +1,3 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/mastodon-material-light/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/mastodon-material-light/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/mastodon-material-light/theme/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/mastodon-material-light/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/mastodon-material-light/theme/mobile.scss b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
similarity index 58%
rename from app/javascript/styles/mastodon-material-light/theme/mobile.scss
rename to app/javascript/styles/mastodon-material-light/theme/responsive.scss
index ed6467ebc..9ae304041 100644
--- a/app/javascript/styles/mastodon-material-light/theme/mobile.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
@@ -32,7 +32,6 @@
     }
 }
 
-
 #tabs-bar__portal { overflow-y: hidden }
 
 .floating-action-button {
@@ -51,8 +50,45 @@
     .column { margin: 0 !important }
     .search__input { padding: 16px 46px }
 
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/mastodon-material-light/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/theme.scss b/app/javascript/styles/mastodon-material-light/theme/theme.scss
index 5b7daddf6..f92276549 100644
--- a/app/javascript/styles/mastodon-material-light/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/theme.scss
@@ -1,4 +1,4 @@
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-auto.scss b/app/javascript/styles/material-auto.scss
new file mode 100644
index 000000000..116958187
--- /dev/null
+++ b/app/javascript/styles/material-auto.scss
@@ -0,0 +1,2 @@
+@use 'material-dark';
+@media (prefers-color-scheme: light) { @import 'material-light'; }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black.scss b/app/javascript/styles/material-black.scss
new file mode 100644
index 000000000..19f29bc08
--- /dev/null
+++ b/app/javascript/styles/material-black.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'material-black/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
new file mode 100644
index 000000000..b299981b0
--- /dev/null
+++ b/app/javascript/styles/material-black/color/black.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$background-color: #000000;
+$menu-background-color: #121212;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #121212;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #000000;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #121212;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v1-light/color/mastodon-dark.scss
rename to app/javascript/styles/material-black/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/material-v1-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-black/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss b/app/javascript/styles/material-black/color/mastodon-light.scss
similarity index 94%
rename from app/javascript/styles/material-v1-dark/color/mastodon-light.scss
rename to app/javascript/styles/material-black/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/material-v1-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-black/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-light/color/plus-classic.scss b/app/javascript/styles/material-black/color/plus-classic.scss
similarity index 95%
rename from app/javascript/styles/material-v1-light/color/plus-classic.scss
rename to app/javascript/styles/material-black/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/material-v1-light/color/plus-classic.scss
+++ b/app/javascript/styles/material-black/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/material-v2-dark/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
similarity index 93%
rename from app/javascript/styles/material-v2-dark/color/v1-dark.scss
rename to app/javascript/styles/material-black/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/material-v2-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-black/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
similarity index 94%
rename from app/javascript/styles/material-v2-dark/color/v1-light.scss
rename to app/javascript/styles/material-black/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/material-v2-dark/color/v1-light.scss
+++ b/app/javascript/styles/material-black/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-dark/color/v2-dark.scss b/app/javascript/styles/material-black/color/v2-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v1-dark/color/v2-dark.scss
rename to app/javascript/styles/material-black/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/material-v1-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-black/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-light/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
similarity index 94%
rename from app/javascript/styles/material-v1-light/color/v2-light.scss
rename to app/javascript/styles/material-black/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/material-v1-light/color/v2-light.scss
+++ b/app/javascript/styles/material-black/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-dark/custom_color.scss b/app/javascript/styles/material-black/custom_color.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/custom_color.scss
rename to app/javascript/styles/material-black/custom_color.scss
diff --git a/app/javascript/styles/material-v1-dark/custom_config.scss b/app/javascript/styles/material-black/custom_config.scss
similarity index 66%
rename from app/javascript/styles/material-v1-dark/custom_config.scss
rename to app/javascript/styles/material-black/custom_config.scss
index 9b055476b..b85ed3d23 100644
--- a/app/javascript/styles/material-v1-dark/custom_config.scss
+++ b/app/javascript/styles/material-black/custom_config.scss
@@ -2,4 +2,4 @@
 
 
 // Add your settings below
-@import 'color/v1-dark';
\ No newline at end of file
+@import 'color/black';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/custom_layout.scss b/app/javascript/styles/material-black/custom_layout.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/custom_layout.scss
rename to app/javascript/styles/material-black/custom_layout.scss
diff --git a/app/javascript/styles/material-v1-dark/icon_config.scss b/app/javascript/styles/material-black/icon_config.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/icon_config.scss
rename to app/javascript/styles/material-black/icon_config.scss
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v1.scss b/app/javascript/styles/material-black/layout/material-v1.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/layout/material-v1.scss
rename to app/javascript/styles/material-black/layout/material-v1.scss
diff --git a/app/javascript/styles/material-v1-light/layout/material-v2.scss b/app/javascript/styles/material-black/layout/material-v2.scss
similarity index 89%
rename from app/javascript/styles/material-v1-light/layout/material-v2.scss
rename to app/javascript/styles/material-black/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/material-v1-light/layout/material-v2.scss
+++ b/app/javascript/styles/material-black/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/material-v1-dark/loader.scss b/app/javascript/styles/material-black/loader.scss
similarity index 62%
rename from app/javascript/styles/material-v1-dark/loader.scss
rename to app/javascript/styles/material-black/loader.scss
index 04d588001..e962aa921 100644
--- a/app/javascript/styles/material-v1-dark/loader.scss
+++ b/app/javascript/styles/material-black/loader.scss
@@ -1,8 +1,3 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
diff --git a/app/javascript/styles/material-v1-dark/plugins/cards.scss b/app/javascript/styles/material-black/plugins/cards.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/plugins/cards.scss
rename to app/javascript/styles/material-black/plugins/cards.scss
diff --git a/app/javascript/styles/material-v1-light/plugins/dense.scss b/app/javascript/styles/material-black/plugins/dense.scss
similarity index 92%
rename from app/javascript/styles/material-v1-light/plugins/dense.scss
rename to app/javascript/styles/material-black/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/material-v1-light/plugins/dense.scss
+++ b/app/javascript/styles/material-black/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/plugins/plus.scss b/app/javascript/styles/material-black/plugins/plus.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/plugins/plus.scss
rename to app/javascript/styles/material-black/plugins/plus.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/_functions.scss b/app/javascript/styles/material-black/theme/_functions.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/_functions.scss
rename to app/javascript/styles/material-black/theme/_functions.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/_mixins.scss
rename to app/javascript/styles/material-black/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/account.scss b/app/javascript/styles/material-black/theme/account.scss
similarity index 95%
rename from app/javascript/styles/material-v1-dark/theme/account.scss
rename to app/javascript/styles/material-black/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/material-v1-dark/theme/account.scss
+++ b/app/javascript/styles/material-black/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/base_config.scss b/app/javascript/styles/material-black/theme/base_config.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/base_config.scss
rename to app/javascript/styles/material-black/theme/base_config.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/basics.scss b/app/javascript/styles/material-black/theme/basics.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/basics.scss
rename to app/javascript/styles/material-black/theme/basics.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/button.scss
rename to app/javascript/styles/material-black/theme/button.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
similarity index 90%
rename from app/javascript/styles/material-v2-dark/theme/columns.scss
rename to app/javascript/styles/material-black/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/material-v2-dark/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/components.scss b/app/javascript/styles/material-black/theme/components.scss
similarity index 73%
rename from app/javascript/styles/material-v2-dark/theme/components.scss
rename to app/javascript/styles/material-black/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/material-v2-dark/theme/components.scss
+++ b/app/javascript/styles/material-black/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/control.scss b/app/javascript/styles/material-black/theme/control.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/control.scss
rename to app/javascript/styles/material-black/theme/control.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/emoji-picker.scss b/app/javascript/styles/material-black/theme/emoji-picker.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/emoji-picker.scss
rename to app/javascript/styles/material-black/theme/emoji-picker.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/icons.scss b/app/javascript/styles/material-black/theme/icons.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/icons.scss
rename to app/javascript/styles/material-black/theme/icons.scss
diff --git a/app/javascript/styles/material-v1-light/theme/material-icons.scss b/app/javascript/styles/material-black/theme/material-icons.scss
similarity index 93%
rename from app/javascript/styles/material-v1-light/theme/material-icons.scss
rename to app/javascript/styles/material-black/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/material-v1-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-black/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/media.scss b/app/javascript/styles/material-black/theme/media.scss
similarity index 96%
rename from app/javascript/styles/material-v2-dark/theme/media.scss
rename to app/javascript/styles/material-black/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/material-v2-dark/theme/media.scss
+++ b/app/javascript/styles/material-black/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/material-v1-dark/theme/modal.scss b/app/javascript/styles/material-black/theme/modal.scss
similarity index 78%
rename from app/javascript/styles/material-v1-dark/theme/modal.scss
rename to app/javascript/styles/material-black/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/material-v1-dark/theme/modal.scss
+++ b/app/javascript/styles/material-black/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/material-v1-light/theme/mobile.scss b/app/javascript/styles/material-black/theme/responsive.scss
similarity index 58%
rename from app/javascript/styles/material-v1-light/theme/mobile.scss
rename to app/javascript/styles/material-black/theme/responsive.scss
index ed6467ebc..9ae304041 100644
--- a/app/javascript/styles/material-v1-light/theme/mobile.scss
+++ b/app/javascript/styles/material-black/theme/responsive.scss
@@ -32,7 +32,6 @@
     }
 }
 
-
 #tabs-bar__portal { overflow-y: hidden }
 
 .floating-action-button {
@@ -51,8 +50,45 @@
     .column { margin: 0 !important }
     .search__input { padding: 16px 46px }
 
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/statuses.scss b/app/javascript/styles/material-black/theme/statuses.scss
similarity index 98%
rename from app/javascript/styles/material-v1-light/theme/statuses.scss
rename to app/javascript/styles/material-black/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/material-v1-light/theme/statuses.scss
+++ b/app/javascript/styles/material-black/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/theme.scss b/app/javascript/styles/material-black/theme/theme.scss
new file mode 100644
index 000000000..f92276549
--- /dev/null
+++ b/app/javascript/styles/material-black/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/variables.scss b/app/javascript/styles/material-black/theme/variables.scss
similarity index 100%
rename from app/javascript/styles/material-v1-dark/theme/variables.scss
rename to app/javascript/styles/material-black/theme/variables.scss
diff --git a/app/javascript/styles/material-dark.scss b/app/javascript/styles/material-dark.scss
new file mode 100644
index 000000000..8cfd6c6be
--- /dev/null
+++ b/app/javascript/styles/material-dark.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
new file mode 100644
index 000000000..b299981b0
--- /dev/null
+++ b/app/javascript/styles/material-dark/color/black.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$background-color: #000000;
+$menu-background-color: #121212;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #121212;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #000000;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #121212;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
rename to app/javascript/styles/material-dark/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/material-v2-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-light/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
similarity index 94%
rename from app/javascript/styles/material-v1-light/color/mastodon-light.scss
rename to app/javascript/styles/material-dark/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/material-v1-light/color/mastodon-light.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
similarity index 95%
rename from app/javascript/styles/material-v1-dark/color/plus-classic.scss
rename to app/javascript/styles/material-dark/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/material-v1-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-dark/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/material-v1-light/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
similarity index 93%
rename from app/javascript/styles/material-v1-light/color/v1-dark.scss
rename to app/javascript/styles/material-dark/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/material-v1-light/color/v1-dark.scss
+++ b/app/javascript/styles/material-dark/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-light/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
similarity index 94%
rename from app/javascript/styles/material-v2-light/color/v1-light.scss
rename to app/javascript/styles/material-dark/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/material-v2-light/color/v1-light.scss
+++ b/app/javascript/styles/material-dark/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v2-dark/color/v2-dark.scss
rename to app/javascript/styles/material-dark/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/material-v2-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-dark/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
similarity index 94%
rename from app/javascript/styles/material-v2-dark/color/v2-light.scss
rename to app/javascript/styles/material-dark/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/material-v2-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-dark/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-light/custom_color.scss b/app/javascript/styles/material-dark/custom_color.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/custom_color.scss
rename to app/javascript/styles/material-dark/custom_color.scss
diff --git a/app/javascript/styles/material-dark/custom_config.scss b/app/javascript/styles/material-dark/custom_config.scss
new file mode 100644
index 000000000..2a0c9e0fd
--- /dev/null
+++ b/app/javascript/styles/material-dark/custom_config.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+@import 'color/v2-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/custom_layout.scss b/app/javascript/styles/material-dark/custom_layout.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/custom_layout.scss
rename to app/javascript/styles/material-dark/custom_layout.scss
diff --git a/app/javascript/styles/material-v1-light/icon_config.scss b/app/javascript/styles/material-dark/icon_config.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/icon_config.scss
rename to app/javascript/styles/material-dark/icon_config.scss
diff --git a/app/javascript/styles/material-v1-light/layout/material-v1.scss b/app/javascript/styles/material-dark/layout/material-v1.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/layout/material-v1.scss
rename to app/javascript/styles/material-dark/layout/material-v1.scss
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v2.scss b/app/javascript/styles/material-dark/layout/material-v2.scss
similarity index 89%
rename from app/javascript/styles/material-v2-dark/layout/material-v2.scss
rename to app/javascript/styles/material-dark/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/material-v2-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-dark/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/material-v2-light/loader.scss b/app/javascript/styles/material-dark/loader.scss
similarity index 62%
rename from app/javascript/styles/material-v2-light/loader.scss
rename to app/javascript/styles/material-dark/loader.scss
index 04d588001..e962aa921 100644
--- a/app/javascript/styles/material-v2-light/loader.scss
+++ b/app/javascript/styles/material-dark/loader.scss
@@ -1,8 +1,3 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
diff --git a/app/javascript/styles/material-v1-light/plugins/cards.scss b/app/javascript/styles/material-dark/plugins/cards.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/plugins/cards.scss
rename to app/javascript/styles/material-dark/plugins/cards.scss
diff --git a/app/javascript/styles/material-v2-dark/plugins/dense.scss b/app/javascript/styles/material-dark/plugins/dense.scss
similarity index 92%
rename from app/javascript/styles/material-v2-dark/plugins/dense.scss
rename to app/javascript/styles/material-dark/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/material-v2-dark/plugins/dense.scss
+++ b/app/javascript/styles/material-dark/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/plugins/plus.scss b/app/javascript/styles/material-dark/plugins/plus.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/plugins/plus.scss
rename to app/javascript/styles/material-dark/plugins/plus.scss
diff --git a/app/javascript/styles/material-v1-light/theme/_functions.scss b/app/javascript/styles/material-dark/theme/_functions.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/_functions.scss
rename to app/javascript/styles/material-dark/theme/_functions.scss
diff --git a/app/javascript/styles/material-v1-light/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/_mixins.scss
rename to app/javascript/styles/material-dark/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v1-light/theme/account.scss b/app/javascript/styles/material-dark/theme/account.scss
similarity index 95%
rename from app/javascript/styles/material-v1-light/theme/account.scss
rename to app/javascript/styles/material-dark/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/material-v1-light/theme/account.scss
+++ b/app/javascript/styles/material-dark/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/base_config.scss b/app/javascript/styles/material-dark/theme/base_config.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/base_config.scss
rename to app/javascript/styles/material-dark/theme/base_config.scss
diff --git a/app/javascript/styles/material-v1-light/theme/basics.scss b/app/javascript/styles/material-dark/theme/basics.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/basics.scss
rename to app/javascript/styles/material-dark/theme/basics.scss
diff --git a/app/javascript/styles/material-v1-light/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/button.scss
rename to app/javascript/styles/material-dark/theme/button.scss
diff --git a/app/javascript/styles/material-v1-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
similarity index 90%
rename from app/javascript/styles/material-v1-dark/theme/columns.scss
rename to app/javascript/styles/material-dark/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/material-v1-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
similarity index 73%
rename from app/javascript/styles/material-v1-dark/theme/components.scss
rename to app/javascript/styles/material-dark/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/material-v1-dark/theme/components.scss
+++ b/app/javascript/styles/material-dark/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/control.scss b/app/javascript/styles/material-dark/theme/control.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/control.scss
rename to app/javascript/styles/material-dark/theme/control.scss
diff --git a/app/javascript/styles/material-v1-light/theme/emoji-picker.scss b/app/javascript/styles/material-dark/theme/emoji-picker.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/emoji-picker.scss
rename to app/javascript/styles/material-dark/theme/emoji-picker.scss
diff --git a/app/javascript/styles/material-v1-light/theme/icons.scss b/app/javascript/styles/material-dark/theme/icons.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/icons.scss
rename to app/javascript/styles/material-dark/theme/icons.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
similarity index 93%
rename from app/javascript/styles/material-v2-dark/theme/material-icons.scss
rename to app/javascript/styles/material-dark/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/material-v2-dark/theme/material-icons.scss
+++ b/app/javascript/styles/material-dark/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/media.scss b/app/javascript/styles/material-dark/theme/media.scss
similarity index 96%
rename from app/javascript/styles/material-v1-light/theme/media.scss
rename to app/javascript/styles/material-dark/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/material-v1-light/theme/media.scss
+++ b/app/javascript/styles/material-dark/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/material-v2-dark/theme/modal.scss b/app/javascript/styles/material-dark/theme/modal.scss
similarity index 78%
rename from app/javascript/styles/material-v2-dark/theme/modal.scss
rename to app/javascript/styles/material-dark/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/material-v2-dark/theme/modal.scss
+++ b/app/javascript/styles/material-dark/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/material-v1-dark/theme/mobile.scss b/app/javascript/styles/material-dark/theme/responsive.scss
similarity index 58%
rename from app/javascript/styles/material-v1-dark/theme/mobile.scss
rename to app/javascript/styles/material-dark/theme/responsive.scss
index ed6467ebc..9ae304041 100644
--- a/app/javascript/styles/material-v1-dark/theme/mobile.scss
+++ b/app/javascript/styles/material-dark/theme/responsive.scss
@@ -32,7 +32,6 @@
     }
 }
 
-
 #tabs-bar__portal { overflow-y: hidden }
 
 .floating-action-button {
@@ -51,8 +50,45 @@
     .column { margin: 0 !important }
     .search__input { padding: 16px 46px }
 
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/statuses.scss b/app/javascript/styles/material-dark/theme/statuses.scss
similarity index 98%
rename from app/javascript/styles/material-v2-dark/theme/statuses.scss
rename to app/javascript/styles/material-dark/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/material-v2-dark/theme/statuses.scss
+++ b/app/javascript/styles/material-dark/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/theme.scss b/app/javascript/styles/material-dark/theme/theme.scss
new file mode 100644
index 000000000..f92276549
--- /dev/null
+++ b/app/javascript/styles/material-dark/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/variables.scss b/app/javascript/styles/material-dark/theme/variables.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/theme/variables.scss
rename to app/javascript/styles/material-dark/theme/variables.scss
diff --git a/app/javascript/styles/material-light.scss b/app/javascript/styles/material-light.scss
new file mode 100644
index 000000000..9818f14f5
--- /dev/null
+++ b/app/javascript/styles/material-light.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
new file mode 100644
index 000000000..b299981b0
--- /dev/null
+++ b/app/javascript/styles/material-light/color/black.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$background-color: #000000;
+$menu-background-color: #121212;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #121212;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #000000;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #121212;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v2-light/color/mastodon-dark.scss
rename to app/javascript/styles/material-light/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/material-v2-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-light/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
similarity index 94%
rename from app/javascript/styles/material-v2-dark/color/mastodon-light.scss
rename to app/javascript/styles/material-light/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/material-v2-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-light/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
similarity index 95%
rename from app/javascript/styles/material-v2-dark/color/plus-classic.scss
rename to app/javascript/styles/material-light/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/material-v2-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-light/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/material-v1-dark/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
similarity index 93%
rename from app/javascript/styles/material-v1-dark/color/v1-dark.scss
rename to app/javascript/styles/material-light/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/material-v1-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-light/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
similarity index 94%
rename from app/javascript/styles/material-v1-light/color/v1-light.scss
rename to app/javascript/styles/material-light/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/material-v1-light/color/v1-light.scss
+++ b/app/javascript/styles/material-light/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
similarity index 94%
rename from app/javascript/styles/material-v2-light/color/v2-dark.scss
rename to app/javascript/styles/material-light/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/material-v2-light/color/v2-dark.scss
+++ b/app/javascript/styles/material-light/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/material-v1-dark/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
similarity index 94%
rename from app/javascript/styles/material-v1-dark/color/v2-light.scss
rename to app/javascript/styles/material-light/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/material-v1-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-light/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/material-v2-dark/custom_color.scss b/app/javascript/styles/material-light/custom_color.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/custom_color.scss
rename to app/javascript/styles/material-light/custom_color.scss
diff --git a/app/javascript/styles/material-v1-light/custom_config.scss b/app/javascript/styles/material-light/custom_config.scss
similarity index 100%
rename from app/javascript/styles/material-v1-light/custom_config.scss
rename to app/javascript/styles/material-light/custom_config.scss
diff --git a/app/javascript/styles/material-v2-dark/custom_layout.scss b/app/javascript/styles/material-light/custom_layout.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/custom_layout.scss
rename to app/javascript/styles/material-light/custom_layout.scss
diff --git a/app/javascript/styles/material-v2-dark/icon_config.scss b/app/javascript/styles/material-light/icon_config.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/icon_config.scss
rename to app/javascript/styles/material-light/icon_config.scss
diff --git a/app/javascript/styles/material-v2-dark/layout/material-v1.scss b/app/javascript/styles/material-light/layout/material-v1.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/layout/material-v1.scss
rename to app/javascript/styles/material-light/layout/material-v1.scss
diff --git a/app/javascript/styles/material-v1-dark/layout/material-v2.scss b/app/javascript/styles/material-light/layout/material-v2.scss
similarity index 89%
rename from app/javascript/styles/material-v1-dark/layout/material-v2.scss
rename to app/javascript/styles/material-light/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/material-v1-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-light/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/material-v1-light/loader.scss b/app/javascript/styles/material-light/loader.scss
similarity index 62%
rename from app/javascript/styles/material-v1-light/loader.scss
rename to app/javascript/styles/material-light/loader.scss
index 04d588001..e962aa921 100644
--- a/app/javascript/styles/material-v1-light/loader.scss
+++ b/app/javascript/styles/material-light/loader.scss
@@ -1,8 +1,3 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
diff --git a/app/javascript/styles/material-v2-dark/plugins/cards.scss b/app/javascript/styles/material-light/plugins/cards.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/plugins/cards.scss
rename to app/javascript/styles/material-light/plugins/cards.scss
diff --git a/app/javascript/styles/material-v2-light/plugins/dense.scss b/app/javascript/styles/material-light/plugins/dense.scss
similarity index 92%
rename from app/javascript/styles/material-v2-light/plugins/dense.scss
rename to app/javascript/styles/material-light/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/material-v2-light/plugins/dense.scss
+++ b/app/javascript/styles/material-light/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/plugins/plus.scss b/app/javascript/styles/material-light/plugins/plus.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/plugins/plus.scss
rename to app/javascript/styles/material-light/plugins/plus.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/_functions.scss b/app/javascript/styles/material-light/theme/_functions.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/_functions.scss
rename to app/javascript/styles/material-light/theme/_functions.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/_mixins.scss
rename to app/javascript/styles/material-light/theme/_mixins.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/account.scss b/app/javascript/styles/material-light/theme/account.scss
similarity index 95%
rename from app/javascript/styles/material-v2-dark/theme/account.scss
rename to app/javascript/styles/material-light/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/material-v2-dark/theme/account.scss
+++ b/app/javascript/styles/material-light/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/base_config.scss b/app/javascript/styles/material-light/theme/base_config.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/base_config.scss
rename to app/javascript/styles/material-light/theme/base_config.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/basics.scss b/app/javascript/styles/material-light/theme/basics.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/basics.scss
rename to app/javascript/styles/material-light/theme/basics.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/button.scss
rename to app/javascript/styles/material-light/theme/button.scss
diff --git a/app/javascript/styles/material-v2-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
similarity index 90%
rename from app/javascript/styles/material-v2-light/theme/columns.scss
rename to app/javascript/styles/material-light/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/material-v2-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
similarity index 73%
rename from app/javascript/styles/material-v2-light/theme/components.scss
rename to app/javascript/styles/material-light/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/material-v2-light/theme/components.scss
+++ b/app/javascript/styles/material-light/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/control.scss b/app/javascript/styles/material-light/theme/control.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/control.scss
rename to app/javascript/styles/material-light/theme/control.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/emoji-picker.scss b/app/javascript/styles/material-light/theme/emoji-picker.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/emoji-picker.scss
rename to app/javascript/styles/material-light/theme/emoji-picker.scss
diff --git a/app/javascript/styles/material-v2-dark/theme/icons.scss b/app/javascript/styles/material-light/theme/icons.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/icons.scss
rename to app/javascript/styles/material-light/theme/icons.scss
diff --git a/app/javascript/styles/material-v2-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
similarity index 93%
rename from app/javascript/styles/material-v2-light/theme/material-icons.scss
rename to app/javascript/styles/material-light/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/material-v2-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-light/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/media.scss b/app/javascript/styles/material-light/theme/media.scss
similarity index 96%
rename from app/javascript/styles/material-v1-dark/theme/media.scss
rename to app/javascript/styles/material-light/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/material-v1-dark/theme/media.scss
+++ b/app/javascript/styles/material-light/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/material-v1-light/theme/modal.scss b/app/javascript/styles/material-light/theme/modal.scss
similarity index 78%
rename from app/javascript/styles/material-v1-light/theme/modal.scss
rename to app/javascript/styles/material-light/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/material-v1-light/theme/modal.scss
+++ b/app/javascript/styles/material-light/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/material-light/theme/responsive.scss b/app/javascript/styles/material-light/theme/responsive.scss
new file mode 100644
index 000000000..9ae304041
--- /dev/null
+++ b/app/javascript/styles/material-light/theme/responsive.scss
@@ -0,0 +1,94 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/statuses.scss b/app/javascript/styles/material-light/theme/statuses.scss
similarity index 98%
rename from app/javascript/styles/material-v1-dark/theme/statuses.scss
rename to app/javascript/styles/material-light/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/material-v1-dark/theme/statuses.scss
+++ b/app/javascript/styles/material-light/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/theme.scss b/app/javascript/styles/material-light/theme/theme.scss
new file mode 100644
index 000000000..f92276549
--- /dev/null
+++ b/app/javascript/styles/material-light/theme/theme.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/variables.scss b/app/javascript/styles/material-light/theme/variables.scss
similarity index 100%
rename from app/javascript/styles/material-v2-dark/theme/variables.scss
rename to app/javascript/styles/material-light/theme/variables.scss
diff --git a/app/javascript/styles/material-v1-dark.scss b/app/javascript/styles/material-v1-dark.scss
deleted file mode 100644
index e7071bb85..000000000
--- a/app/javascript/styles/material-v1-dark.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-
-@import 'material-v1-dark/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss b/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
deleted file mode 100644
index de22c451b..000000000
--- a/app/javascript/styles/material-v1-dark/color/mastodon-dark.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #42485a;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/color/v1-light.scss b/app/javascript/styles/material-v1-dark/color/v1-light.scss
deleted file mode 100644
index 4000eead0..000000000
--- a/app/javascript/styles/material-v1-dark/color/v1-light.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/plugins/dense.scss b/app/javascript/styles/material-v1-dark/plugins/dense.scss
deleted file mode 100644
index 42417124b..000000000
--- a/app/javascript/styles/material-v1-dark/plugins/dense.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__tab { margin: 8px auto 8px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    &__buttons { height: 48px }
-
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form__publish { padding-top: 8px }
-}
-
-.status {
-    padding: 8px 8px 8px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/material-icons.scss b/app/javascript/styles/material-v1-dark/theme/material-icons.scss
deleted file mode 100644
index 51631eab5..000000000
--- a/app/javascript/styles/material-v1-dark/theme/material-icons.scss
+++ /dev/null
@@ -1,156 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
-    height: 18px;
-    width: 18px;
-    transition: background-position .3s steps(1);
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-dark/theme/theme.scss b/app/javascript/styles/material-v1-dark/theme/theme.scss
deleted file mode 100644
index 5b7daddf6..000000000
--- a/app/javascript/styles/material-v1-dark/theme/theme.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light.scss b/app/javascript/styles/material-v1-light.scss
deleted file mode 100644
index b56b4408a..000000000
--- a/app/javascript/styles/material-v1-light.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-
-@import 'material-v1-light/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/columns.scss b/app/javascript/styles/material-v1-light/theme/columns.scss
deleted file mode 100644
index a6892adf2..000000000
--- a/app/javascript/styles/material-v1-light/theme/columns.scss
+++ /dev/null
@@ -1,502 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable { background: $list-background-color }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-
-    > button {
-        padding: 16px 0 16px 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px 12px;
-        border-radius: 50%;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-background-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-background-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $background-color;
-    padding: 12px 16px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $background-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-background-hover-color }
-
-    &:active,
-    &:focus { background: $list-background-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-background-active-color;
-
-            &:hover { background: $menu-background-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-background-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $search-bar-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-background-color;
-    font-size: 16px;
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-background-inactive-color;
-
-    &--unread {
-        background: $list-background-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-background-hover-color }
-}
-
-.getting-started {
-    background: $background-color;
-    color: $ui-text-color;
-
-    &__wrapper {
-        background: $background-color;
-        height: auto !important;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $background-color;
-        margin-bottom: 0;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-background-color;
-    padding: 0;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination { color: $ui-text-color }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-.reactions-bar {
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-background-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-    
-        button {
-            background: $tab-background-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-background-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/components.scss b/app/javascript/styles/material-v1-light/theme/components.scss
deleted file mode 100644
index 4f844229c..000000000
--- a/app/javascript/styles/material-v1-light/theme/components.scss
+++ /dev/null
@@ -1,394 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-background-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-background-color;
-
-        &.darker {
-            background: $card-background-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-background-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-background-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-background-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-background-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-background-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-background-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $card-background-color;
-            color: $ui-text-color;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-background-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-background-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-background-active-color }
-            }
-        }
-    }
-
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    .compose-form {
-        &__warning {
-            @include shadow-1dp;
-            color: $secondary-text-color;
-            background: $card-background-color;
-            padding: 16px;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__buttons-wrapper {
-            background: $card-background-color;
-            color: $tips-text-color;
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 12px }
-
-            select {
-                color: $ui-text-color;
-                background-color: $background-color;
-                border: 0;
-
-                &:focus { border-color: $border-active-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
-
-                &:hover { background-color: $outlined-button-hover-color }
-
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
-
-
-            }
-        }
-
-        &__utilBtns { padding-top: 0 }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
-
-
-.poll {
-    &__input {
-        border: 2px solid $control-border-color;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $background-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-active-color }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $poll-bar-color;
-    
-        &.leading { background: $poll-bar-leading-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-background-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-background-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-background-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    @include shadow-1dp;
-    border-radius: $card-radius;
-    background: $card-background-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content { color: $primary-text-color }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v1-light/theme/theme.scss b/app/javascript/styles/material-v1-light/theme/theme.scss
deleted file mode 100644
index 5b7daddf6..000000000
--- a/app/javascript/styles/material-v1-light/theme/theme.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark.scss b/app/javascript/styles/material-v2-dark.scss
deleted file mode 100644
index 6a342731c..000000000
--- a/app/javascript/styles/material-v2-dark.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-
-@import 'material-v2-dark/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/custom_config.scss b/app/javascript/styles/material-v2-dark/custom_config.scss
deleted file mode 100644
index c0e23398a..000000000
--- a/app/javascript/styles/material-v2-dark/custom_config.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/v2-dark';
-
-@import 'layout/material-v2';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/loader.scss b/app/javascript/styles/material-v2-dark/loader.scss
deleted file mode 100644
index 04d588001..000000000
--- a/app/javascript/styles/material-v2-dark/loader.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/mobile.scss b/app/javascript/styles/material-v2-dark/theme/mobile.scss
deleted file mode 100644
index ed6467ebc..000000000
--- a/app/javascript/styles/material-v2-dark/theme/mobile.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-dark/theme/theme.scss b/app/javascript/styles/material-v2-dark/theme/theme.scss
deleted file mode 100644
index 5b7daddf6..000000000
--- a/app/javascript/styles/material-v2-dark/theme/theme.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light.scss b/app/javascript/styles/material-v2-light.scss
deleted file mode 100644
index e8875d39d..000000000
--- a/app/javascript/styles/material-v2-light.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8";
-
-@import 'material-v2-light/loader'
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/mastodon-light.scss b/app/javascript/styles/material-v2-light/color/mastodon-light.scss
deleted file mode 100644
index 134b18e10..000000000
--- a/app/javascript/styles/material-v2-light/color/mastodon-light.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/plus-classic.scss b/app/javascript/styles/material-v2-light/color/plus-classic.scss
deleted file mode 100644
index 3e817cde4..000000000
--- a/app/javascript/styles/material-v2-light/color/plus-classic.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v1-dark.scss b/app/javascript/styles/material-v2-light/color/v1-dark.scss
deleted file mode 100644
index 652ffe37e..000000000
--- a/app/javascript/styles/material-v2-light/color/v1-dark.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-
-// Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$verified-background-color: darken($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/color/v2-light.scss b/app/javascript/styles/material-v2-light/color/v2-light.scss
deleted file mode 100644
index 6fd1dea9e..000000000
--- a/app/javascript/styles/material-v2-light/color/v2-light.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@charset "UTF-8";
-
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-
-// Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$verified-background-color: lighten($verified-color, 20%);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
-$control-border-color: $icon-color;
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
-
-// App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_color.scss b/app/javascript/styles/material-v2-light/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-v2-light/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_config.scss b/app/javascript/styles/material-v2-light/custom_config.scss
deleted file mode 100644
index 38d8cd324..000000000
--- a/app/javascript/styles/material-v2-light/custom_config.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/v2-light';
-
-@import 'layout/material-v2';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/custom_layout.scss b/app/javascript/styles/material-v2-light/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-v2-light/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/icon_config.scss b/app/javascript/styles/material-v2-light/icon_config.scss
deleted file mode 100644
index 610c7e308..000000000
--- a/app/javascript/styles/material-v2-light/icon_config.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v1.scss b/app/javascript/styles/material-v2-light/layout/material-v1.scss
deleted file mode 100644
index 825deaf8c..000000000
--- a/app/javascript/styles/material-v2-light/layout/material-v1.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/layout/material-v2.scss b/app/javascript/styles/material-v2-light/layout/material-v2.scss
deleted file mode 100644
index 6c81dc3e4..000000000
--- a/app/javascript/styles/material-v2-light/layout/material-v2.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
-
-
-// Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/plugins/cards.scss b/app/javascript/styles/material-v2-light/plugins/cards.scss
deleted file mode 100644
index c134cbeeb..000000000
--- a/app/javascript/styles/material-v2-light/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $background-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-background-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-background-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/plugins/plus.scss b/app/javascript/styles/material-v2-light/plugins/plus.scss
deleted file mode 100644
index 5b220631b..000000000
--- a/app/javascript/styles/material-v2-light/plugins/plus.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/_functions.scss b/app/javascript/styles/material-v2-light/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/material-v2-light/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/_mixins.scss b/app/javascript/styles/material-v2-light/theme/_mixins.scss
deleted file mode 100644
index 5f573e339..000000000
--- a/app/javascript/styles/material-v2-light/theme/_mixins.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
diff --git a/app/javascript/styles/material-v2-light/theme/account.scss b/app/javascript/styles/material-v2-light/theme/account.scss
deleted file mode 100644
index 44d68d1e9..000000000
--- a/app/javascript/styles/material-v2-light/theme/account.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: 50%;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__header {
-        &__bar {
-            background: $card-background-color;
-            padding: 8px;
-            border-bottom: 1px solid $border-color;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    border: none;
-                    border-radius: 50%;
-                    padding: 0;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-background-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-background-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-    }
-
-    &__section-headline {
-        background: $text-tab-background-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-background-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-background-hover-color }
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/base_config.scss b/app/javascript/styles/material-v2-light/theme/base_config.scss
deleted file mode 100644
index 73ff009e1..000000000
--- a/app/javascript/styles/material-v2-light/theme/base_config.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/basics.scss b/app/javascript/styles/material-v2-light/theme/basics.scss
deleted file mode 100644
index 4c122d1c6..000000000
--- a/app/javascript/styles/material-v2-light/theme/basics.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body { background: $background-color }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/button.scss b/app/javascript/styles/material-v2-light/theme/button.scss
deleted file mode 100644
index 1231bac98..000000000
--- a/app/javascript/styles/material-v2-light/theme/button.scss
+++ /dev/null
@@ -1,97 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
-        }
-    }
-
-    &.overlayed {
-        border-radius: 50%;
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-    
-        &:hover {
-            background: $media-icon-background-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &:hover {
-        color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
-    }
-
-    &:active,
-    &:focus { background-color: transparent }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 12px;
-
-    &:hover {
-        background-color: $icon-background-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button,
-.button:active,
-.button:focus {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-}
-
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
-
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
-
-    &:hover { background: $contained-button-hover-color }
-
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
-
-.button.button--block { margin: 8px 0 }
-
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-background-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/control.scss b/app/javascript/styles/material-v2-light/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/material-v2-light/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/emoji-picker.scss b/app/javascript/styles/material-v2-light/theme/emoji-picker.scss
deleted file mode 100644
index 70e22752d..000000000
--- a/app/javascript/styles/material-v2-light/theme/emoji-picker.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-background-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-background-color;
-        }
-    }
-
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
-    &-anchor {
-        padding: 10px 4px;
-
-        &-selected {
-            color: $icon-button-active-color;
-        }
-
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
-
-        &:hover {
-            color: $icon-button-hover-color;
-        }
-    }
-
-    &-search {
-        background: $menu-background-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-background-color;
-    }
-
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-background-color;
-    }
-
-    &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/icons.scss b/app/javascript/styles/material-v2-light/theme/icons.scss
deleted file mode 100644
index 1367647ec..000000000
--- a/app/javascript/styles/material-v2-light/theme/icons.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
-.fa.fa-lock { text-transform: none }
-
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/media.scss b/app/javascript/styles/material-v2-light/theme/media.scss
deleted file mode 100644
index 28de8db85..000000000
--- a/app/javascript/styles/material-v2-light/theme/media.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery { border-radius: $card-radius }
-
-.media-modal__close {
-    align-content: center;
-
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        text-align: center !important;
-        font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
-
-        &:hover {
-            background: $media-icon-background-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw { width: 24px }
-    }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-background-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/mobile.scss b/app/javascript/styles/material-v2-light/theme/mobile.scss
deleted file mode 100644
index ed6467ebc..000000000
--- a/app/javascript/styles/material-v2-light/theme/mobile.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/modal.scss b/app/javascript/styles/material-v2-light/theme/modal.scss
deleted file mode 100644
index 287dcf804..000000000
--- a/app/javascript/styles/material-v2-light/theme/modal.scss
+++ /dev/null
@@ -1,84 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-    width: 280px;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-background-color;
-        padding: 8px;
-    }
-}
-
-.actions-modal {
-    background: $card-background-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-background-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-background-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    background: $card-background-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/statuses.scss b/app/javascript/styles/material-v2-light/theme/statuses.scss
deleted file mode 100644
index 65b5fcc41..000000000
--- a/app/javascript/styles/material-v2-light/theme/statuses.scss
+++ /dev/null
@@ -1,185 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 12px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-background-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &:hover { background-color: $card-background-color }
-}
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-background-color;
-    padding: 16px;
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-background-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 12px 0;
-    }
-
-    &__button {
-        .icon-button { font-size: 20px !important }
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color !important }
-    &__account { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/theme.scss b/app/javascript/styles/material-v2-light/theme/theme.scss
deleted file mode 100644
index 5b7daddf6..000000000
--- a/app/javascript/styles/material-v2-light/theme/theme.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
diff --git a/app/javascript/styles/material-v2-light/theme/variables.scss b/app/javascript/styles/material-v2-light/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/material-v2-light/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus.scss b/app/javascript/styles/plus.scss
index a78e9e34e..9cbccaa5f 100644
--- a/app/javascript/styles/plus.scss
+++ b/app/javascript/styles/plus.scss
@@ -1,3 +1,2 @@
-@charset "UTF-8";
-
-@import 'plus/loader'
\ No newline at end of file
+@import 'application';
+@import 'plus/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
new file mode 100644
index 000000000..b299981b0
--- /dev/null
+++ b/app/javascript/styles/plus/color/black.scss
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$background-color: #000000;
+$menu-background-color: #121212;
+$menu-background-hover-color: lighten($menu-background-color, 6%);
+$menu-background-active-color: lighten($menu-background-color, 10%);
+$menu-background-active-hover-color: lighten($menu-background-color, 16%);
+$card-background-color: #121212;
+$card-background-hover-color: lighten($card-background-color, 6%);
+$card-background-inactive-color: lighten($card-background-color, 10%);
+$list-background-color: #000000;
+$list-background-hover-color: lighten($list-background-color, 6%);
+$list-background-active-color: lighten($list-background-color, 10%);
+$list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
+$verified-background-color: darken($verified-color, 20%);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-background-hover-color: transparentize(#ffffff, 0.8);
+$icon-background-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-background-color: transparentize(#000000, 0.5);
+$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$control-border-color: $icon-color;
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-active-color: lighten($border-color, 30%);
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-background-color: $top-bar-color;
+$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-background-color: #121212;
+$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Poll chart color
+$poll-bar-leading-color: $primary-color;
+$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
+$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
index de22c451b..c3c168316 100644
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4ea2df;
 $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #191b22;
@@ -34,6 +35,7 @@ $list-background-color: #282c37;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
index 134b18e10..54d894fec 100644
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -19,6 +19,7 @@ $link-text-color: #217aba;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #eff3f5;
@@ -33,6 +34,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -43,6 +45,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
index 3e817cde4..60c8370a2 100644
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
index 652ffe37e..77cef824f 100644
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #303030;
@@ -34,16 +35,20 @@ $list-background-color: #424242;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
 $contained-chip-selected-color: lighten($contained-chip-color, 12%);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -76,7 +81,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
index 4000eead0..64f8d5842 100644
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #fafafa;
@@ -34,6 +35,7 @@ $list-background-color: #ffffff;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
index c990d6b1e..8c575bce5 100644
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #121212;
@@ -34,6 +35,7 @@ $list-background-color: #1e1e1e;
 $list-background-hover-color: lighten($list-background-color, 6%);
 $list-background-active-color: lighten($list-background-color, 10%);
 $list-background-inactive-color: lighten($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: darken($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
 $outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -77,7 +82,7 @@ $outlined-button-active-color: lighten($primary-color, 30%);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
+$floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
 $floating-action-button-icon-color: #ffffff;
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
index 6fd1dea9e..20336e96d 100644
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -20,6 +20,7 @@ $link-text-color: #4285f4;
 $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
 
 // Background-color
 $background-color: #ffffff;
@@ -34,6 +35,7 @@ $list-background-color: $background-color;
 $list-background-hover-color: darken($list-background-color, 6%);
 $list-background-active-color: darken($list-background-color, 10%);
 $list-background-inactive-color: darken($list-background-color, 10%);
+$text-field-background-color: $card-background-color;
 $verified-background-color: lighten($verified-color, 20%);
 
 // Chip color
@@ -44,6 +46,9 @@ $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
 $outlined-chip-selected-color: darken($outlined-chip-color, 12%);
 
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
 // Badge color
 $badge-color: $primary-color;
 //$badge-color: $secondary-color;
@@ -80,7 +85,7 @@ $text-button-focus-color: transparentize($text-button-color, 0.7);
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $secondary-color;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
index 6c81dc3e4..853d82b15 100644
--- a/app/javascript/styles/plus/layout/material-v2.scss
+++ b/app/javascript/styles/plus/layout/material-v2.scss
@@ -52,11 +52,6 @@ $avater-radius: 50%;  // Rounded cropping
 
     &:hover { background: $outlined-chip-hover-color !important }
 }
-.relationship-tag,
-.account-role {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-}
 
 
 // Button shadow
diff --git a/app/javascript/styles/plus/loader.scss b/app/javascript/styles/plus/loader.scss
index ab6ad96b5..e962aa921 100644
--- a/app/javascript/styles/plus/loader.scss
+++ b/app/javascript/styles/plus/loader.scss
@@ -1,12 +1,7 @@
-@charset "UTF-8";
-
-
-@import '../application';
-
 @import 'theme/theme';
 @import 'theme/material-icons';
 
 // Plugins
-@import 'plugins/cards';
-@import 'plugins/dense';
-@import 'plugins/plus';
\ No newline at end of file
+//@import 'plugins/cards';
+//@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
index 42417124b..b3ba40812 100644
--- a/app/javascript/styles/plus/plugins/dense.scss
+++ b/app/javascript/styles/plus/plugins/dense.scss
@@ -60,4 +60,6 @@
     &__action-bar { padding: 10px 0 }
 }
 
+.reply-indicator { padding: 8px }
+
 .button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
index 44d68d1e9..34a8a1816 100644
--- a/app/javascript/styles/plus/theme/account.scss
+++ b/app/javascript/styles/plus/theme/account.scss
@@ -112,6 +112,8 @@
                 }
             }
         }
+
+        &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
@@ -142,4 +144,10 @@
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index a6892adf2..54effffd3 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -198,15 +198,10 @@
 
 .setting-text {
     color: $primary-text-color;
-    background: $search-bar-color;
+    background: $text-field-background-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
-
-    &:focus {
-        @include shadow-1dp;
-        background: $search-bar-focus-color;
-    }
 }
 
 .empty-column-indicator {
@@ -375,7 +370,18 @@
         &__unread { background: $badge-color }
     }
 
-    &__pagination { color: $ui-text-color }
+    &__pagination {
+        color: $ui-text-color;
+        padding: 8px 16px;
+        bottom: 8px;
+
+        .icon-button {
+            font-size: 20px !important;
+            width: 20px !important;
+            height: 20px !important;
+            margin: 0 8px;
+        }
+    }
 }
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
@@ -458,45 +464,11 @@
 
 .relationship-tag {
     color: $ui-text-color;
-    background-color: $contained-chip-color;
+    background-color: $relationship-tag-color;
     font-size: 12px;
     border-radius: 17px;
     padding: 4px 8px;
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
-
-.focusable {
-    &:focus { background: $card-background-color }
-}
-
-// single column mode
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper { padding-top: 0 }
-    }
-
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
-        margin: 12px 12px 0;
-    }
-}
-
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
-        }
-    }
-}
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
index 4f844229c..ae5bfe158 100644
--- a/app/javascript/styles/plus/theme/components.scss
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -173,8 +173,9 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $card-background-color;
+            background: $text-field-background-color;
             color: $ui-text-color;
+            border-radius: $card-radius;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -230,7 +231,7 @@
         &__poll-wrapper {
             border-top: 1px solid $border-color;
 
-            ul { padding: 12px }
+            ul { padding: 16px 12px 16px 0 }
 
             select {
                 color: $ui-text-color;
@@ -272,17 +273,31 @@
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
+        margin: 8px;
+
+        &.checkbox { border-radius: 2px }
+
+        &:focus,
+        &:hover { border: 2px solid $control-border-color }
     }
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $background-color;
+        background: $text-field-background-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
         &:focus { border-color: $border-active-color }
     }
 
+    &__option input[type=text] {
+        color: $primary-text-color;
+        background: $text-field-background-color;
+        border: none;
+        border-radius: 2px;
+        padding: 8px 16px;
+    }
+
     &__chart {
         border-radius: 0;
         background: $poll-bar-color;
@@ -368,7 +383,8 @@
 }
 
 .reply-indicator {
-    @include shadow-1dp;
+    box-shadow: none;
+    border: 1px solid $border-color;
     border-radius: $card-radius;
     background: $card-background-color;
     padding: 16px;
@@ -391,4 +407,128 @@
     &__list a { color: $secondary-text-color }
 
     &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $background-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-background-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-background-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    background: $card-background-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-background-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
index 51631eab5..747856253 100644
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -151,6 +151,9 @@
 .no-reduce-motion button.icon-button i.fa-retweet {
     height: 18px;
     width: 18px;
-    transition: background-position .3s steps(1);
+    transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
\ No newline at end of file
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
index 28de8db85..9d0203828 100644
--- a/app/javascript/styles/plus/theme/media.scss
+++ b/app/javascript/styles/plus/theme/media.scss
@@ -5,7 +5,11 @@
 @import 'mixins';
 
 
-.media-gallery { border-radius: $card-radius }
+.media-gallery {
+    border-radius: 0;
+
+    &__item { border-radius: 0 }
+}
 
 .media-modal__close {
     align-content: center;
diff --git a/app/javascript/styles/plus/theme/mobile.scss b/app/javascript/styles/plus/theme/mobile.scss
deleted file mode 100644
index ed6467ebc..000000000
--- a/app/javascript/styles/plus/theme/mobile.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon .fa {
-        top: 16px;
-        left: 16px;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
index 287dcf804..2748c8723 100644
--- a/app/javascript/styles/plus/theme/modal.scss
+++ b/app/javascript/styles/plus/theme/modal.scss
@@ -9,7 +9,7 @@
     background: $card-background-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 280px;
+    width: 300px;
 
     &__container {
         text-align: left;
@@ -21,6 +21,24 @@
         background: $card-background-color;
         padding: 8px;
     }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
 }
 
 .actions-modal {
diff --git a/app/javascript/styles/plus/theme/responsive.scss b/app/javascript/styles/plus/theme/responsive.scss
new file mode 100644
index 000000000..9ae304041
--- /dev/null
+++ b/app/javascript/styles/plus/theme/responsive.scss
@@ -0,0 +1,94 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels__main {
+        @include shadow-1dp;
+        padding: 0;
+    }
+}
+
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-background-hover-color;
+            border-bottom-color: $tab-background-color;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-background-focus-color;
+            border-bottom-color: $tab-background-color;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
index 65b5fcc41..eedf77c2a 100644
--- a/app/javascript/styles/plus/theme/statuses.scss
+++ b/app/javascript/styles/plus/theme/statuses.scss
@@ -180,6 +180,6 @@
 
 // search user trends
 .display-name {
-    &__html { color: $primary-text-color !important }
+    &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/theme.scss b/app/javascript/styles/plus/theme/theme.scss
index 5b7daddf6..f92276549 100644
--- a/app/javascript/styles/plus/theme/theme.scss
+++ b/app/javascript/styles/plus/theme/theme.scss
@@ -1,4 +1,4 @@
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'mobile', 'modal', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d4b77535e..8ec4c7a52 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1244,12 +1244,13 @@ en:
     mastodon-light: Mastodon (Light)
     mastodon-auto: Mastodon (Auto)
     # additional theme
-    material-v1-dark: Material v1 (Dark)
-    material-v1-light: Material v1 (Light)
-    material-v2-dark: Material v2 (Dark)
-    material-v2-light: Material v2 (Light)
+    material-black: Material (Black)
+    material-dark: Material (Dark)
+    material-light: Material (Light)
+    material-auto: Material (Auto)
     mastodon-material-dark: Mastodon Material (Dark)
     mastodon-material-light: Mastodon Material (Light)
+    mastodon-material-auto: Mastodon Material (Auto)
     plus: Plus
   time:
     formats:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 699902665..7fd351f03 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1226,12 +1226,13 @@ ja:
     mastodon-light: Mastodon (ライト)
     mastodon-auto: Mastodon (自動)
     # 追加テーマ
-    material-v1-dark: Material v1 (ダーク)
-    material-v1-light: Material v1 (ライト)
-    material-v2-dark: Material v2 (ダーク)
-    material-v2-light: Material v2 (ライト)
+    material-black: Material (黒)
+    material-dark: Material (ダーク)
+    material-light: Material (ライト)
+    material-auto: Material (自動)
     mastodon-material-dark: Mastodon Material (ダーク)
     mastodon-material-light: Mastodon Material (ライト)
+    mastodon-material-auto: Mastodon Material (自動)
     plus: Plus
   time:
     formats:
diff --git a/config/themes.yml b/config/themes.yml
index 5f6a22a6e..ff3d800aa 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -4,10 +4,11 @@ mastodon-light: styles/mastodon-light.scss
 mastodon-auto: styles/mastodon-auto.scss
 
 # 追加テーマ
-material-v1-dark: styles/material-v1-dark.scss
-material-v1-light: styles/material-v1-light.scss
-material-v2-dark: styles/material-v2-dark.scss
-material-v2-light: styles/material-v2-light.scss
+material-black: styles/material-black.scss
+material-dark: styles/material-dark.scss
+material-light: styles/material-light.scss
+material-auto: styles/material-auto.scss
 mastodon-material-dark: styles/mastodon-material-dark.scss
 mastodon-material-light: styles/mastodon-material-light.scss
+mastodon-material-auto: styles/mastodon-material-auto.scss
 plus: styles/plus.scss

From 59fa1ea5503b3fe30fef754e61d80d15cab70be0 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Wed, 17 Jun 2020 21:27:44 +0900
Subject: [PATCH 045/200] set mastodon-auto theme as a default

---
 config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/settings.yml b/config/settings.yml
index 002473643..fc22c2813 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -29,7 +29,7 @@ defaults: &defaults
   show_application: true
   system_font_ui: false
   noindex: false
-  theme: 'default'
+  theme: 'mastodon-auto'
   aggregate_reblogs: true
   advanced_layout: false
   use_blurhash: true

From fa3f78e4bf1b5e2b6e8b11f161dd3c02348bf3d4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 23 Jun 2020 02:57:00 +0200
Subject: [PATCH 046/200] Fix other sessions not being logged out on password
 change

While OAuth tokens were immediately revoked, accessing the home
controller immediately generated new OAuth tokens and "revived"
the session due to a combination of using remember_me tokens and
overwriting the `authenticate_user!` method
---
 app/controllers/auth/passwords_controller.rb     | 5 ++++-
 app/controllers/auth/registrations_controller.rb | 8 +++++++-
 app/controllers/home_controller.rb               | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index b98bcecd0..5db2668f7 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -8,7 +8,10 @@ class Auth::PasswordsController < Devise::PasswordsController
 
   def update
     super do |resource|
-      resource.session_activations.destroy_all if resource.errors.empty?
+      if resource.errors.empty?
+        resource.session_activations.destroy_all
+        resource.forget_me!
+      end
     end
   end
 
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 78feb1631..d31966248 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Auth::RegistrationsController < Devise::RegistrationsController
+  include Devise::Controllers::Rememberable
+
   layout :determine_layout
 
   before_action :set_invite, only: [:new, :create]
@@ -24,7 +26,11 @@ class Auth::RegistrationsController < Devise::RegistrationsController
 
   def update
     super do |resource|
-      resource.clear_other_sessions(current_session.session_id) if resource.saved_change_to_encrypted_password?
+      if resource.saved_change_to_encrypted_password?
+        resource.clear_other_sessions(current_session.session_id)
+        resource.forget_me!
+        remember_me(resource)
+      end
     end
   end
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 7c8a18d17..702889cd0 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class HomeController < ApplicationController
+  before_action :redirect_unauthenticated_to_permalinks!
   before_action :authenticate_user!
   before_action :set_referrer_policy_header
 
@@ -10,7 +11,7 @@ class HomeController < ApplicationController
 
   private
 
-  def authenticate_user!
+  def redirect_unauthenticated_to_permalinks!
     return if user_signed_in?
 
     matches = request.path.match(/\A\/web\/(statuses|accounts)\/([\d]+)\z/)
@@ -35,6 +36,7 @@ class HomeController < ApplicationController
     end
 
     matches = request.path.match(%r{\A/web/timelines/tag/(?<tag>.+)\z})
+
     redirect_to(matches ? tag_path(CGI.unescape(matches[:tag])) : default_redirect_path)
   end
 

From 951e997b26cb5bf93539a22221efda97ad70079e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Jun 2020 00:21:03 +0200
Subject: [PATCH 047/200] Change rate limits for various paths

- Rate limit login attempts by target account
- Rate limit password resets and e-mail re-confirmations by target account
- Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before
---
 config/initializers/rack_attack.rb         | 37 +++++++++++++++-------
 config/initializers/rack_attack_logging.rb |  1 +
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 09458c540..cd29afac5 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -38,15 +38,6 @@ class Rack::Attack
     end
   end
 
-  PROTECTED_PATHS = %w(
-    /auth/sign_in
-    /auth
-    /auth/password
-    /auth/confirmation
-  ).freeze
-
-  PROTECTED_PATHS_REGEX = Regexp.union(PROTECTED_PATHS.map { |path| /\A#{Regexp.escape(path)}/ })
-
   Rack::Attack.safelist('allow from localhost') do |req|
     req.remote_ip == '127.0.0.1' || req.remote_ip == '::1'
   end
@@ -86,8 +77,32 @@ class Rack::Attack
     req.authenticated_user_id if (req.post? && req.path =~ API_DELETE_REBLOG_REGEX) || (req.delete? && req.path =~ API_DELETE_STATUS_REGEX)
   end
 
-  throttle('protected_paths', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && req.path =~ PROTECTED_PATHS_REGEX
+  throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
+    req.remote_ip if req.post? && req.path == '/auth'
+  end
+
+  throttle('throttle_password_resets/ip', limit: 25, period: 5.minutes) do |req|
+    req.remote_ip if req.post? && req.path == '/auth/password'
+  end
+
+  throttle('throttle_password_resets/email', limit: 5, period: 30.minutes) do |req|
+    req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/password'
+  end
+
+  throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
+    req.remote_ip if req.post? && req.path == '/auth/confirmation'
+  end
+
+  throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
+    req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/password'
+  end
+
+  throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
+    req.remote_ip if req.post? && req.path == '/auth/sign_in'
+  end
+
+  throttle('throttle_login_attempts/email', limit: 25, period: 1.hour) do |req|
+    req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/sign_in'
   end
 
   self.throttled_response = lambda do |env|
diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb
index c30bd8a64..ab4822e96 100644
--- a/config/initializers/rack_attack_logging.rb
+++ b/config/initializers/rack_attack_logging.rb
@@ -2,5 +2,6 @@ ActiveSupport::Notifications.subscribe(/rack_attack/) do |_name, _start, _finish
   req = payload[:request]
 
   next unless [:throttle, :blacklist].include? req.env['rack.attack.match_type']
+
   Rails.logger.info("Rate limit hit (#{req.env['rack.attack.match_type']}): #{req.ip} #{req.request_method} #{req.fullpath}")
 end

From 2d2e3651eee12364b53f658077dae9343aca5e09 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 22 Jun 2020 21:09:18 +0200
Subject: [PATCH 048/200] Fix media attachment enumeration

Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>
---
 app/controllers/media_proxy_controller.rb     |  5 ++-
 spec/controllers/media_controller_spec.rb     |  3 +-
 .../media_proxy_controller_spec.rb            | 42 +++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 spec/controllers/media_proxy_controller_spec.rb

diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb
index 014b89de1..e36673fc4 100644
--- a/app/controllers/media_proxy_controller.rb
+++ b/app/controllers/media_proxy_controller.rb
@@ -2,6 +2,7 @@
 
 class MediaProxyController < ApplicationController
   include RoutingHelper
+  include Authorization
 
   skip_before_action :store_current_location
   skip_before_action :require_functional!
@@ -10,12 +11,14 @@ class MediaProxyController < ApplicationController
 
   rescue_from ActiveRecord::RecordInvalid, with: :not_found
   rescue_from Mastodon::UnexpectedResponseError, with: :not_found
+  rescue_from Mastodon::NotPermittedError, with: :not_found
   rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error
 
   def show
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        @media_attachment = MediaAttachment.remote.find(params[:id])
+        @media_attachment = MediaAttachment.remote.attached.find(params[:id])
+        authorize @media_attachment.status, :show?
         redownload! if @media_attachment.needs_redownload? && !reject_media?
       else
         raise Mastodon::RaceConditionError
diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb
index ac44a76f2..2925aed59 100644
--- a/spec/controllers/media_controller_spec.rb
+++ b/spec/controllers/media_controller_spec.rb
@@ -28,9 +28,8 @@ describe MediaController do
     end
 
     it 'raises when not permitted to view' do
-      status = Fabricate(:status)
+      status = Fabricate(:status, visibility: :direct)
       media_attachment = Fabricate(:media_attachment, status: status)
-      allow_any_instance_of(MediaController).to receive(:authorize).and_raise(ActiveRecord::RecordNotFound)
       get :show, params: { id: media_attachment.to_param }
 
       expect(response).to have_http_status(404)
diff --git a/spec/controllers/media_proxy_controller_spec.rb b/spec/controllers/media_proxy_controller_spec.rb
new file mode 100644
index 000000000..32510cf43
--- /dev/null
+++ b/spec/controllers/media_proxy_controller_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe MediaProxyController do
+  render_views
+
+  before do
+    stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
+  end
+
+  describe '#show' do
+    it 'redirects when attached to a status' do
+      status = Fabricate(:status)
+      media_attachment = Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png')
+      get :show, params: { id: media_attachment.id }
+
+      expect(response).to have_http_status(302)
+    end
+
+    it 'responds with missing when there is not an attached status' do
+      media_attachment = Fabricate(:media_attachment, status: nil, remote_url: 'http://example.com/attachment.png')
+      get :show, params: { id: media_attachment.id }
+
+      expect(response).to have_http_status(404)
+    end
+
+    it 'raises when id cant be found' do
+      get :show, params: { id: 'missing' }
+
+      expect(response).to have_http_status(404)
+    end
+
+    it 'raises when not permitted to view' do
+      status = Fabricate(:status, visibility: :direct)
+      media_attachment = Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png')
+      get :show, params: { id: media_attachment.id }
+
+      expect(response).to have_http_status(404)
+    end
+  end
+end

From 661f3f26b041dd6f1f0ea646e55616f7139bb957 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 7 Jul 2020 15:22:47 +0200
Subject: [PATCH 049/200] Bump version to 3.1.5

---
 CHANGELOG.md            | 7 +++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0110936..6296f0016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [v3.1.5] - 2020-07-07
+### Security
+
+- Fix media attachment enumeration ([ThibG](https://github.com/tootsuite/mastodon/pull/14254))
+- Change rate limits for various paths ([Gargron](https://github.com/tootsuite/mastodon/pull/14253))
+- Fix other sessions not being logged out on password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14252))
+
 ## [v3.1.4] - 2020-05-14
 ### Added
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f73b8805a..49523520d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      4
+      5
     end
 
     def flags

From 19ec3bc6e3e625fe5dbd0e7c7688eee5b5b41732 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Tue, 4 Aug 2020 23:36:06 +0900
Subject: [PATCH 050/200] fix not to use @extend

---
 app/javascript/styles/mastodon/accessibility.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/accessibility.scss b/app/javascript/styles/mastodon/accessibility.scss
index c5bcb5941..a4040f736 100644
--- a/app/javascript/styles/mastodon/accessibility.scss
+++ b/app/javascript/styles/mastodon/accessibility.scss
@@ -7,7 +7,7 @@ $emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
 .emojione {
   @each $emoji in $emojis-requiring-inversion {
     &[title=':#{$emoji}:'] {
-      @extend %emoji-color-inversion;
+      filter: invert(1);
     }
   }
 }

From f417d634e7575797948c40a89c77aea29e1857ff Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 27 Sep 2020 19:58:24 +0900
Subject: [PATCH 051/200] =?UTF-8?q?Mastodon=20Material=E6=96=B0=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fonts/MaterialIcons-Regular.ttf           | Bin 0 -> 230384 bytes
 .../fonts/MaterialIcons-Regular.woff2         | Bin 44300 -> 0 bytes
 .../styles/mastodon-material-dark.scss        |   7 +
 .../mastodon-material-dark/color/black.scss   |  63 +++----
 .../color/mastodon-dark.scss                  |  67 ++++----
 .../color/mastodon-light.scss                 |  63 +++----
 .../color/plus-classic.scss                   |  67 ++++----
 .../mastodon-material-dark/color/v1-dark.scss |  69 ++++----
 .../color/v1-light.scss                       |  67 ++++----
 .../mastodon-material-dark/color/v2-dark.scss |  63 +++----
 .../color/v2-light.scss                       |  73 ++++----
 .../mastodon-material-dark/icon_config.scss   |  20 ++-
 .../layout/material-v1.scss                   |  12 +-
 .../layout/material-v2.scss                   |  23 ++-
 .../mastodon-material-dark/plugins/cards.scss |   6 +-
 .../mastodon-material-dark/plugins/plus.scss  |   5 +-
 .../mastodon-material-dark/theme/_mixins.scss | 161 ++++++++++++++++++
 .../mastodon-material-dark/theme/account.scss |  42 ++++-
 .../theme/base_config.scss                    |  22 ++-
 .../mastodon-material-dark/theme/basics.scss  |   8 +-
 .../mastodon-material-dark/theme/button.scss  |  37 +++-
 .../mastodon-material-dark/theme/columns.scss |  75 ++++----
 .../theme/components.scss                     | 159 ++++++++++++-----
 .../theme/emoji-picker.scss                   |  32 ++--
 .../mastodon-material-dark/theme/icons.scss   |  18 --
 .../theme/material-icons.scss                 |  62 ++++++-
 .../mastodon-material-dark/theme/media.scss   |  18 +-
 .../mastodon-material-dark/theme/modal.scss   |  14 +-
 .../theme/responsive.scss                     |   8 +-
 .../theme/statuses.scss                       |  23 ++-
 .../styles/mastodon-material-light.scss       |   7 +
 .../mastodon-material-light/color/black.scss  |  63 +++----
 .../color/mastodon-dark.scss                  |  67 ++++----
 .../color/mastodon-light.scss                 |  63 +++----
 .../color/plus-classic.scss                   |  67 ++++----
 .../color/v1-dark.scss                        |  69 ++++----
 .../color/v1-light.scss                       |  67 ++++----
 .../color/v2-dark.scss                        |  63 +++----
 .../color/v2-light.scss                       |  73 ++++----
 .../mastodon-material-light/icon_config.scss  |  20 ++-
 .../layout/material-v1.scss                   |  12 +-
 .../layout/material-v2.scss                   |  23 ++-
 .../plugins/cards.scss                        |   6 +-
 .../mastodon-material-light/plugins/plus.scss |   5 +-
 .../theme/_mixins.scss                        | 161 ++++++++++++++++++
 .../theme/account.scss                        |  42 ++++-
 .../theme/base_config.scss                    |  22 ++-
 .../mastodon-material-light/theme/basics.scss |   8 +-
 .../mastodon-material-light/theme/button.scss |  37 +++-
 .../theme/columns.scss                        |  75 ++++----
 .../theme/components.scss                     | 159 ++++++++++++-----
 .../theme/emoji-picker.scss                   |  32 ++--
 .../mastodon-material-light/theme/icons.scss  |  18 --
 .../theme/material-icons.scss                 |  62 ++++++-
 .../mastodon-material-light/theme/media.scss  |  18 +-
 .../mastodon-material-light/theme/modal.scss  |  14 +-
 .../theme/responsive.scss                     |   8 +-
 .../theme/statuses.scss                       |  23 ++-
 app/javascript/styles/material-black.scss     |   7 +
 .../styles/material-black/color/black.scss    |  63 +++----
 .../material-black/color/mastodon-dark.scss   |  67 ++++----
 .../material-black/color/mastodon-light.scss  |  63 +++----
 .../material-black/color/plus-classic.scss    |  67 ++++----
 .../styles/material-black/color/v1-dark.scss  |  69 ++++----
 .../styles/material-black/color/v1-light.scss |  67 ++++----
 .../styles/material-black/color/v2-dark.scss  |  63 +++----
 .../styles/material-black/color/v2-light.scss |  73 ++++----
 .../styles/material-black/icon_config.scss    |  20 ++-
 .../material-black/layout/material-v1.scss    |  12 +-
 .../material-black/layout/material-v2.scss    |  23 ++-
 .../styles/material-black/plugins/cards.scss  |   6 +-
 .../styles/material-black/plugins/plus.scss   |   5 +-
 .../styles/material-black/theme/_mixins.scss  | 161 ++++++++++++++++++
 .../styles/material-black/theme/account.scss  |  42 ++++-
 .../material-black/theme/base_config.scss     |  22 ++-
 .../styles/material-black/theme/basics.scss   |   8 +-
 .../styles/material-black/theme/button.scss   |  37 +++-
 .../styles/material-black/theme/columns.scss  |  75 ++++----
 .../material-black/theme/components.scss      | 159 ++++++++++++-----
 .../material-black/theme/emoji-picker.scss    |  32 ++--
 .../styles/material-black/theme/icons.scss    |  18 --
 .../material-black/theme/material-icons.scss  |  62 ++++++-
 .../styles/material-black/theme/media.scss    |  18 +-
 .../styles/material-black/theme/modal.scss    |  14 +-
 .../material-black/theme/responsive.scss      |   8 +-
 .../styles/material-black/theme/statuses.scss |  23 ++-
 app/javascript/styles/material-dark.scss      |   7 +
 .../styles/material-dark/color/black.scss     |  63 +++----
 .../material-dark/color/mastodon-dark.scss    |  67 ++++----
 .../material-dark/color/mastodon-light.scss   |  63 +++----
 .../material-dark/color/plus-classic.scss     |  67 ++++----
 .../styles/material-dark/color/v1-dark.scss   |  69 ++++----
 .../styles/material-dark/color/v1-light.scss  |  67 ++++----
 .../styles/material-dark/color/v2-dark.scss   |  63 +++----
 .../styles/material-dark/color/v2-light.scss  |  73 ++++----
 .../styles/material-dark/icon_config.scss     |  20 ++-
 .../material-dark/layout/material-v1.scss     |  12 +-
 .../material-dark/layout/material-v2.scss     |  23 ++-
 .../styles/material-dark/plugins/cards.scss   |   6 +-
 .../styles/material-dark/plugins/plus.scss    |   5 +-
 .../styles/material-dark/theme/_mixins.scss   | 161 ++++++++++++++++++
 .../styles/material-dark/theme/account.scss   |  42 ++++-
 .../material-dark/theme/base_config.scss      |  22 ++-
 .../styles/material-dark/theme/basics.scss    |   8 +-
 .../styles/material-dark/theme/button.scss    |  37 +++-
 .../styles/material-dark/theme/columns.scss   |  75 ++++----
 .../material-dark/theme/components.scss       | 159 ++++++++++++-----
 .../material-dark/theme/emoji-picker.scss     |  32 ++--
 .../styles/material-dark/theme/icons.scss     |  18 --
 .../material-dark/theme/material-icons.scss   |  62 ++++++-
 .../styles/material-dark/theme/media.scss     |  18 +-
 .../styles/material-dark/theme/modal.scss     |  14 +-
 .../material-dark/theme/responsive.scss       |   8 +-
 .../styles/material-dark/theme/statuses.scss  |  23 ++-
 app/javascript/styles/material-light.scss     |   7 +
 .../styles/material-light/color/black.scss    |  63 +++----
 .../material-light/color/mastodon-dark.scss   |  67 ++++----
 .../material-light/color/mastodon-light.scss  |  63 +++----
 .../material-light/color/plus-classic.scss    |  67 ++++----
 .../styles/material-light/color/v1-dark.scss  |  69 ++++----
 .../styles/material-light/color/v1-light.scss |  67 ++++----
 .../styles/material-light/color/v2-dark.scss  |  63 +++----
 .../styles/material-light/color/v2-light.scss |  73 ++++----
 .../styles/material-light/icon_config.scss    |  20 ++-
 .../material-light/layout/material-v1.scss    |  12 +-
 .../material-light/layout/material-v2.scss    |  23 ++-
 .../styles/material-light/plugins/cards.scss  |   6 +-
 .../styles/material-light/plugins/plus.scss   |   5 +-
 .../styles/material-light/theme/_mixins.scss  | 161 ++++++++++++++++++
 .../styles/material-light/theme/account.scss  |  42 ++++-
 .../material-light/theme/base_config.scss     |  22 ++-
 .../styles/material-light/theme/basics.scss   |   8 +-
 .../styles/material-light/theme/button.scss   |  37 +++-
 .../styles/material-light/theme/columns.scss  |  75 ++++----
 .../material-light/theme/components.scss      | 159 ++++++++++++-----
 .../material-light/theme/emoji-picker.scss    |  32 ++--
 .../styles/material-light/theme/icons.scss    |  18 --
 .../material-light/theme/material-icons.scss  |  62 ++++++-
 .../styles/material-light/theme/media.scss    |  18 +-
 .../styles/material-light/theme/modal.scss    |  14 +-
 .../material-light/theme/responsive.scss      |   8 +-
 .../styles/material-light/theme/statuses.scss |  23 ++-
 app/javascript/styles/plus.scss               |   7 +
 app/javascript/styles/plus/color/black.scss   |  63 +++----
 .../styles/plus/color/mastodon-dark.scss      |  67 ++++----
 .../styles/plus/color/mastodon-light.scss     |  63 +++----
 .../styles/plus/color/plus-classic.scss       |  67 ++++----
 app/javascript/styles/plus/color/v1-dark.scss |  69 ++++----
 .../styles/plus/color/v1-light.scss           |  67 ++++----
 app/javascript/styles/plus/color/v2-dark.scss |  63 +++----
 .../styles/plus/color/v2-light.scss           |  73 ++++----
 app/javascript/styles/plus/icon_config.scss   |  20 ++-
 .../styles/plus/layout/material-v1.scss       |  12 +-
 .../styles/plus/layout/material-v2.scss       |  23 ++-
 app/javascript/styles/plus/loader.scss        |   6 +-
 app/javascript/styles/plus/plugins/cards.scss |   6 +-
 app/javascript/styles/plus/plugins/plus.scss  |   5 +-
 app/javascript/styles/plus/theme/_mixins.scss | 161 ++++++++++++++++++
 app/javascript/styles/plus/theme/account.scss |  42 ++++-
 .../styles/plus/theme/base_config.scss        |  22 ++-
 app/javascript/styles/plus/theme/basics.scss  |   8 +-
 app/javascript/styles/plus/theme/button.scss  |  37 +++-
 app/javascript/styles/plus/theme/columns.scss |  75 ++++----
 .../styles/plus/theme/components.scss         | 159 ++++++++++++-----
 .../styles/plus/theme/emoji-picker.scss       |  32 ++--
 app/javascript/styles/plus/theme/icons.scss   |  18 --
 .../styles/plus/theme/material-icons.scss     |  62 ++++++-
 app/javascript/styles/plus/theme/media.scss   |  18 +-
 app/javascript/styles/plus/theme/modal.scss   |  14 +-
 .../styles/plus/theme/responsive.scss         |   8 +-
 .../styles/plus/theme/statuses.scss           |  23 ++-
 171 files changed, 5001 insertions(+), 2709 deletions(-)
 create mode 100644 app/javascript/fonts/MaterialIcons-Regular.ttf
 delete mode 100644 app/javascript/fonts/MaterialIcons-Regular.woff2

diff --git a/app/javascript/fonts/MaterialIcons-Regular.ttf b/app/javascript/fonts/MaterialIcons-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e50801b3b620af91f824c7655df7d064db05b764
GIT binary patch
literal 230384
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%0D=4-1II4$y1WQr6D85bgn
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%0A%0v|f`yjCi}jQ&OPE|UNSLcP
zB*7GpObJ?}E-NT0{2|^>YB#rGvXNuFA<H9FSops}K3iJ(E;nQX3{2{SZhwXamy-)q
z;%lIiw;}N%9A;At+&Wq;u@BA@4LT#q(D~)mFx*1%bP;#iH?crj(eTWCa2_>a@ulBD
zc_xsTxOW`wJt^uZmrUy&W8foFoy+?V-EqeuL`CpNCOL-Uece1$1A(3q-peln$N}f0
z^iBof1A+`nNip!E$Zoi%ATO)2J7VhciO_*|`rgr)Dy1gm|F%|MTX0XH641@Nery3V
zwA@oUu##?9YNMH%1r^jGdwqiO+30|=bSNkbauYFF{D(zg`mW|j)1Bs%)19q7d|k6Z
zT1IDYlnw@S0N~UZh+Yr<R4hd6w_gyB1zeF|6S2e7PolxmN1Jzn_?o-;y2(9oe-1rn
zmcak+%mU(U5;)riqzS~~=y@U$Y9A>UK|l1IkWTNuQ>X6JQ$WxIsB_c%qtW-@)WMRF
z;MxQ2<0+mr&`sGAz~k8QSugD0UnOyzamn1+?`=gfuMdPT+dx`7oa^eO73S}m5LM|z
zHK$Owhcv_fx(1gB0_BYtz(tn`y4WLOf~!uXxhO=d5b@OSHl>TKv$3%OJ*ZDqbH_c1
zg3|TrKSRFHk1cJ);;rtuhyK)t>jlwOxt-5y1Kog~7fHEX`_La0Is)rysF=ZzVbkBx
zD8uY!1t7BM69w87fXG<RS`dPuEgB3+;6EqXWRL-E%1}B1+v0{jZowiemZcAlfPZYY
zx!!E9v|5x<#CHJ3+h@gyY9Wsp@C*iY>=-YKYN2`RV461YA0%xRjf&}|zwzfATt<Ky
z5k|TQpJ=?VZ)|kh{Z&5G^ix_-9-B2djLk=CGJF^P)K=-M#*)+X6A(@s_@bK$^p+%s
zctQ+@!V?NRK9eg3<){fNFVaS%kMPSF-R#(^*99GsV3u#MypLf>mSqsC=KyzlF+W2k
z8KBE>has4-{&!sJjPg|e)JHq1REIVwUq{E^!PEJ_cIL>DGk6(#+$ApUONhY&b&ila
zC6$O8!>r8h@_O|uU@ZSs0yixd6(cKF5uigu3jTLnqWDYRg^Ci(IfX>g`oSc7W71Lc
ztJUi|DbJ+rRsSR!nJ7(M_m)&_dfvG}<@D?`F{QHL%~^{H!TG^t|H-6d)*n7|B(V_k
zRvONUz?ma^%JY#ZO1J<2z*S^&K*A%6p8?_#0-9tEqCVt)UF)COp5fAJHo4o1p_qFc
z@}dNlI2>O=L!CHwVq8%nU*@`@Cys-wm@**V=`LhlGi^MZjx$s1M{b=4QB@=K2c~T$
z)o9Sb!|`=;)0cIx7{rk+XBf8ykYn34FxV(rnIuyVL#ED8jDG7@YU|?G4O-m9faHwJ
zuSz1r5+14t!z{104IdGlMB9U95e7`RBA*d!uVmUnuqKUWve5_+csX|FRPEHR-PcF`
z!um?K9Ta@gNXAM1T1T7BU8go3NM>I@vSmQu&7u5zj#+-LkGwK!U$BZIikuGU{$fHv
zSRh79dJPQIlo&zNVgvOzLrRz>xqEjKufrT0)lO-VYvOuIu+=@u#GXBg<jI9I2)k!U
zT{2?a5T2vA`BM3!>Sb+8x>-Cb!1z6H)njT3vnKkR9%UkX|JR|aR*uG^5R=M*0p~J8
zR6Er|a+jjy0<xb5QuvoaKl7h+OPQ&Pn&f_yE)p0Kx!1ND3z8FI8@C`CRd?}`2#GpN
zj7K5s!jm~uS8(`Yu_dHWsW)HA@dtsQ&bE1@-OK!cTel=fK6Fx|{^qn?;Z~4}{a3sT
zQq`|~2lBT-gkc(hKu>=$^e^(XkwikzNPZ9FS@}Ev3``(K#$HraN?KR54=-o4Yj`!Y
zSv8ww9!aW2e3CDscCuOY8>W{>?T{gN6RCTKr-gD;^~4_BmFjbh;6-af>K^j7p<%;Y
z)PvBu0?DPvTH3`8?pne}4H3=|1+11D1gaN7C#VvzWu#at)iPH6A&F8DN)7^h_0*g4
zndr*cp4a<)HoNTW|2$jkuY66(y6<yVQ@`QqrR|E(=d~Rqyf5K$f60DZznldf1B8GT
z;p_@U$v5i!dfyg&zBiqEeO{c-lvmD-z5hX9|1r8ETS&<EoSb%hZ**o;AM!kvwttT<
z*?|fIn8H#bsJWrrM4^`Fiw%h12(jz%a4<;y?efy{^3pm<_ptZA^yu<3mZyz{LYqNM
znO;wVViWlq5Ld<?3GoK+21TOY&}<c|d3G6P1ddThXwIh}#?l}cQtfzM9xclQCt7GK
zi_vL@KuV$+r?He=H)sICLQrs>9vhYjL5W*8_qkzW%M3#vw9VebWXv;B_^<wt^y|mc
z7ma$->-^I%khMU!zzDEqpJKnxew9lCVJu{f0*;6EI8r&RTPo{-KdJ=7jR35+xOnU0
z;(f>>XtnNXHmO<5yXeTRi_A^O-gHJI(UnecLZ{OmB6JXV>PCpFIX)#1pr_o}nJBb&
zU9IM^N+3+7VyQTo9`Prmqk(8qmeQjjNX1-4D%u=Y_qIHV<ZfYi$QO@<r^>>Zl8i_x
zQE*$`;P_^I%ADo6<xT*``w0VZ1Je-*BnKI!G%oUr%L3Vc%@`2wMj!_wP9PFMDDfg|
zNKwK*m<YZ(Qx);f?ZsHbXkMqN#@B852#-2k1Na3XhQ3%7aibCZ2Htpq---gXM1jrQ
zCUTKvv0g$E;d9!=@rc)Ni`s$#>GbT;J4^K<3iyqt$}X#QUt`Sbce$9=<ModwW<2g)
zc3U#29KQXqy!+Jdh%f1M+Mf1Uvs2Z_s?!;3(4H<&+%qwb{tp#9+p~9n-QjlZKD=LZ
zIqa%87ulbr;&Y)`EVQ>ZS&A1%N8EyIOf99y>#w~gF+2<fI3AiCO?jBt`3oa;tIgrD
zS|f$so{!s->CxHA#l=at8%(S;l~;z)l8ss2R{KOOk%*1kt$5fmNntT%)cyc+GHuX%
zZP~2DC2*Nh0@~|#2%b}m4h+C}5%ryzI07ni>ao3V_yJyL_p*t-{YSY@P=CYT$9{m<
z*}eTg*_%)~vO<LcG4jJK$77?7C6E;bh)Ql=xL8eW#e_#Tk(WW`KeLdGgj;tb41g;<
zS`*j`Ed4Lp203??s^2#~{V%8IudPgza6MhQcE0~b-Ypw<Hm!_?hDH9i5kp!b5k7}o
zlT(KK*}A}AZfzu+W6OwcGmV$=&|9G+*kN~4trk3ri~H2(hzaSHs%Ci5F0RG1Nr@VP
z7n-U9NlKeM#E|@cyuTKmtwn45rCvBz27?9X>#D2V`O-su2s{hlKz^PtmF9~Yd?%zv
z!t++vqn=~^&e~d!%BJDF*nn)^0Y>}@NKz?s_l<xOiV&qJD2DtbGOF|IjwZnKCO(Mz
zVzBo`f-LNP7HtG!^I|r36pqahtX?X3Wf|#QpK(R)ulEM%Gz)y69HAX+H8l(QYqXX;
zN&fbMm5#v0Uc(4bl#b?r8<uoMqmF`2@cLru<ryho(gjFxHu@Gfs|$G+u88x)mHBER
z5-TR8T)iwaQGgw2uByR|+(zC6)hh24s`C|O8&)92C5o|c#Zo?I6Edap*ikf_SV@Hb
z!YsINTKBop9X%&$b;KHPSO8ml6G?H{Z1BET_^6c!ND}q^Bn|_ij6@=CLm2=dZYu(`
z5)g5rfPe|9$;1MP9nfl02T-gnnS3`kcy$=$_n<)t48$aEuh9lhh%JUe<QRmW>cUfT
z`3BUn8sbDt0t&MlW;!NK9Thd_T_-!@(W#SnIWJYOy|#*a^Vi=a9+^6Mw|Hslh`1l8
z-{NfD({k>o((}%NJJ3Xsm|@=F3fE8ie%^Wab)(+Yb$2^2(ZkTyzvRrGxJSH{b^g3~
z&xuhnKbjYRUca^nM7#+bi)k>?HGOmLAV!gKgRAP8twFut)c+eeZtiozbDeVaFF;$N
zc$toRsr}N*OYrYdj2$7$=06xs`TUW;d;18kD$sUY5Si9w8G-?yoHnHJ4!CWUxS?6r
z45HHv@gB}sfW(I5x<;6#2N0AnZe^C;!t)w`cHcg4iLfD<`F*aNuyLW08=Y&6ex`il
zd}|e$l&Lsab_5<FxkGa3s8z5ga}$JSYKsAho0cjZ0pEa*f>Icb+-#{N3S=t99ijGf
zY-)56oPPFf@n5P{>F{o3eGN%(SZ@^1-&{OWJ#@G#4I%IAFj|Vd0idi}%3Qlrd4$A4
z#GP42(xL!{2JQypAP~<3tkECH1aWxI4P`UeSa)~f-UfaOCZ0ZM_1S$kFLT)(Hcv^s
zA!Se9AeKC~Xh?SF+~J7bCV0FKn>`YC<!wCO^DTV)O9T5~!ZpyuQ3#45d)dj{ZssgU
z%VF6w>X8L2!q5fmUe6O89_ACwCoo&*M=)7kI8U3Lw@}>>NPa*>oyy6wIbgJT(aNxj
z!05?4A8epu-5NR0#o|YF8llHrUBYz;`FM~TLtYy1<7~VO;1%#A&YH8rK0QBQs8kBs
z?6BYeyHr8A1w(c95V|6C=kqgfn;I#c$qq-xBNupK;&<~Bz>s!L$<p-nZsEuz76?8P
zay62942}xmgh^p+27ZvbK`%fh^nL6DZCFn&CRSD|3rHgbnK9f{gdq$cNupd?p@vTV
z&(kOROj~Ta+~)urV3`nrf;Gs3OAb(?cOsA0tjTq9rjW`D5G>W8fzO!UU7Lb1G?*f_
z4~o9TTsR#>QQ4vB@#xT#+3R`S#ByC-%4(XH{UDoQ@klP1iawr*9-j{Ro@8wv(bxai
z`mrpGh!RY+8^FF<uvjh%lz2J>v4utn?H`O!WClPF3VnsCaIg7^ZNMWa+KyXsRck|V
z3%Al<BILB)%23dP)onq3lD#e;XU7ExiA)ZmVYS|heJYH{ZnZgy&N*#$#+K+Hpvzn=
z2M^@uq1_6))k8uQP)Y!4F1m0GS&;-%NSzJlITkp#{_LL0;}vu&8lJDBhmksmppv;c
z<+=mcDZBN=-j(sa$bAm)tL_`7en$JQYs}3xesNC8<&?d+uW3T!MPn%7q9ARiJf00L
zXZ4iUPo{R?-!Yod&<tAGhSkCYee|f763W@pd~LFQecAw1h8V!#*~U!aBg64eC7I|J
zh1Y=XO9)_+@J^-L*fagF7OL@XLa@#DNw-~lk$C@$FVOxAk6??%Gp7j=eW=Jw1$m1^
z6e(>Jg@Z`+KnxDa?*LZBv|@`&ni`zZ^<(p|jV|qHZ2wa9we#uYGQ2Q_Bf-a?vRa>d
zJb2{cd~y27oGPRRb?(Sew3x4CRKMS^W-5koO0Go((oTa@HMrpm1%+b_?nAMO3jBR_
z)Qhe+MA9LU!MZ7ta5&<0-DK+U1_9i7x}3sZ^trx}$|P?c3k)BM9+1mVyL`VH3TJ$O
zI<d=k`+_w)lq!`{$q>p*p_BqUO_0-*y7aaxFEP}gy*`;tRYwm+4jica{;C?wk3O_}
zf=MHhELyINhLS1Rg2-pu?}ZW?Kv%;XmoF{s`|SH5Lm{Ypu<w~}xJHSDRdQ&GXm=!v
zQ4|EEc_#GG-%xtBp_hF5+aAlfytd=sKfXt;Mi@Ju+~<=*iE#RtLUG5?<oRTW2Q9s$
zhf=(*r)5<w*c_io?nB<M>>Emi-0s?I&nE$eP0-dZXkv^EJSddUQyL+%!7z*^1(xQK
zy({lX2t<ASh05-1vYB_5BAH4BW!y)+wc}gafgL>gbgG#T#?<*rcBrtk?v2GFfM0zF
z6F{!~ET9?>4uFPDfEpPA6%YwjB1PJU{zAx)C{b2pEVO#}2c-YdePWDg+a2upl5gyx
z>DxLtwZ-9fmDI5(dg!64GNFGc`Nk$&(Nz<TM^{kW7BXq_azT`<A}X+KP`E2RW}B6O
zmX7gKKyRHGPmddaH_#%&{KBgO{ef{}B0Vwj0x3g)2h5|X-||{VX3I4N26f$oAELql
zRTknD^J!1@T9D&wtDbAWf$U6P-V+tG^m?wSphd1slR6Nu0@m-;+bMQ%NAZG2y1SA-
zzD*q$(%p9YIIh-)sbdv71Npg#hL}?TGI9B%KTX8~wjQ{%zK+l4bLz^`w;*$Pa2>Py
z4=lFqlV|(C{o7~H{@@2^(~qGz*0=PJFZ|%9A$%kPLL<N!Y`UPx1we2$oax|P2V=yU
z21LjX-L0*gqIKhiQCACwxfzp0zI4}-m18G(R7>-lPk!@Xb$iOzycvNp5IG?$hzMqu
z5Yk-dfnW7%Z(AJ9GdrSWFb=|sRrXZ~XGO~d;RP9-NP$5GY)m|7l>w`MHK;hen?h|<
zYG{)Nqa@s=N&lGNGjx9};YKq^D%ApkWVWbr0p+_;VA^BS>72Ki7?rMF;?-JI^6Mo2
znYU>IP^s{@u5;a-bcHK~f}4_q?qb+7N6Y1lWsQ3}fs>Th2I_-=4ni9|oo*HGV2}Gf
zNo+U&>#KtJ72PhZmfJ9wGf>_(ay?d|5|i7P*bOW%OLyLRN#=zC+N-N!6a>HpO+XWP
z4v<-ZuVi9ZjX}K9^FmQrsoX-0ybfrRUVn@7Yc}-S5DXH#L?z+NM(CUykV|!TA-980
zQI9G_Z^=ly<Xi{JlbKtD1`QN_Ia|`{7bHYxshy6bXNUF+qoeUaaxviFU6jh{bb08O
zd@PoaJ%T_3>QdX>Hx-LVPqQ-x*%1j9=e#U}?+lgg_)aYUOB}}D%qQ?1K=~7p-nrQi
zInGEAfVv6LfSRZv&a0yV!4a~zF*&)xKB4u0#N5Alax{2HCAt!=++kee`K?P}Qpt^s
zHg`xerr5j&zrvZV-<;E!yZ@s*+T}}=lb3LT29V~X?AOdOj35P%sF~7eU=$!}4K{T)
z{Rf%fPZ#DU%eQ1AOOu&@(9(Z^|DT(?EBp_c$>Y)Nd0gixuJb$Wlje08#T(%FyvTQn
z_$&Jz{O0%5zqj=(whLFr|KYi*vGdvJ@rmp|UOp-26QN$Bh@Ls6nld;i`qONm5`vxQ
zK_HA-Mfx=bNAR|G`joKecTVKsCGk5m;hKo1Zk{;4rR13&iw2l$gQ6BFI9xAq%lCA&
zwj031O*y3SQve2P4bfL2n6i&i%}d`$dF9Kr{70~cx&)u#?D8$kID#Jv_P@x>s3L4v
z?E!scnbeRj@&?SmpV2h&%)^4)BP0@n$1Oa3#^2`WzE@1h>S~)+WC_1W6oGk7M2mEd
zXc01JAX)?-#Qu+&q?<8pzz+#h^+l{em~&E$*&(4W3rsL|kS%NwZocUz1YA^3!=L|W
z+*t=tq?D}mf0LYe{@qE|sZ`2;#Z(b(TUjhzVe$TdN>;d!aCZ_nP_aVm5Ek?#L(a5m
z9yc#eGsKk$1PNos;mYXlbPpn!pw(%iiRfk)p6+;5FI^(yBv@9V;ll<1(qvXA<BB@h
z$ql6x7;Px3CO43EoqaRAi18|T5c%nEFW>U|*~XC;Khfpe5A*FJ-|pqx*YRzK|BA!4
z9?m&PEny}iZ_NO;G(2Z8Ad)Pg|3VLwnSt;IFC7VYL^hv!erf6XV=(e9FEa}#pKxM<
zfa(;K4CRBjBRB@TMx-7DYKe3~yhtx(sC2lFuweS9TcZZzJhrR4Dw+TxPHVfWOU*RR
z&NegEv<;>wL()VPDcIdM)%Wk&9mxf&t$*R+x+j?#N_k!*#R^s5-1<%SLiI9bxYhqi
zask$DwCb6(2~My08eg>#ljiQesaoLk*#Ys~<US3|Bbk}0?sN};$vIC4jbF;;RSLi4
zztCk=ik2*Z`Xj}j=M(X|QB>xQr)ffA1u$~A`z-Tl=(?jqDTM1(RqJc*^Cvt@D;vsO
zl8OruKlID~oU#N_v9_{w^qnKx${Iv-T^ioNJw;fuAt@1W#K3Y!r7atkfGE_qVr(pA
zOI+d6xfTeXYc14(KvFJ@5gd1$?9%{cSS=!?&T?C{EDqSg&j}FEp-3>{apdv3e2=kr
ziXz372;wj5#Tq|^v6wQto}~rz0S^sEISQILs+y(~0}uqlE{giWOY5Mz6KtO4{sq(F
z-2-uT0-&f467}sQx&{L>6b{fnq)>oTBjux|KK9tj$6%BZN+(M~Sa`?S$uY>*2y&(4
z9l_-kMsY&86UV`xHP8gQup2goERV*e5OFX=a?mMgT+HoHuq((Q4e(?UMK!fC)3;9A
zB71IXYNVLW7E!0NMpIC8c^}rYRLzvEth8OpW_y}8HPxA#lHeWSE&{K&lLaD~Um>IH
za~f9992R*6;*c5|mcv|s#GTN<ZQGbgV?@PCSYzs-@i>JQHosvCSP@-6;iQhVM?T`E
zY*zBR>NFB;p3$<|M|e|`V+h+?cKNb$R(gJG^v`Fr>)AGCgt?H-?fseT@>-TZWk+`e
zENj{_TN-?jrUrVr^&r%XGzooiA5efEgAe<s89c+l-5Bi(UdyjA;`Qvs>@ueJYUA8C
z${5`CWz_Wp=cQ5BHYXJyNMa*-{HGl>&GeE6AMUcYbd}j&&pzXIWoZ!rPFZQ`RX&A;
znJyu&{HQV4I$Yop04jLF;P6ub4b3|M22Y@BOIHUN9a^&B;n|-ATDGkMC36<wp1H;x
zzv;UmYvWHlc4RGPvs(6QfWDr6B&z|K0bKv9v%WdqI%59RBbR_&m~qh9tHaF;*(FRk
zV8<)t39btJgQP}*f-=U_zOU2g9jw%#DWr!I_($cRX7){TQ|H8nLyxy{6%63?re!<`
zr#YRgKTapR4UD{yDbpb8n(;V|I*~`PpPv%?JsF$Vvotq!=qh7h&$e#&gnlyO;~XH7
zq|Z{b&~daCHkSax5(!N(i2g5AeL`S0i+?{k)nCs($J4Z54c*_yz5;lh5+v`<2ja~d
zG5^G`$gxZA9U`l`AHfC!1-?rUO=L>P8y)bF&_i0ywg?wIkmhq8%YqAlUK&gb2Vv3Y
z_@cubOa~@kTF<({m^)eDc$@I4&AFD0m8xg66m!F$6SyO-n!hkYWlTQihGhT-zX2IR
z*RpnUSoSdFfst%><N+<azIFeeApiiDw{v|+Z{{sLkhpa3ICu@XIiC{J`V6T=7eX$(
z;d2NR%1Y;oQ&UCU7Y>b=wr=|pXaW9eFMIbvG7z(j!pCvQ(n53(XM!bjAuy6nCaABY
zxiqwvo9p!|1dvBao;arS#IJ5iPUTl%>t7{7WE*$PZbIkBUad&7joHI)4B#U({3gHD
zVUwC-znZ5bM8m(%0K<Rg6`n{JRF(!A{)<<6kZoj+tnj-a9-h;ei+Vd=_5g(|9enjq
zCFzfZhe2(rfwg<?6(4WgYW>uYDM2u+TaH-H7>~L6j0BcMEnWsrU+v13Nyb4sKPbp^
zKk*}yWUR|NV?Xr+hG4F(S{A8X8<&uE^alwbu>9Zja2m(}grJ}N!AxNYl3#XH9=$4f
znh9d0Sn*Va0fKqOC%KHYLrdcN)RO~Cz@t2LWy&O^H6MvOSqZ90R(f$8(cVr`RjR$f
zvp6rOsJfarNZkN4myM`PBvd{(q7!!FJ38G0=zsO)NNsX!aK1m>Ho7g<(*_^XFd+Mo
zzU)_=o>z~l>Hwzd%_gs`*X^LCuWDs=F15*+40TyYM;#?En?!S2AK=rcYR6nYxTegR
zF;|uJ<E$h@ko}=~iu2*^OFD`Q?Aw?0RSiX7&$_{<@7Nm9%dRHZ+pjdP!Nrs;IYdbu
zG#2wRBK7K55-OlckK|V*vs*OiYJ6~qv@uLE4cl;Ia3TkFuglhR`y`&!RjikvKoU$y
zwSxOd$78;%gVRUl?<OHGauNuW;U?c|Y$J!4i;kBGL}0@DbU_0pnx}3`hy!Mgb)3-6
z7%vz@dtpE_+-A?<raaSHbUEk~ndWTBQ1&jHs!h;e)(Gs;Zu-*YkiTrIZ$9a{ZFBT$
zK!4{@E{hD`zG`=D4v4w8Mzlj_eA$5wF5V8<-#Lz-0`@U9@L_1auS~-RwB8?GO?29t
zNjJ2^32MDK$em0@m+XBnvy@z)-CRySzS_<O)wZmC%TO#p&^QC#zN#-~2TYJ8_m?fZ
zspI|2<KmXUZH#T_+VZjOSl@vW4z4h;;<814g^>;#^C<0z%rl08X%J7ZWHi`P7EDEN
zC$^d<0v%&DC}~)8jwb0Vq3zS81eln+Ml%a@2e%Tey&U?&HZUlaMDPTI>s~O813O2?
z%!Ph$#^&=Jn@j)G7LN1`h3a;9_$msWE(8rKbXz2L^VT~J%WV5PzQY&*3vP{I#{yny
zAcF|%g{(m^rt5X)BfomQtYau{SVGRdB16)xAXl|PZ4HpD@Z~F@q-iG5t?)Z3E5QyC
z-_4bRaKQlxNO@svs(_JOIJsqk-zH(KLdF}=tq3J46ZMsm@+TbK_Qiy}VUBTtUD6PD
zBIPR$bx?1oe$vyH{aaYM(|hsimU(kl!AHpoO#}`jekBnESh?Lxa5Xt(2{wxXS>(#}
zcyM~JELC#iVWO$I_&a4wZRg@co!Kd1uD)7&{1cAt%1h5jxP9?=ptHX8S03mfIX123
z207lo@cNv+`o$+JhPm)u8@|fYo9-ddV$AE+mmV%g-6P-QL0#OARs$LvavnDbvh`Io
zKU!_#)mep~@PgLW*74H7H|fV4aNUuOmzpwB-VT0mc=UPl4E&3f$<MC|&O^bS4ZKQt
zA<-A|74KuhbAsUcRPlF_#~XK%;<>Uyq=V#Bbicq*`FT_gSY5SP2W)kSuR=hyc?Vts
znT9}Nk7h_RrELw?(eCj(sl?*e)*;+u$0`m~((dT@dXb-6U!(7_vAo^pc5K$urV;4D
zRXooWQRSF5&RZ#;Mx=rk6ePk!TBRtw`_$^-bJmFC)P234kU+=C=E4Hq298ul6)sw>
zPIAb<RMQ>Sx|B=F{bQU}m{Afu2a;UgdNL#tVspOfahcZ9Wmc--N&OJ$ZHoYR5kZ;=
zX^1EJ^=6ZzO7QJfI)u%DpI88oqNH?GqldJE=u%#SM~`funJLXiaDQf@8UiRR(C#49
z^a2u2+X%d3Qj0FTGGAFk9ds1!U#s;03-`gBwHUpK*rck4byR0Vpenjv$PF`8+`;p0
zFq5-0>=S<fhkV`-IULyD_vNRa`tnmuK6b2CmVW4Wf7tE*u+!<p8+#Tfp89g5wsfqf
zHD$nsc^@+>8ZnyY<=JuPjW;@v-^%MXt~$T*4QHOs@@kA6o+P-TH()J^;mOI&ZInUb
z0mB9)@etfKSf&}OxFgAS9WkBgqT0WpX$+n7sBi~bsgg2H@h3EtOFa5ck3~tr$N;Y<
z;R9ir8Bau^W|-$FTG-S!bCnryISWt!ma|`P@JDe(dMFWcwd!?>a#K}>GRo&mRBJNa
z`^<QU7nck(Y5w%F8VHC4F6_hBE1$W+9=1mgBZ<1(Zlb%}!kIrr{B|U9uexxF@34E>
znSHgE^FT6MBz}V=Ic$s3<oZm3C5r$OGqBW+g&am8z*adwYO0_+6A%|LgS5R($V9w@
zUgVFJ{YXjjsp^V~`g8qD=r*WrP>9clhHkI89VM=9P#hw~P?)zO4}6Yj3z1cNkqj>2
zB}$a`S%_|~a9hr05DAsZ$v3CM+8ht>>`KyHVODh0gSf@n!ki@4BR(HHp@)2uGSbA-
zcP&&XYJuzq%%p_CIv(R?EI;BMAm->4Zt(a{amaz73f9RYmDs58p}D-P^wB8&p>0Y<
zJd>}+i}y$#%_9?~;fjj9?Gw<Hf*PsQTsV%xg`mA=)*^ux#XuvMkK|?)$}LEP@90y&
zi>BG=S%^phfQT|T58s|SwY##A8P8A$%QnT$0Gi{W_5~!*QMl*rhjw3|o3CWX^RckZ
zDKzLchJpSTC>@C5Y@@=I0<DKa^RVcUB8i1kt-;zSPbSSjls|pof!{Dc;V`3mz4#lD
zK+KdE<mmuMXuzPVIqXs<zs@!|ALwuJ_$7oeZE#|)bs4p71=QdlxYA!@bPD1&kT#AY
zsdOz|hc6lesqF})YS4rrYBI-z=Cwcl(|!a^h(QRYM2uMu-jPE45J^Qa4kib^{{FO2
zpb5;DQnCKx?J2~>s>}j1z~Qusu(mE@W4z#mh-yYW3~q<`^R0>=W~j=Hf|$H!CV%Ek
z?kf~&vlVmOLHF=hGo4rSAESWjt+o+7Kh^|N8}1UNDB2l`ibY8jmj$>)mPu9FK;gJA
ze>U;EEba6C_trnze0g89)lxs3_-umN@!`Lp{%<y)@A3gR5V%vq1c_H3Fml1u`Evey
zJBNFz)k^1Yx+#DBvf)}cQI~hN96><@LL8G@>8zQxwY4>{h|akiAAi$Ly$%(~yMzvu
zXCHsl4d*Dli|FS%q6Hg}{vW`!5-k+*v;t+hiTKa|N)4o7!B*U;*5)0chzr&#kFTcm
z0|%l|5vPPN=Eb}u;HOkOy?})`g4HOoyN1-IdIRaF^agT*Z3*|aQbQDGXI2MuSeb*}
zuRVP~b5hR}tKH_X3s$S!CVFjlr$e-P?PuQH?>>F(z3jQv9{o%1U;sbz+HFpUAo$O`
znXYF=%B&qPT$rx77yYaS!Qr&oz4&DFSSi)ril5*Aw01v^P-Yw54d2Iat?bQzt{wY7
z`^(9_{G8|zs67h~pYaKz!)dp9MH_xDB2`epk8qtmzyZDIV;2;|1*oAAUxgv!>+83b
z=RQjHOz`@>+eRB7RgpDph;-`^>CA#3VATx-6H|u{dgrekb`Vd9?Mwub#-A5E;)6m*
zxL0fnuf^*g7FBiy8s)0%Bd)622+VDm5*@l_svlhL|0BB5g_i-xni2YC-i#v4DAkRu
zFT65d#CRw0A>21Vql}c=?RIF>+}vv;Uad>Wg_O{(T|9{%jK7XO-m8}6PX>@MN+SY@
zc<D|64FIQBn=z9Zn_%jiwNgSLwhPJk<KuhAhjL}T?0vVxJ~nxcxBu6jPTyval|7z?
z(uka#bT@f629Mp-D>XWa9vC?s%+f_g9o|_QP2O+<Q;rZ<fH-PDFa!z`oiZpDs1<_p
z*VT*2)LRF6>8Q<ix2tujkEbrQ{}GmpeutcwsxpE%J&cxsSG#lp#X7#u+DY^)MZLs4
zrsY!jKz}U>(tR=H%VRD~=ITVCA{9z8yQd-s9FcuHSz4275r*P_^Gy2QN}4lhBg(#G
zbhPQdCw*Tfjbfh0aqx-Fk@k>EOfifoL20rdB>0+Cve`vy4)7lGe!B4&f6<_5R1jJ&
z_m|u4Ort#aO0YuW6u}0)Ox1$ksq(#z7%?Oy03H$;p;O=wxxg221D>BiT{-lc(WunP
z%lkC@M0w0OWn!~1QZWSPOT16xrbGh{+9-hhk~lUC`YE$6%Gp1|sX3&Yc<A5f-iS}3
zU-{(#6Ne8U9zF~?u}6%x7mCZ;(XS^$zbZMezuv`JUxx>@5{gn8eafl?#!+yl9<d89
z(nI&?^zr`JC?^BtR{Aaae4?YSpl1@~>n)2aRi(-CfZZC8TQN<j5;cti4dzN6-XSOK
zTw_u<b!*addhj8{mkV5)<<XPOLN<IJxzgzvksC1e848EKU>Hb~gEWb65hxLm5U<$!
zfWrY27D{=s-hkLo%$sh-L7@Y=T3t_96aM+xS)erZ3T;zWRH1H^Nj~X!zh5}uN=;1x
z4=$%9785RZ!om&^!0h4Q*5Xs>a|!apItHJI@>R$3la2*`<F_Kq9{*{@!Ed1#DKd>;
zDcazy6p+JKD~b@lW@Mry?7JS1J1U=i&1+7|ZZwvOy5o0u?vA^^)|`FU)Abt)C*^0}
zSz|+A{ZC*C*FJo_R%OQo&x2m@gXx7(Xkps!c6cB3I^6cTYp$8IpF21@da(boQVMTx
zS-$0#Wos#@x17-jD?s#srr3}n5I2Mf9~HFTmmT+`^2tLOft3&DJy#y-2Pl1UlpUm7
z-|-4#!=i7=Tom{Sl!@>X(T4bjoB>39K|ggAC}w=v2*dA0A`jK(p#wJ)te0wjyUw!F
z&g}A!Eqac$in9>)=9{VhfmBnCm)cL*Ci1^|Xa<qlAT4Q2nthpl8HA+-7(=2x7w&+U
zn0rd*<Towhy$Gsq2=Gx>AAS2QBPn}y*z2B5NB$+v-j$xsM0}GjJC4E<@N?M--6G&{
zPX+`3n(jZA{&YGXpLF?#N9l)8fNY!KMoRLw>vOS!?xqidJ+ygQ-HO2PdNWIGUd=Q=
z;AT@Ciz#8P2O<yyv!aYj3K-|2JC&p$WTuAJz+xMJCPHXP`x3PU*BYgKvzeDNM1k9F
z==o(3oDCc*H8h+~%lR(I4|G(`I1j|3h5Jhg%S1M!0C_AO1m*(Inyk^1HA+~tTF%Ug
zB4&g8bw9N-|11_w>o<oJce74UW0o|}Y>9rcmmF!YFb5V5Wmw`PRw$avDsP?iRBt5N
zfpOQ=(TVSmAarKdauUM;&Bk*TL|H*}G|-E5y?nqb3217Eut(JN8BmmwHS9pJK241R
z#%ZS4fD`h(QzH7RD%u@_O|lnj^OaPBxqT3ltTsVSvnP3OM)M;{>(8?8QmvB7{@8+U
zA<&M8JmLBHzMHs$d_4p(Cd`kh3oO6{<`%t9n=>5F?s2oXBQqe8e^YVN?Uie%#RdvB
zcs!^&@ZA|yCQ01HIiH?-D07W~$SuW<mr5jUa3eazO*8w1ft=pv6#}=p;^9Zb&T;FX
zbH$a}!Y<ztRN3*bh`xJ}d3(40&rF@wY1zyE8PHEt$m@3j!x{?yMtER8c96=2+^e@-
zo4(eUc_!VTOS6^q-Mb!5-<14^N7Ik8HctG9%+u*T>Hb>!E`EF-$1!qRo$tVGLF)va
z4wpjRBnZ)B5r9`}q|sLJS3bM^a4(rWI(zWceQI*{k)Ip==x3K_Tb+HMN*>)6Bx@EO
zea|R{XRfsq!z3ME*D`9vt{WvVxS5^qGZf82?I}wc-H(xuP^J<np#2@%t`Zn`I(!T3
z%T^^GV2*ho0f0>Lb0k9|f>BbgenUx8vyZ&&O?w?lZmKVP=Pgx-s=}jJQ<2}$r~!h0
zmeoz;L}#hiY@$RN5=)j=-ouyp#g!$k+0uyMp>Ua5)r;Y2bjvE(C)uJ560oJc=LiXT
z9U+p88;}pS>F$^<Dj(f}bWHWc+gmz2sDg&%Sh^`EHyY2qumKHqmp@@3Svhn+kKy4Y
znSlV9BnUcTP@*e|5H++jhKv9U2YeNq29NqNZq$G!7puk#-h5XxtQ}-p*X<tITLL2B
zn}$dMa|hZ(adL|X1VloEVVmWGnT1yhW*b{If(N011Sx_yWFR7<(54{OSb-P^b0DT}
zTL|mk^ufv_m1C9u57W$B`O5w2`~PhV<i5vG;<$eHk^6BPvfBXY5de_-e*r=&fgLHg
z(34P&g^bR;4+XbGoAnKVOgSnuKo%6=^KbC}vOk*g#rl69^QGQ=Q{tdJIy`#l4uy>>
z;ch$>_C5Bz_oMP+V$Y;3PwqMM=BPgrzWwk-sWdS*3=Hky)~lD5<HZ^R^0_oj?>zMj
z?;9Hat<YwjHcZo`wKY|0F%5N!F?v%YpwuO*#ZJwcrxDj^2^$PM0ulgnK#Dh1?gcBT
zf=KjX#{2>j>p0+>9Dbb_Vfx)n_<%DlzA=2znZfJ9^O^Gxrp0DjU^nvfUy4z_GTX<~
zn%ReVwUz$Art#IZQ=y;Y_2BvR`Ak|kofiAQLf?*kiRU=;-|LD7*$OtW=rDvaq-&!9
z2Wm+G`@s;Za%8Z`)nJJ$2=1R5U8#gl-E}HdSs9Jp{J_n@pf%)u*6XGkR}Q1X)vXc!
zH94J@@vT%o-~TK71Kyw;wcmr^rz#g6>lBIdTT@5{f;kn^t(9hO@lNPN_PoSRL#%t|
z<e3j6dmH)Pq(A6t6zbcP+SSdbhKEyG)bpV)oHWl;Y0&0YN6{vL0m+^qx`qnPGkmxW
z4YY#WziOKb0D2@}L_y{<{u^(|ou<#mC%oZ8`tx*wc@z`Rfm@e593%)MncdKTOh=0-
zg2@$#@K$AXUL-024b%n81dBcriraSiVxN(Qe2<(FKht<5l63T_D4B0#)$R3*;%gHj
z#Vx)~8j^lB?AvwvQ{od!Cdvmv_(k>9_#h%g`$#0JjVO=`M3GA*WEV0-Kwuwg63!r8
z3HkO-J_ahM{BmPp+Rj0^oI3|WNWO|ew83s+>8u-)2zVC_gqL`FoUa{|k%wQoNShvC
zEWO6^0+$E|u3%P<0z7P9fnBdJ|I1u~R-<E#f%ma8dtmZwaI%Apyb>=tRYO%+q>ZBH
z6iIXR28DRuYD#fW@{$o785Pwv;;ucK>?kKQs?!(sM6=h9AK9NM?@P>&ryMSqOma^A
zB`)sl!nZ3ht$S{ZCWk8-uM+m#L*Y~^E9YY4Bd}6s`PZ;wX2K!a79b--KZXL$`6A#j
zw7nPzcobO|f2Y0L1>GmGhY`AGm`G1-v|)AZbZ{6rLDtd%Iz=Ky0un1_H%wX%5X(1=
z^EnQeU|SIm8@MTMj{!h1k2JsqVB&zS6NX??kVFBlD6YlBgbJf%IpXVo_n0qI)-LK>
zI`Y+4OKLWoa;x=E!QjLCpEKxG%No8D@g37xhqee>#^?U$rf-`bnXXpfiT6G3@H@lq
zMK}KVj@{1n)h2g2Y+1f|rCQQe=_TStNxQ2=r_mE!1L+32)_}CVW?Sp5QHCZbH-s64
z@owF60GLO<JV$vr(_r{6^;8+1Bg)WOv<tO|f#VlD7cX8!5!mh{7>Akgu8)HYk`XKx
z9|H)}NP&nak^JN7@$`e`a*ti;x7ZE;<~)4<uou-$*l8SptJZ6ECid-H!~rfp>aq(h
z4)R}N`-0(}ze+V!>=YF&1dVW=$-I`dn#@m>-iO9gRACVXr^=<Fu$)QU`u%SAyBzx|
zJ)OdsDKk(nxu#1ZI_{v15b6VzYP>aIjg3*640T~;{>)ALX0G#nq}OA$si3Bze8zmm
zTKVFcH{P^w>Hzt)U%V!pRGSbl-V0&tKHR|%NQGrH-#{BMly^Z*&<$B$3Oa4pnWNb8
zJG525!+O(OS4r_E%N-3%z`#%xW&}lN0B;J-ze%5nHtIuT%S)=JN<BzvWB^KBz^G8h
zThrRT-UdIC2rVsfM?1gtR&8md+M4~QOgU1}Wy@K1GcOl*?Z9>esxhjIIjf{3f1H27
z^-OG}#3tmzqr(bJoB((bZOY&VT2K*J@}$*7S}vG-w+Tp1h^HA@kP>BTwm~M=Zm+%B
zJzi~7)!k?0j5Q~{>lwHE8G1%4eA_Cokb}=aTPm(F_*i6$9ZbwO$|jf(Y0@_HVa?CR
zL%)tIaNppMe)+yW4Nh)~WeGkRA}3AH@+r|zY=eF;B<?gB637Y*0HyhXgGH|oT$_Q`
zLbF9>mT7S@MGPbfdUPD=&hP;tXZr$wV=^7nsGH|H1aDG8$&^JK{t>HT*2JdD9}w>w
zsB-}c3I#$<^;Q9~tnqAmlBTd&qVfyjiMeoiZX!HUx>B|3mulI1JzLA|r&56@FDr^I
zK)TnU()Exz6$ibnz^HXC?hJc#p6+A3z&aGNTr~;`gnWXA0_xuIT?l!iBGbt_h^ENZ
zZf<QR82}15)Dfl4R7W}-O(o@MG93*MIV77)^htJK`Dno74VJyjLANht_1-w<V}7^S
z>9UPEC4uyTP(qNLvMuIkqkhHS?nL>&6Mm07e&=gF;gIL{<z-~^MSRPQ-RTavJ$`o~
zA$)+~>;pogaGq+7@reZm;lz+vr6GF)C2>#_59+8xO_rKy>P7uHnB4Di@~J~4`R!8V
zD~yo1OlwaLh;4X`<tJ^DpG0#i_^ruc3E=M1Fz5(cxvXN1SEW{~OXat5t^+#@KL#R0
z(BH!nkW5%L%bzuP`Lo9M@@FD1e<p4#f3_^4{#i@fRsik25-Om5RC?tSXmB~;#$YyF
zdD=|;hYbj-G+tcWhVBcxP4O(GWsyzBV%8!806^BS%}!YJek;n^0R$8yx<!|7{&H+S
z98Qc6S163263!+M%pOIE%inQPX1#O#z<e?r9#5Fx2_M`S=Fu)(Akw)PFS*)iz!(5S
zw_dbGMT0YH1<3o_ber(-g6d!kq?If+5Z>qTJXDRVglrv5C`z895Ob}LVs^%UgFf;P
zN{!A*_+YDY!lqYkrh|DvKiuK;y*hh1k&5Q`4i}5%y1uu(cX)Izk&2Dy%KK+$_m@h?
z%c9+89ox5mRy|gqg1}=J)um&q`VB|cAq|H{L-c;FR0unALib1R>`Pge&Gx@y7a8(a
z6eif&u531oCvRd+x{zo^7)!}eLFupv4}%i}j4?#&A|XBij!~<Vj@((3+MM{xXhQ-w
zX?MNcWQWk#2tXG1Qe_po;yPBD7&+O2F_+s43Uh&3r)t~+h1hCvfKsVul%i1eDk{}N
zr!dnh**#5<z0^i?39zVmSPREADtoa$ld(C@c|7MFw#*DTUlEm+zJtdIKwTU{eT3^Q
z_u+Bs&<rrQN;PAb#CnOSN=b$pmQ-Q|&j|WK@mK=nb)EDSp{o%UL3tB$!pY#IrhrYv
z28KU;5r#9Y6{sb?Is@|{zC2T9c8}HT3kJM-l$(ID&KDKq36JxkOm#6LI{#zQmmjhv
zy<S@^?D6Eou0TFs@C8CnVL0M-rCo8j0h#nDud8#n7zsOtP{1pOLZUYi5?m4Ve2OZ9
zW5OZC!e8-aygoO|Y>?;n17h@GH6wLAiMSYz-0UmKqe)!O8yOaCNn5-y<yIx=I$m#_
z4avMNPcG{9Bz#FB5D=2SgvT3=L}fY30YPQIi5aA>4i<_V&}E|#Ol=78!XlX(HM`-K
z^o{UDPVR*e-blQTE57W8<#hAMXknA|UstWnPv~_@T?k@P+1I(k6a}&0Z8=~$27=GC
zNgG7ZF^gCXSaT441&Uq-$HA@P9H$bMm|?EPW8!(094re#rWB1D%Dp)x5n>@EI)0Lz
zZ*9?Lw<|%}7PpBu5%F2J!)f}b1SSH(pdtogBn^szUq@9|IqYw0JV;4zjhp#o`jfwk
zph9>!m+him4#>9q1-rwBi-@+-jDD3sutHa%0<S?a_%2vmJ<H`~`TyooPfze3x@U2n
z@4>;>>XktsOo77`vdJ+)n!*v_2gXYSr=SuNwn=WL8eAmAK@j5cSSCNda=j;L4}imJ
z8~(%c3gVd{8v|EYy0>vF_!a9r`StQnZ6Gl0o2@cB8BxSsyVK>?aUb74q-oAGj|eWe
zkW32hz$0h;TwNgSCJ#2THiZH$%_pFz7z~x6=D5%(H^WWvSgT$Bk5mAPLNu)htE*J%
zu&ws^QLX>%hY|b&$C?EaO#lA_dz4^L*Z@Oy;f~yM4ypv{hw9rl^28L-UkK<L6-<bL
zh``0k=d|Ms{R<2K)fY$wy#XKO!+$0V=b=BYooa1_%Lz?Ol+j>fGBV|NaEXjuIx(l3
z)wJntMilBz3E|qZwIYpzY>I-L)^oij^L0md`!4#j91iqum5l0>MiQTzEEYe>_ug+7
z`O^$$Y{#>KS`wwKJFtn8F`APmxE3(6&{~S1W`?kgnME8Y>=|Y9P1i?V;|gpj%D8K^
zj&6+?SyMh02%M6~??sKw(Y+3N*l|Er4>*Qp$KFwyOt5&i^FYm2&}kAmf?OI0E|#DZ
zan*s;hln`@-N*r?<U$9!DS$@8t>`HQ3WY#P&cZ^Y&YvEV{PB?Bt$Kw}+`kZT?ym%x
zuNW*8g2g#amdo%BHBZm8)c&wHGL7ISG|Zlkc;{}c9B@)7QN>bW-)7$iT=_T=A`F?f
zG&p?W(Q(HaV)qWzTopjSWwez-i+TNwG*hVQM+$X1g)hs>=PQ{LN@nJ_?sTN$qy6s;
z+3$3We#bGBkxyh>#@paG{>CvHPdPR|ZyQlU#|zbpw{dWMI@vf?I37|)Y@aV1?*r$P
z$%eO51uAUW+NfrO#bS^rPL?Pr3Ny#)8EN%eWgfPU-RX0gB|+GWqC_tU!alsQd+2!O
zbLq3`FXQ7rL3mz&!&1$lkk&V0TcrrQB$Zt@Z8k*%91)d5WCMUQQ*-D{s(`x^`>qi`
z18yixrw80O=7kD~nuG`n%Ejd%st^SyGEA{gWxtr2a%^x$G0V4kxs3ki<$K~I!KtZW
z29g8&c&4nTF{lO00{a5{0%!v156})-sh+l?+8!PoOM?Xy6=A~4dJh%$c-{Z_So*Qs
zJ|4X5CcK{DN7#vnnA^Mi_i^IyKYr6)LA?G4KLU2%=CHXANYD!<^78x*Ks{Htp#l{P
zrlD8f!3#{BG-GF0FGA&kmmVGMQMC?Du(7=jb?<!PWePf77=P30({DNr;)xhLgv>Jj
zHE)L3z2jf=wyECbnJ?g5r{BbBf-WnDc_=6e(GVp{w8F(wX@)=#!AOKTTz!SCfMSZe
z%Et2P=IuTqEyir8k4#%#Y~;vcm$$qT&W8ox?Xdkx<$pZbVx9y3y7&k8J0ezioe-zl
z8ap=TVJ+F^BRgmt1cT6)dRmnXg2C|=U<UgihN0`zbZpj!DbtO5OzVCx>}4T)@UKI*
z5bRpe7A{`&xh|k$7yRCu&$UOeHAA7MO?aGWujcCi4-LVh)TV(<Gv8sqj<ukWLV%Y}
z1{$Q9L2v^pkVU#noq|ukE#9$oF%-A|T4rM6b@ii19{76H|H;VMqY?`pe;^SGMN$))
znW$Q_J8nAaj~<$+Ql<Z@rOv*ABBkUqBUcFm2LuRgc;Vs=!gfI<Ya-?t2SDoC+5PrH
z=fvF)?zabaC$tlHe?8<ZO_U#+Ta?V5Pwrni(J9z|w0|XgLqaRq;-S|)HBl}}`WtY`
z#99}3GHkjSMu?r%N)S58I0vx=H7pgmiVr0`CA3f_g2CZ9=2mGyVBBg_{MIs)(wWe%
zp%W*D?g;qq^#|f}?+9hm66X85c*E}+YL=TrE`KBbH21kZJGFrDxS;#yq48F|-nuQT
zC|TG1(9P~3vs)AUqbw|z<ssLebb60#NG^+2)90$2Upt&2KnvMYl1xdVSS3>mappXP
zUd)}LV89_n!Ykkr6rtYZehw#BkXo|*k?*%4SR#&aehkrnwI!?5L9GG8DM#raxsOBQ
zcI2}jlw5B4-HJ3i=U_`UL3CRo0!hIUtRGD(QE@wrQRK&ulLvrN#|8$nP{>CVkOs(j
zMd<Me6%{2BM2da;^T+P#|Lx}wX!ln3f8Or@jHG=&F8#cg$+ZteSp2>d&b#}6abM{S
zQ}4^AUpq2#Z+PfkBY)+$mA_L`$5(K#5){UD_Wy#5P~-qo+6+q-=pUNma6uDAREzSw
zwI~R69hk~izfFVzcHTZaOL9crFzDPl?DZu=VXx2kooaK@SG{rZ!ZGh;e1Fmw^C<pE
zP&}JCCwibk4aFyWu;^5W3!>MTPk4O=-v_I{#b(vN_~zq}PR56rUGRu!(`UtCB%pX=
zw#5GUB!K-9i<LdgE@6TQ<}A$c$zhQcSr$o}0Ust_Ov;EN$Yd>-1)<1-!LT3A3B*KW
zB9t8QOHYnyBiZ45bKdxfEEj#@LfRG1r`fN&!v1hJ;Bh`#e7!2iQ`yXamhP7t(jN}r
zR*{QMc{1(hU&Xw^7+|%qe+DVpg-R2zf!P6FS4hJl%V<fWVE{O4WLkmnEpzRNb{kc|
z5B>mI1Xu)84*UQPd5T1%7~qnCB?c)(0E{V<{Zp=Do1X|&$JOMy^tFnWSp$cCp@2&$
z24%ZV5fDL&V-DtyF_a-isH@EZb`w>Lu4qggFICiV(icvq72GyDe9w!z-jT^wDuJ2t
z&VBL8v*{BH%we~NaamEY+tMM$g}8}W-Y?h?=X&f&VEpzs=DTX=ITSCC25gFJw2%#q
z-^iVKn2M(5BzIaNra3}X+>d5M0@zpskAi1-Yi@P-Zsw}w^5@4~i^Y4VP%xj}m{SEu
z{JLMx<pa^`!`Zn9!wc1UPBQhF3lB`i-2YE{bq&4`?g&HS;2IJW6xKw;14N=yQ`0__
zh4u9g?Ch&#4q5F%j7O#u;Kig<A+9v=Y|R?YcnLOBkYEJ=kph8Lk(ENR2!t1BOs0rp
z<z=mX;^9EW|C&7$*U9r2c6`<`nnF5nJ=!=rS?X-=-Os54zrC){`vE1>c$fwS_Cu+r
z8$xBNVyTHA%#=jvi4hzdwAk_j$;-7e>P5!_eyLDJ;Cd_&j9{mRqkl$bgTCH&u+%9%
zU$4yj0%En$_63~~>1ve)CYeeCX#+<74kj2JkXrd6NC@@ANo5460$B`s2nI7SB(lfT
zVMm=k87LObzv<f+7jIj9_`vz|2lk$Iewx7o&Zffa=4pKI?Kr=9+qcfY{rq)%j*%_=
zXRQ#DO;O!c;>;Lf-R%QGl}vRcH`|PN+J{=okL}zidmv76J&#0r00I3o-*5nql4iHu
zZC>p0s8Q%?6gk>N<fyrWefmQb={iMMkmbyTl__2hgEN0a1>+VM&^fYg!1zHT6e7^c
zw!<w|Fk{G)-H@eN7pj@h)xYTSh2q*!BpMtNyzg^6MMu&q?(upYLNZhx?)SL2d;_*c
zibjK_F&G&N=0xYOi5^GNY4dpZh}LAN5Z82Tz!oG^{cAYm5K%_N0<%y<jeK)&gjb+$
zun&gDLYR;L96F6{h<&nG?yYy5&YK_L#XvjF<^wk$p){vK6d8gRF@*~w;1>FGu~eF!
zofjZW$Ykb$c3qM|=ZmldK~NP09+TVcUr?vwh=;es=@>6aR;!#EmDRUJr)}0zDE^3v
zWY)-EledW*sMKs0fsvtr6j9`uM?j;*RHZPa?hi$hkx?WL*#n}}EwMfQ7GDmM6?>48
ziKxtwGOy@9F?!kt%o*!cz_*8B2sHOuZ^EqxjIi!TU&L<j#2m-IHm*R=D3WAE`XSAj
z9(4mBD<a@|JR=rVFUkr#T^R=OP&|dQu>BuklS0#Ro+ZNtJ%q1vOF<h%kgyM<L@_09
z`teyH&FZKF+~J_okY!9C1TU^*6Uaa|0<*-FauuBt_!8rR*W@0a96H~~=O%^|xrP#9
zkF^3(MpcO+F_dr6<{aa*p2T!=(mCN`g0=M~n^HfIS!qLBAnPLmL>704FM!pdUe0h<
zSh(V@Z1`tHpf{8p5(+8I1#Buu4ho1DP`5<gkR27+j2Mgyk^^=$`;xG^du(fWjf?uI
z3nIQta`>Efm#sNE#mY0o-l$)4q#WgY#4I{?6%oQ7OpL_Ck!0xd9q3HZD2~P=d2|=T
zMcx`dIzD<b7;%PkjO|Bbu-PKm?e>n>+{%yQ(!?0Bq+q$UmV@g_6c$mu9cEcaw9ML&
zU-Ex8Ao<bsf|r^nLqDvdklr;--L|M2WkfZNAPg&ad?N~0;iednOW@tM*XrYs|36hk
zcO<H?ca@cZLa#9x(D1(c_)}GYk6NX}auBb8JjV9}{2qEWecnR>?e<W*eTHwJZ?~7*
z?H{eIEU&CEl!Vs*4REs{IAa#e4S5>tRfnOg1ofCSdt|Bt_#o0?Ig7JQ-CLgj<ov|k
z+ysAnI|S~Tnf_O>DHWMz;#_3cuIP<--58~}LyadJ-o+aiy?oPn689qu<QD*9yV0xh
zXMlvzAnK%~=|R)P#bDJHaZ{49Ahke(5kMONToYCVF*HCeNa=t%l8lrfB%-VgcJyiB
zB#CTAfGxfYJF*C=NWrs^5CrHH<x@T(nDGZ{vNe{CS!arZC+>9$K2gN+tUusOl_Xz~
zpF<%9yEHoF4Fodi3M>{JqT+TtUG8j9omWFygnh;$P9f&@deapcT2Q6X>ptTf^*MuS
zZy@MR2idGUlX45ev?C}<L2t<>`7>^Lugs4IT-t<SqZ7<#vrcHPfZ$HiX<t~5OV&s@
z>U187B-7<`IxZh}c%vgMCWmD!OvE{lEPHZtH1Y?CNfH(vjzt0JyU+3*`w}8iT*$jl
z0(}voK2j(ZxxGQ8nIyqc#%zP-AT^95D?bJv<RHC~c#%klS@C!f?H~_1z3d5paoiow
zJHyXfgRXqoQz@=HL<FNdgs>xqa`1tY=*Lb-bT}M7vG;zr-|tR7b~@sTINTnO+ku_a
zLpHD5>q@#@#i1cz+~rETJ#Jl-)nyqQ*(-=$le_}&hQT9iTogxWLl^Ri?p7{W3y1(=
zmTF--{sJk+FT|${)lCxx`KTyEc^HfbVIN^r{s1>4I*ljebX2A;IG0&-@$^y@$~3Rs
z&)*?i>s9$r{hFlS7Z@k%8Y!InVd`_AmIDDf@Cm;C6TeV!%kGPK6&wMkM>MBZhzuYz
z@qcf1@lEsZKL%Fb=XRq=vgg^A0G3Sm!1pk0idEskJMhr(!7_R0a3~jz>_-i_=as66
zhk!1{AJKdku*9|U8cW*pL3i*XUPE>}v%77!7rajPjnof^zQqUf+k8NjdCraquX`p$
zj3@L=%g^)K;K}f~TCFGfcV_wbF+9^`Ug9i$7V^wqNMM#mjZC4&OXgl2pe+(j36aS%
zK>i#wVZ`?&z9E5|NGz<VHCs;1H6{Aj3C6AK>(+QswTjlT;?uIzi>&`4`z|SPh~zN(
zR+C*o#qsB!2MtCM`FKbQCD|HtrPal0tCI!Q5C4kuHzf&{O<6{JkNyU=dC`04`~@ru
zgbPr@OC>nD5CR4Xy@3mnnS=m?q%klp*mP-n>oR4_a=wP|uy?y0?|rYsmAhEaq~+X2
zbR*8ZTaMZ7sYrT4H)DC%U7}UfkftZgyO2{Q4|O_2GRyfEe9p00Bx!dP(}*^Mt;?0+
zR9epfBl9_#>uD4i0ncNl(SX&@NIgB`71E~GX)jbd8*3!hv33{SrLv#_<mutox$Qp)
zd1ea1^5pTvMAtC4C9+M!ZY?4tx2716YCI+!_;d^6W>Ez$0>q-wAh0C3I~lfFcWq4y
z$I;tKJ~0#zt%c%4(E#sy9O(aXx!H-K6SW$NLE8OVE+@iiCI}OOx5@IY?#$N+mcEv8
z3y$D98t^&4VAnLb#KF)P%jHEe3nowmEBs6DKiJKIC`VI3+^~@c^{FA4fY<;96%4#9
z5=09~JVeAd-$!yqNXja^pzAG%Jw7?^@hLGy@p-qu$73=bk_X?}>3+-c#P2@Qg-tRM
zT6X%%PQTx2zREtQ)2F|dW{*>|Bl3HY^hY7Y<d!3{VzlZ(PgI0QK>jl(5q;*V3_>yC
zbA2Gan!cN1#yVxRk?w(r%oc6;0jSYpiia5;z(V%8*kwV(7lHsp8zJDVxpw0RZW#Lj
z5&|J!ch=WIFHD7EOWCn7w8WtQw15RH9#(L~L5qqP2{H(4lh``^Nfvq?-gRNuVKo2l
zBl%qdo=8X_%S-Luw<sec$}PLQ<$bZlB-%!_+ntPc$hhN=*xy3oN`OYqk_UjncmwT@
zNVQnvEE^ghEs0p7o`+kf$P)&tij#SfMHIGQ6!S_x6gnY48j+PqUM@I2Zf9P32)tME
zhC*KD9_2AQ<CT3*+1Y<$rN`bT%J>EhRdVEnG7}0F<h&CH-Yv#Nui~Y{KII<yu~5jT
zV6FO}XJw+M`aIEIfJ?GdAOQ2*{6!qW;hhBJ<x4fL3rOG)hBUirwuVi$5XE`E&g|V>
zI6cojdF4xs)5*jNx>0J64jjI<l3CF%L1Se%>b7gXU4CYI(Kk;4fwd;Ld2?zIz8mER
zV$a~*qG79B=lD#%JaYWPl4vTiy5dTMmLzj<&<!{V;{i8>(VJ+^05DCscq*fnYq=Nn
zMM6tmvv0#C6-s<Ji<G_WbM1C7NKrCDy)wj`(TkkExnXD{8X!iW$_-2;pc4?rElRMq
zLZDz$Z*^h+YHtN}mp%F9`U>2g>rdX1(}|p(z)B@xETj&QO%J%Lz!eBk1>oQy321)n
z`{KhH#eVQL2klCx5Wnx5YZj5mJak|PNzNPAk+?E!AD^Eew+}1G8M^qrx4#`aU^t8n
zXO597yNEd>V+_pi<fVh_d4^yUL=}d!2q2I?2;zj5rl;xv(xQ1xyt`KZNGRahJ0eyz
zr7$#BE~7(DxjdBb|5>YrluWJM+a-qF0e>{eiixoydEeOR=-57aXsmY$x`T;`PRLq%
zG9xz>LU7eBhJ+kjdw6b6C)lo3YA7BrN>VBmDtf&`E?0<~o_}uFuHAEi>D#ORk%`Gs
z|M19gCY(sdU}1|&k$=<e%!K{A_DN7pr7vLr*>XMUcK}3_WCNfbL7fF2&u4_F&2V0g
zzMwh~JGepV(#lFM>_a%m@-nCrq^suAk_JUo7h;YQ1)Kex+Vi<wUpev^i9cGQ+P-;L
zIX*B20jw}D@k1u~nJPdMv>YsEW`r{#ppM9?B0maJAA!KI+FEwI`<GCsWy$4_cCzkr
zvxbkn<7l^B_DCN5SzUo@^s6sU7d)*p$xN)grNoo-*+)t|X-+wi90kHe?=7u-dQbmr
zd(wFa%Le*=);*F-@7a^iUEAA)<aJCVoa+UUC1`mf1y;Z;RV!cv?uRRZc{X4QkjNY|
zgAH51>6-Lw)!Q@Il&{I$uD&*X%}qNGFzIDaZGIORE@AyPxb=XFSx`zlMO_ZaqJ-t9
z(TtiEjsW5GHQZWBrnOtrDEDS-O&z<lWN+%!v04w~Mg6^{)_1vM`_WeGX=A6{K^xa%
zf?ntuj_I&i-UGwkLlnMm;RZSgA)I(~kx~SXa;F{lR&p9n(q^NM9Q~V@4<4Lik;y<Z
z8<+Q%%X_86k-a&7Fgoc^=3<)%*+Yxx7o+}IN|MWa%hG(fmfLxNi)k7d;2-lDfdRfK
zLQ8?x*?^%4DraMMrVdR{q^0<o>f7e09-4mR^t2#ltNRuf*rD65pZieesSI1JW+h=7
zryiP`e;ZEy7S1_^x!*-98wiCdzmlJh)*lnC3qT+f*w-aMBB4~D28ltOF>t~<LkST?
z6g#a>I2I2zVdd+9LWC(_X_Z0IhkK5~I1vs7*CvdHJ*i3MTbf)(qbJk(kRB@m{%J-n
zm{PmxHa6eQ;|!E*(0a>Gaayj|@X=RZ-<nl@NQyCPx9UMOf5OjPJFwM{u!+qtf){|x
zn`vd#s`eVo3FsvdOiAs=Siojr*Cqp{P$+@{!P0|W^5WEIWaQUEJtvV2$WC5$lAlSF
zBtoyiGho;-&9K4edfr)WHut*ge4yeqUcC9P+y0TY?RiPQW!K@kOh78wQRt!|g@)?y
ztLq>8e-tF$<Xk`w2IcjkLgB>TNe0^%o7`*eEXkw7<id0^FO14guM?k&v8kz{9RHZ4
z-x+@f86)Y7i0T;iWHd>tiHOw52u}#}7Ck6gw|L?N1TGsEsKCy1T>K2*G8n}(sj_|C
zK9<T<O5>BqqR2T~JA8Y$$<Yu|C-}QY$z{}$WO4+(Xyx;&8r#RD+Yb#;C<^{F?C2m%
zC3=xPo&J-l2#xc`(`gjwNoS7#&T#}m4SxC(9j7B{oWnN;KLHU2;{nmd{pI5UuMq!t
zdE6h@W_0P52pVcmNSwd(X_96_W>^4gcP92OA*WI8abRRWd*BP!Sdh>v?j1qNg*S81
z-pt{kn0vEy+yqqlW4JWgEGQ@q4t-d3xCsLv&Ce0S;(?d0SLqnc89#mj<)1TRwks#F
zF`EPZHQAWe5jmX~tfP3h8t*Q`V*I`B?{%R`x4GLN*3;46mYsBYlTv=d<x56cZUP^o
zO#jsXR>$~f!~h4QsbJ1=J9pP^s{3ZR7G;9*><%h_K^1nW^V?3O2RDQ#$`s$jaor9=
z1)th5H%jgH#uvW8I<c@W+%fds<1nooRz%$4ddpiua*QVz2~ism)@zW&6re6)E_5mf
z-gfF%{PW8wV={V^ZvTb(aqtI&N*n{MBS7z2ug~tiM#|R4W@AqYHm;IYWgiPEipTHs
zkmk1i{YuB^J3GENrFeXP57fS`OPGgZIK}k#?@g!8agCg<MPl!=Gp^k&BfZRTzSON<
zzxa%Kl-{?U0nnS0nBGMXlr9IlM=~x6n+}SxEiJU{{f@o0V25WE%SY)kXMMNs-+!ym
z>7v4BuCJH5&=2Jd)W-^OZVarLr&S_nq{J;%08m6Y=&CvovuOak0OlaZ)c$IQoG3gm
zh$nYLd|~Z{h58W0*pRFQbLmPp9@?88$xaUkm28Q(i|Id-fa!d7ef84|=hWThtb~fS
zrBpr{RZjVL4_7L~Gg&2+{vxal>&gCVa!oJiNOI>of_cfGL&hJTe5?-yBoT78G1Beh
z<HICL*c>HIOe>>eR5^2yHyguKf<t9<ggnH%SR5*(qKY}jntyj;YHGNO(cxLjL+L-l
z5H-qGHbrp^3Z4t37BR5_Q#HAYWe30<W+*5ebOe@-)xY^b8O2O&mDIuh-!DFp%RR7o
z%kfZLl8)cP@_BgM^GfNK)WJIs%*-6P@yVosP}Ag-SRKkD|0eq;2ozB{NZB(X2x}sD
zBXb#&q(-Jb|NIK9YO?yx)KeR3E6F_1OZ}JB=i6oJo5`ndQGeJ>;aZwS7Yb}pTPU-j
z)}T}<5CM7>LhGu!q4rP*4^m~hO=ZTK5^Xguvr&Y=I`_=*P&Vi|LVnUJDrC9DJ2zmW
z9gQO6a|sF%y<=#wrRL;Du>qb85?TVbLaYMZlItz1upcuPw^{?D)n)Z7lOcQ5YDHNR
zyJT11S#Vl~sEwsS8wJ_!lN1)7nsoY8PSIs`4Ku6PY9AUy_`67Tspcu!&uWwH_O#=H
zciC;%hi<dk-+5rsVSQa`ufsZb>b)+B<z;`=VfTnBKeIV(_K^^reF3M#%BKdwR4`%7
z<on`IS!m{X0<$&(<(`lR2jPvZSU6RKm<%Co1p?U$NnO|=^A+|B;w{?B>W12(!+b;j
z{dgG8IPSP^V@X$$)<8H+i%NG1acrxj5MI#+XD|US5+UeP`sQNq!UeVg*^gh3VT)|~
zvP1!#dYyqTHx5y;bqpV4(=9^S6G^!s_$MAEVXbkJA?^=LE6crR2c0@O*mqQTkF-^I
zkPr?GHU1*%Z_yD=<;<IM%QkqZFD3~68gVUfJzNWwX1EiX2nK9^(hT7pDAGJKGZ>79
zxB?$DCS#vAZ|!zdQ~UBV+u)Z*=08%(F-@WPH&1GQ@5=k$w=$|t#6h5%m?et!HOud9
zmf<oVf|AHbkV-@5OFkZ&vo3#%Hj--q&1=NMP)$jH45s#aR4|Tb7-Qbzz=jQgv>h`S
zx8#8l5OGQhqOZBpfJ|8CtxBcBG@*0#SDrcY?xSxwaqKq&Vf*{|t)^f9zPE)Z6A||O
zOC9<js>Hk~oXDT<jz9Xla1`8^@Q%nB)nzrR(hk;#<z8wN2yz5pFb>0x1^^Q=2o%qv
zAnE?aj=uJ&KtP%Rg$fu&Ts5ki1_09w8FUbai&A7AJeY~_5~S;CxWI^dDr87O-VB~c
zw~o}6yg-Xbay2bwQ6yfXOPn}YEX{Izx-1C-YdbuS=bnqHd-AT3)8ozW9*)7ESc)mM
zRowo7i`+1QxHBv}MJ42nF$oz`hYsC6ytr!=_-qdpqr<!N<;|bq=V`y&6`&tJ=<_0C
zz~Mm{71voQ*89ttvI#ituCctq@{}=t!afpCA&_!wi*DGNnYUi{AS4Z9)#!0XOnio;
z5fN1++CuOUC}u?8U<PnOQQu%HNbc1)m=h2?(lSWL0PTW@kUbYjdg7sX%IU!IU|Noc
zyn!%d2W^S5IBcSue`I*WtN*Dslr$K1-(imi3Qo5x5_N_|5hloR#2#_lY>}5aems;*
zilQSLG~SUlF5VH2E9t-z?mCSMENUD}5-TcO_r%TH{I0ljFC6!|oW47+ey43CI5%)h
zx-}?(?$ID^B}8mEB4R$kbg>NZ2@xRWu*XBC=!}@QN>fwQ(*R?<0e~9ww#Ll2GM=bd
zcKGuxL^#;WAlnjBPFXMp$ED~%M65gDEW1Nqj}rAUjfK;mwB+$iuWL4w5w|n!ZZ=C3
zDX$pxIPqOqI1yc0krNS*J64z(G0=>3UY)LTdckrAZ6&ngv=ufwPP+AXs_aJOhst`y
z|DFfY@TeNrGqH)z5Lrk0p0$gdQRrI7B<~%h;E6#45$VP;2LMHw1mg(^68y%fC&M$;
z=B=nxGk{gBo%4)L#xyMw3k`+CL!nqi(_)h&o?NrA>tHT-a95#6P7J(yxo|pa|3ft{
z=8(b|!q=lYF|PihJ(>>ZG%ZsfQ<SlKM(ff#L&Ec6B22*~4rWGOVp~8QfI9wTbd)g%
zFmBL@C#<$SCw2`wEFc4C+b5y{q;?Vt0f!p+KGLuC4+40|;Ye8?uF&nbc7JJTddTah
zW4_$P!2T&b=Jb%rw`Kh_9q_XC%CIsPIjsIq?%o8>k+Z(@uF_Sy?@~#9l%!Tm>X!PP
zZnZp~!?Hb|@m#*u_=xSX&6Q~`12z~4D8va6$ABGr4B<^;*qEc6kgz~bhfim5E+7YC
zdlIrCF?n}G;(3>32}#&wSAM_$r&QhQ8N<u&yPwa#pLeF8QmLv`_0)6xkKg}z<V}Wl
z`#sL4%P~0|j&_E>95duw+Sxki)oI?`&AH<RrAzQlj3vx;JnkSDhN2m5q4I_y<fBef
zrDk(><-Yq?Zk}!3cVFu(YJ0Of0szf;7&<Vk4*$G50&Nv8zOA@;9;Qo95}J4~85Pn4
zj?}`FvaKkp0cU4M3<L|8<s(M)n7~#ouePU)*o&?Wv}9Avndi^rgXIbW4ZZ7LCKq>e
z#lW@ESW7m!;z^S9DE!Bf5xR(s;`*^0fGU2twu4u@QARCzrW9dztm=(MMzgFe3;u``
zyII*L2RQ76f9F@1KU44+-b^j+-LAg7I=Q;4Z?0}|{QT-&%d3|cAY#>wC-`{nJ=G68
z4(g`<C$vw84AU=0C?WN(D9tE$2*iBKPIdy+TpdEMHkER{v~LMn(GuOGP43ghHoNSt
z)IooCh&kes!0a56#K8(rLl{Xd>0eIa-;*Zt&Xbj-roqXeBqYs}+ti!(1$IwL4pXCQ
zaEb0QaW?gE_QnCRo)~WM^XLCQ?u+}3qF<7z<_rUV#-0!7ub4mX3zU4$;hY@x7Y$$1
zCA}wAUx=gzB4<9YF=XC}9PkhXO1xyoM9>6RY2(HM17a}3W$1<7F*N+b@AOv=<dP32
za|bGc{rOD8r5oazFI3{y^W_iwlS%)F%kzJ2mIL$ifilPylg%e2K}dswA|1PJhDQtj
zyALAGQsb2gu~3kmgLv8<awSt;NkCRx*D8nSM@Q!mSKQB;(+A4s1E*))PqWbh2;LmN
zL@sR%UnAFUclmc|MXG}euxPugkg*SXDHU)lRA<uQSNeTcr2Bo=V^=(K8HV;k>_WhK
z5p?&kinp9Q*CA=e`HT64f^T?36U(Z|mT9~~a6{K+&I>E@ikQzZCU(0nZoo=_VHgia
zwnH4aZbuwzsV8iv^LinDfgZ)6y@8~cDiDkqXqIxhB61f(l-}%#vhci?F064`jxf5l
z=B65g#4j4YGiStw|BORtqz_z5Dd?jpA#El+lOMV$gAqYUebn{!(E|rYM-CkLu~zHB
z2PqBqM>wW;)W_(^QFZvimiwK1yJBaEfHLl#QIswPbF7M7i-x0=s7eRzi0OfI@@C<2
zb~c?R)_aA*CSUtK&JT^2LB2MnF3EtfL}cFG87NTPUT;D#8|S;*2+G?{Om2nrCXJ(S
zLrBllc-z|z=SYfkOv~M-7zYR;tV&n@cV^j|Aog2TUW8+3P!1TT%LT>fL>Niuq`79E
z)SG55D=N*KQpacDO!+)~aC~uWY;oLP7$0BAluoA(>)Qmutp)Co3^KI^xk7l@^V;}=
zy>sc-+Du_`z|TZ;aC&J<OePt`SEFtjeoCADlzd^w5aJ!kLOO+9VhxAyS;mts+ip>G
z*$kD3jg;{n!&n@A<mQ&=mi2cHuK3L0lMIT^-a&(lQ(P?{fqf6i)q^qQ)Gm*8LpbgC
zsENKkc>D`Kdi#4nNhBK4KMfRg%&j|55>#5=)nQz?0T|>08?=FR%Y_wr?G^idv&*S=
zAh3_xw^Oau4UdmL{u6v9vhF9?)i2n#y72nh<#d~a`vP3H{BGwm^;IrYZ`@M#5XUi$
zprFp}stgb;5=t<#h?8bm>U`9l-GE_=CXCV`gI-@hd$!**FfHi0%ksr5EbEG5>9GE}
zuo+EPv*~6d9&Zreuxxp}#OPmGyKv@_{_pt6^cah$^^@s%y#EJ!$q4)U&*FTX2sJ~A
zU^uE9P68hhOfTRsA&zKMBA%jT*2OmiS<kZS%obHsW=N*oDobK<sFFGg?-7+#&O1{R
zO}g2+e5^YWm`LAxTxJjx$S0m0&knfcTXD-Fb#s$B22Ru{-11x7_oWlT`nf_{E|=-s
zAgEfdj;FhXx8;OBbtGA|oBhQR&xQ<5%8rXTlFQ*o!pzn;3u&Qf)lo7IjaK{H+dOKJ
zcuBKogR_kWo7XiP-65ejsNTOMnM`y^WhR0@iKrcj<zh8}c95Lb;wMe|6se)CXHfVk
zpvc*?f_-BlfLh@9+I5Jl;NL8(asKStv&}W0y2ij<XMzd~sew@nu~&4-ZA!s&S}+j!
znWFnjl8$@YWwatCxd1H;_J#nTmjPQ~D{}Nmb_mPP#I|A?^L!?DE|$@$jVlxO|EXj~
z^CRQQ>_nEo<oHPbZ^g5sqmqy~ZWO<&{|WWO!s&8&6tX$*if+u^aBxDn^wiPIG7HyV
zHX78oJ>>(}%?h_3T`1{OSKV|g6w*bVB`=1oD+EJRLYG0~BC~j*?G6vK+!4hv(z~mW
zVH&ofs`{V|1Q`&z*(;=0ahzHO!Rnt^Z?ZlZRkWz4bvznEQVzWLxOSWN60r!@nN|!?
z3uO|!pW-6C0*<B5;fjUwVz33)$gMaa#z2*U3M}jr>x)J7A(?VJIZeWsn{T!&i-8yQ
ztoom%#(lZ?Ew|(!3g1d(+rjWY;KqWzR2*BhQN*H=>{M3Qm5}wvYMXM@Ge--HZGR?_
zY5r(rrP?rIy1naTiDsw4G;dlpOV`Kt+4jQN2EPL<xh%flxeu;|N*i>xT_xEe-9dNO
zkQ`;0P2ieyB@M!GF3X&y8*sT8ysF5@5IH3~I3BG5$RiDaz9WQD!cSc#be()LjO*17
zY*!u^3+eiJ6+RWs*`W|wE2fO><)&;+SD*#LNEhIoT%H;yBE%Q)MOVsbUJV`5BAN|O
z7}-SD_)st#&jweWzRnEsZznm5rVmSYFx9Gr1Ipy^i{pyOfco~uf@A-wziS>Aky2l+
zx_g={eGWd?|E?;6-{HfDn`)0IH?(O;;;#bE%X%b`LrZ}Gl``Ctyeqk-GL1t%Mqo6=
ztNuSVUNf3wf*UiV4{d)<?>*Zfx({;D+&`M@e<xj-89n&5uR*_D^*X~ITAw?o9Qhyv
zEMBh%0E=qU^eYhl9AJ1>zqr1KY+ulOJlja51Cf39K65dh2pPw{FYxkTw|%~A1Hoi!
z(d5ENAf0Grk9&hdR(=TwFH)O%CB0lk><|tR1Vpl9Ac(H#BDauO7Yo@V+&*TJR8sv}
z_Ajihy{1uOp_s-aK-+73<=q!?p<Fx8Hd%VFT-7*GGE0gYchQa|51iDkDGO=>8n^JS
zx0twaM>wq7I!F8rXvKY$JeM+{BXx6S1$VMuvWg3QAX!ZWVlPrVN&Mv#)&9Q~YMpE3
z&Ypb|zKG{Zqw#2DEDA0emF;(esSrDAd#I2G#UZ^AhRcpwjlDZor5mr(X7x|$&nnzp
zW3>Xy6&%oi5uNm>`hS1(Cu1=?IvKqq`lI$8_8;lVoBu1{Sj*)0SmhN&=qs4g$t@?6
zeuWNbDJVd?fL9@RnKBrFJn{BGt98OSa_oT((U%^zXCXl13CmQKbaM<hy|=y&6Y5{x
zVX7fFHbq99I=XB(C$H>2b>ig72OfA(I)WTuBF-v=YO4eF={A^+B22C}?bbC@i``B&
z-<Y0mOc71kQB=e+JP1yL37*VGl{TwbKof)s57cQZwUp9Zokr(Dm%~7zq1gZd=ZEbN
zk|{)^85>{>=k-s5FpK4+-a71I=+|q|p`~4VLu(j;K<<EN-%5>eFa7s_B|Q@L`HE(~
zG1627CLWCbN>Go6x3&;y`oPz3c~{myQpuVnzdu#89R3gu)!r4z#N(OpnKL|ncOqUg
z4ViA&U0yC<e%;LAlX<oKMIEH>9WWe`nM|C@;oBk)Ddx?F8k1I}R%3=ZJPkSO1$L17
zXg~bIyQUgsCjF)N#up|UqI9#oa46ao6}&-LZqP-#>F6U++H>a+_qUY>uOjS2gRSUq
zTscH&R5~gKD5R=Q_;d>wGJX60W1C0s?>~P3(amG`>%Xi%`m5?7J?*BVAJe8q5X?xN
zSSoAc7zn$rh+F9n3}t52G99VqWicdT=@3MyKA4Vhm&Zx^T{s>p`RXK34w6RsvCI1Z
zJzXHc_?=%($D6*<kUHwfYP#oIe9<HILL?`A(AWRxwn$81CKb}w|8zRiA%)DUoEmz)
z7;3WSsNU^?fCjNb<0dALbh0WIuHI^$6$OrbjE)HQT&c9dJ!Z)|{uMF?c*TK60txGm
z5krWb62)PM9E1nfY5{{LWSY^6qBrF9+H7xj(VW00xW6PmmxxckdM#nkM$6^sDf?jJ
zWTKd;{mkq?M4z7P&HWvx!zqJHeSUzeXmpB8=c2(NmnKdn4%u?)w|vT##PNb~m(P&d
zHZGPqY;dypl@bVB3RMtfAwv<F#-tG9rEfg1x!xS-H#f<n54f_%G9Wq@xq*X7|NOQ%
zil|0(2(5BM6`Vmt`klE)q^;_5c%3{z0*=KV$iiA`jH&TS8>4A=C2t_X#>oB7Iq9Sh
z5&}Y8lUi)<+LL~h*O5RMLK}1uEnLM@c`fF0E24hRd)mlq(#&Wcs<{V>nskDG`@{_s
zw?av$qtRPma>Gk+C5J$O{lB|)YP4V%ioIK>ihPbjMD_*KzWNP%m>=90<@(9!tuMXd
zrMI!r5kHuW-aGik9}RwSUX(YoKGknPYL!W_jnE_+U#F<AmT9XRxe6mfz_7ANHEAPN
zWvTJ+wKv;#I~v{OG3{5|H@Leu+RtpZCkjVOmTi@;v(_yA_0E-(TpDffvu|wk3)#KF
zE^uX|l(+Mx-_EaD4ALfY+&04PUD|84w~D1!Y=0{l#^YY7rXrmIh$o`N3J$RCl@-hO
zwpZpn!1W^99wuL0F789cUlG9~?zO<}A*^$3@LnGfa`8P<xF{}#nIQ>R&py%L_@IYn
zJi?(!A{5etVFa9HI-#RqhFO3JfsO^FV)3Bi3kSVqJ_tp^kyJb$PlQ9Bq-93Do(OSj
zK3~MlCG`a9$%3g&D!~uEPY5^Ojo=;&60b(VRp@ywVH@5+jL<D3Ouogaq3Z@7^FDqS
zBB_**m|H@L{k~Wt&f--uGvoC}GiEFrOU1Z89AM3aNHhYR>o*K)7xf0i-e71nCi1Ij
zhYmf!;(I|olE>1}<S0=9++gM4jFmGGGZD;07Q1veKqJDik(6|u&KK%of6QPY`Ms0A
zfbI3NzLs}17#j1EQOxhLB|m)fi^tvuQPZ!t?=H^W{r)rhM?MbF=9`Q~Y;TBPjD~`v
zYG>Stc>THfWyjtM&Fuf@;@$S_-A~*Nmf=w83s4O4<eo*cKQ2%?X)+wnX(>+w5hZqb
zkL7ik5VPw0xF{n`14GmzM8N>+T?B;yO|MwG*-AztiF0g{rtI~em2K<93m^WkEIIN<
zJz7Wy0zu4{#$%b$AI>E80yTYoB$<pnTYa;9y!j)ML?ZI>o}P&$6XDj$?{%{O1(rE^
z;~jxSnDh=t$oN1ulBeG~1B-<#qR<og(qAOedPQx&*S=%cKKY3u`yKXgy`ksr+h^@l
zQdxI!hyhO=o!r#IvXqI!_-I+B1qh8qPZwH@G61ntSgKkH@3Ga@vw9CH%efhlB3=>Q
z&RI3YOhsOjP<B#g$g(T=zXSl_h>#<^9COOv19d{cL^(S!aGBt7JXvIpOLq=?7CBX4
zpzrkSSfdp;!N7#`=}latXE~r7>cF(_jsKUQ65HU9(F?Tyo1c=tc<R?>|JUCu`(H6=
z<p7PWzu#kyL_@O^x=DOcZaTU5YwWS~*bhVfcSc1nF&H1o-M$|Z?gQYvVp5ubl1bwk
zWF*}|0-&XtJ>T@TCJ7GKF9@YrD3#v3HQ4EHog?B%ayk|cl=M+|Psw-U{<Y5hKvuQD
za$qNV$G*4!QT?`i?R9<KzPG_AGf50x;w-Y8lR*q!bTatdMJ^%)2LO~Z*Aeqo@{OM3
zEW(HU)1&$DNa+4+?hn5!cbqk}KHhxmj?>7`5JGzY(fh+Aug{&xDX78(s<?pYaRm+v
zw`*tAuz~{%A7MQaWGz0C^=nWUI-c$(hH@99U>&}J?k<WsGZjPwAOoKZrOKl|F6>(r
z=~BW-Fvlzb$EPMCCGB?UWx@Pftrp+KBt~Y&{kQLY?SGqSb;bm}NdVlze`hDJG{P_C
zfP-78GfyMZ_w=<FN0Y=kvbu4;meW1siy#x@xq4yfThBE&VR>Tdx!gV6HBkudPwaO@
z1&rh3t>;S9qd>Gv7@iN&9MTw=p7A&tK#Rm-4EAK%AXh_J8rrYIwsa;Uo-gn7B_q#8
zlD-*<%8Kcl`sjagfGvE@0T<K#zbQRedS2sg^ld_-!#$E&x$DGkbY1wu{aib9rvF^C
z(?oY`DiiJ&3aWVJte_EIOO<6pA}cXC95sM+CaULJOKqt#K7FD^qp|MvsYqSJ);hma
z`*lgfeDY)${HH;K^LOUV^BP(~Y>8la(FmNQ><mDo{y)o0p!_v2yK@a6nSm(w(7PoX
z@Iq5GgPmV>UCZ8@yo|H9?*&AQqI#KqAdyGa+P)Hd>KLC?%d2;3<AEoGk&4$@v_L?C
zp$-6smDy|#9~->VR``}!w*R~^T^|FCq4jAjjl4$w#B!g7om_iln|uU4$M6{I|CPK{
zs+5SnBvC*KDrEBcOeW8dkVg;YyFK?skZ8LbN?Q`$NxhaI!A+>_1zu{7K)MsME>qjF
zpj`|K(g#eFfO<2$Sa-%&^?US`Gpj!O0gPzLDW8>a;J?=drwW-duP<55X3MR?Yv>a@
zO~2b=pOz`KDF~kn_vH$H0(7$#GfzfW$2!|}e&}p>P`y=|G-88vO!Q*i8mG&&sx$uf
zt%ypX_yZ~#V-UL`;}K^pf#?;)sdQB}o0NBf8m%%`<-(f26$>_5K!J(P;QF+R5`n@p
zCQE2M=r1Say-vtfD)ILGkr=$N9b$A|){vTax<G>kA1<oOpGmqzrVtlmZfq9ReD9z=
zi@(h%YUYfxDPP2?_qdWdxRZK;oN3`|3=lBvfAcNjRdB5<a~+gvGhH~dvbKiJ1gK+|
z%Xiczuq9S$SP>5LpsWz0#(#&kt;K);IPBmt?WeUbXkQknH11WZ{G7MCLV_<sLzxeT
zQIlCAJ_rFrzQVSZrYP)t$N^!cZRJpB_BtO7{ajED_xD*d%U6EiZs#nESnqu;1o*)X
z>O7jS!&HLI?Mm*b5c7?nkgx(4(neClWHk5&iQ%gV4VEN$!e28rJ6F%^tNHreEJ?BS
zq}P+seQ6ea)x9>0vKoQ3kEOvp$=y>y<m=&6$5bnmz9FJ}V#u;MK;R<b_ryFpM<NmR
zAt$^hH}!eq?(r7lJ2`E_{lEDou_y<u4AQRQ4+jEazwD9H4VfO{*7!MNcFTxoN69vy
z8qLOyPqJ97&lmNOhZkFwH|ymO^A=w{fIuuZ>+z0wST0shc>K6*jCehUh#u0{x1_z2
zr#j*B#)-?s*Ej9)gs8DML_Qu5r>LO^hhA~|;CqPmalIi=SyeS?gnxkF`U3fSBn!9o
zOK7J)E_>NXJ+Dr6C&$Jnkq$ekX3l69Mg8J&jK{S@QpjYbF!Vhm_h9wxF=0l|$KC<k
z+mdOcHcGyAGTlhd++{RUbuZ`E7E{@g2gwd3qkw^>xF?E<2}hAduAt1zwMS&wLxTU<
zHLrCJg;M^^=|CpJ3@@#%%qP3KjG!e#r&EO|2YmACaB%$LFp^wv{cCqxPn<m&%P8B9
zV_J=}&iM7(i<mJkQ<iE~!Dn}!M3(V$Ydaid-izxBgLN4FuGRP07}`d?-fmmgQ*@(r
zWs;SlJs#IPqXBbU-4~1-vCQ<rgNf`+ei+aXhYY2h$j=_PtmS3O1(9gwPIonpM9_6c
z0b5EQnx1T6RGH3<jvArxu=OB6lTF+;_}$0VU6w5+!8&@l>-q5lUGA9e99Ae02E<C?
zQO@cSg>PU1<loB<+V&B9Z;y-XG2qPRA-i})AYy?jp9P1Iq_83xT}eA5W{Aw^O!N$r
zohvBO+$I>7s0GaYY;Jg;>*Tm12{I&xzhM#_7+zOfD~O1mc+Q_r<<1QH{+-THC>$&y
zXr~ILXEEzEV;Kb8!C>k?-urMonT)qX6?5ZRcVs=F48M${{^oj5ZqZxscIB4%@q~AH
zmn?%)g$0Q7L>s)(S+X7(qHf54!L?Lz^4-;Ok7RiiOML+IjeEF|VX|{sg_Lhf0@1gy
znbDRVC782EfJ5kbEZ7JJ@zTsiLvp-%UY*s%8=HT!g&{PWuQKO|kcx)bKC1fTlO|u(
zUZaU}Au7WrDg%xS8QZt0gd-uy3x`2m=nW`9;Eq_SJW2*M)}T#|mP@gKCmQPiX(;N^
z-<fPQCQT*c^vp?&wMH@;O){O<=xod+DoS_~gYZzE4S6Z>_Ju`^Aox+XYjyF7lVM<y
zPRr?TD8M=}J8g}3(UC$W@W+8lAriRrPSzZYWP@o}rdZ2Kzctskd-3q}=;(Af7|rA|
z39<t1bA*oQ|Hta$V)e4XfJ_3dx~L|V;oU<*K(d%=uC)sEN}P;^0O>Q!)_5y-a>wax
zKrP<0Ypb%~RJkJm?VPx(y=#e!t&{qxVOk)+xWlnnsUP*fHJbZ&{tD&R25FW6#Z7w7
z2Ru+>g0c`=O7ht<T7@&K2`7^d7#=ug1*mpYUwtwY%Q1~e!INv5IiRR5{0MXn(%MDy
z!0giLeD)+0j{A$YAv$UX)3$iaxGYA7I<8<cnOQNLSLgcx`)1jxtxb~fJ<XGHtE=K<
z=O7WyZD<dA!nw6AJg6l?!vQzMY(Bzl)ClgzNm3>rHFis@!n&k<u`mO5wzt(xA?te+
zTp1xs*S5Ag%pdvJeA%f_fBMwRAYN{(xSF-H9A(hO5#CuVv&ADA)qpg3+i++QyxHG4
z$G>me_Q89L{om79(fzwD8{TV@1^3Xsw)oa6*5hE;aoQUopE1FkFV-Z2O6<T6fG-9@
zOlCX<oRnFEI0v!}WLm2$%@}VH3rnH4{ieuOvtctbd3bJgo6q^{a(=_(Yxdq8z3O&W
zhMG7yJ5p@Mmn+r?_+!8q>o#YviU8Bi9sXgjcdi!BMa>+CYUOsuGdg#uGJQ>DC1D?*
z@&&xUkUvvV2$FbEN*Ih}7bHoW>3UnWsRQ$wOyq_vonx?G4m+ek+d-IHZT%1KH&^Zl
zp`JDFvu8!6JLwn>a))l~9PHS)rf2UDa55FR|5b0ff5nt9f%K>BxfrD9q<sh@gKZtU
z)$Sa;^47GvPatsr?5iL(n#$iQUMOM(Zlgw=!0G#p0uu-L0nA)fqDzB4WHhTWvez<9
z_&?a8V-12&F(}Dl$%x{U>vxx;QK??=%)Gp^^XE7js;yVZw}h2p87?(@kzl5j$(NWN
zr6vX(awvXQn8}F~4Skzf66X#V$A_Hb7LDcwxj{3O^ph;3myPDgL)PrITD@j78|}n0
zy)zxrrW{1|uMw_f6<>nMGtN*VB#HNtyci<0@Md%u`y^!(7F?G!rhFB+6p<UdWt&f>
zO^OUu5v7U*1S|5lZ+Xf3;dCQk!pw>zM=^#wNPIN<hed0&TCzv%>?Z<&j;Hih5Yt&a
zG<E&a_((9AiUz{iQBa;T$=qnzpN?@te>xhorrO2EG%`$SYy{jTX#AmVpO{|ka;u|L
zr33FJbxj~w?Eem6>1=E~5s3I74UbuQGvF(vX<;KWIi5_1^+%xqy8`U!jt$y{Hzo9e
zH*sZ-wt73WvMeSB#qDSlHS2N~8JdTcvX6?uMIyT8s7YpC1iX=;;Yp=ZX>Y}-j$37H
z1s6#_TduhGGc1(kk0gTmNIVk@=F?^*VU{wnXbm0Bt*jS+H31RDXRSo1Ie7gF=!HZp
zG19z{E8G^KF#}p7VNo1Z1yg7?r!4C#Sc;<=id@Z*#tm;xBm%5BZCS-lrPp;*r=kt(
z2b+bb8;wnT{M8?hY^=%D@3pyHrA)%ttRYckJvk$rCcE+-Iws`2I8fa4)LH^!OlM$;
z_nL?@4$6hUiJuBV&Ma(Al?iL0*by*-WK5J^YiVnAe5{>2X2mP%4!)_tBK^Nvurk@1
zlI=_76Mrcjzn6*o4%xj8eG|(=?pQvS&=(N(xmM4;Yc6LLx%9^bLu$5zao<6^7sIQ;
zT}VN^%_TAaIEd&pO8N?vR*)`|Y~p)kutZTMM+A>}qMIaAlSyG1IjdF6w3sL>oZ^VT
zPCDTgzZ?MMW>XJ%Ib^NKrTp0Og1yQtR`TbY-b6L@H?sSd-Q9epXqum`nqy|B|F_kI
zx9Qcd_l9KWs@zz%8vnXE&NeO=q~G1R!@mALb<tz;voBn{t6#5fe1-buW%8t}@+Kdz
zQ}@?B>MqZ6t7`l|y`FpR@J9(Jl!SM}X@roGL6woEtSd^Yc0}tPjw!;nSWBB51jTN!
z=CYE^VCP*qQg{pLS;=IDvmnER_)e^)GR(wcssv29y>9Ys?C)mT;f$s@K=zOkdng2w
zaUSHH_>?jUVayEAH6(-5^IDe&5aZWfeH&kUdJ7bh`y{jk#%@t0a!64U!4KPAT$EqK
zZ47gfw_&mfs=c{!aOCv!TJx>;=T7Td%YN&|!B?@c_@R+gy+Y$k`*WxCw-s9U)X77y
zzPLUasS4>x+bu5*#LOY<p{kC)?bfINMX8Ut1q%O`g%Fd2P*x>%C~iXjPx*PJjf6iC
zHyY;~|N15W`47LUEsOCX*&w_7ST}gzpEo2T-6aVDNP;98nieWnb#RaRlE5Fhy%_{&
z8nUgoUHQrN=^QXP#A%`F0bNUuM_v;d-~W?A&&NDBIbUuIu^&3M3nvvmy2G|Amv55M
zKGH~}Qun(%iS=RZslPRJab>4NzQSY^_a7vJMgF_4Wq2dBVG-hbp?~GGUoP2;h=+y6
z{x6+aDRkb_e;Svw!mK*p|3<p7c>kGBspHd+6w=(-q-6!norjqVAw(Ckj2a|bu`k(&
zPbs`$1pygurId2nSA5NA54`yYpZZq94Eat)A}ijYnM{~L?>*5x^h1u`6N$8a>L^#p
z(Z{nhGg->l!_8(mBHq2JLgbX!yTa;TB+a<T7cvw4HXprb=h#WPEl8pIT{iooW<>p#
zA>wrE1!#K>A28^oUU4`u&>I{Ui&!da!E`{~T-Oh5uegy9aVxZM4(aQ+If(OZeqS_1
zUU#q82t|E<6}tDdefqRLf5Zrd49bi>KX0Gbw*+X`Jy?)~lEWIyC3)cK1AM{0Sv-BZ
zIQJB%_(dT6Ef%RLo@OR=k<m91@Pbqr4WP~tmg<O_zLV?>;ttWkWS7&`I<a<lAe4(o
zmacUm%vh!-zWL1wdv)uA5C%+MjSCmZT_sA!8V^`!Ph9%7stD2iXSRu=+!lyIR#Meh
z#oMm;wyoxBW8>8F$&=UZlj_}~)%8!16VDc$rYcOlMo_B5!)0fAAN~SJ%Q@v-SF6F=
zMT&`gz?Kk!0(CAQ9OQ_!I)B7wIxbtB(=YcY0_h40t|vn>{vc=>i97=tGerjd=wfsv
znoop1hCgbCi<9IWWjQR5o{aePh%cM=&?C`Ir&_<BfLKoyp(YgZh2H5W?l%%9;3_bZ
zh>yf0X4u2BXlXMZ@F(mKN7B)Jr;McTj~gS$ZmfHJo)BQ7*OOf;0Mm_JQ3_>3`E04_
z_oqkA_Q5f*#8f;GrZrr9llUalSrWTs9rm{Hq^lc@7@2(9*7)+#>FJ}(<Bw#IAJ2Af
zDVJ}N_1R}`KDrnVFCM*lruX5Sn$4Tq!RxLwxTR?C>rhw;m)7(}rJ6delp|rm(xMpf
z+&>9X8pd;VO<eC1i9|IKj0C&^@kZby668RFJjyFY3BjT0+wx^>*(%Hwq884Kpqv5n
z5awqK*7BI#<c}n<higlU$U0G5k|9Y<Ad;X5vB6T2TbOT{D9Cjza;=aAbRkilNCBXx
znJL-UU}`(2D!p|$b-MKA2%fU#{nkq)uhhuQNTD&}iAF%wM*5p;o}!s6>P<);lDH$4
ze|d6jer;9G=dy(~S-kY{XmiA>7eMn4y*6R8;PR6@7gsK)Azeq8AgoFP>roToRq_GG
zf;1{7whMOqt6y!~XNgu9Fk^F5U$ZZ3TxP>gomndWO%j~5O^@WT06_-@ZUioA3%zq3
zZn@`<3gbB0MnaAEm~({zKroFfBY%!xZDG!QPa_m@QGw^=Oh;8$Ku}3^iDq7PfC-hs
z06B=tDpu28T3l||^w*xU=WZ`vkS<J@Sm{dnsP%Nc%YwwW+xzLhe9(B0yb!)>{(ygQ
z_ic}cm@7dEikKM6L1(95>Pp2>v|DwTa&_D87E*r-thq=W?CX&A_``<8pT4$*J1b6H
z68nwIXY_98l-fdC1ZxqbA%{>+t5q+46Om18UN8rvF5WKCR&CGg6jDD=o(BHu<LYJC
zWK8l>Ld(PtBB~dOE+dlV{7HFd^@bt|Y}0x~C^>J)xZHh5hOB9+PFs1wSH%ZSy=x|U
z-R9=~p>*itH}3Gp3<@6Zj|8mg#3Ii>>h(tMcC2d7n~O)NjFt=HBQJ5k6-E49)fb9w
zF?l&Sd<21_zUK(!6EPTH$Zg2`YyA70IOh-AJ~0w3PW!JK4#mF8KV1xtB;3A9HTMTz
zT?XLbxBIToIlts&ERwu@a@UMLxjz+&Ii1NRx$E~$IJx4SsV?4v)4ai6xpYXE69e>~
zalg5W?3pU?=fcwj?hXb%pbJNp3yV5U8#Y;DPoSP1jad>|N>V_PxKM(Lq;LnM2$YV}
zBHmG800TM$N-Z-3i=<MlMe5R@LFv7rAhtcR5x&`eM$lt3y4)1SS6L1Dz8dh~n#|B7
z2hnM7+;+f%!kg_Q(!p<Be)?67BhImJHlE>-H=GLI8cB^a$lSQ0xU!reN9@!k8z5I4
z9<CLkEXu2A(4**rB%_2@2+>(t`K`N2fuuS!^e(qPPAUpB*E3Bqm{@gvEyx;~YOY0d
z_Y!a2-_)^%%FuTzw!Q6)MZUqsU9X}%EaOVtKyK9T)b4@ix#~2}7Bqn&2Y;n<mc)Wd
zjZmRD>KsIoS|O0kkuqf3AT>&~c-wg&=M9GUA)k-g{?T+SV}$*IsK*YB$UcU^Kr~HC
z93vA;j|6N_%<m7&{;1!EBd@qVdg9x(asK>S7fyCR@&B~#KqiE%p4T=qVV}<zzQ^bF
zhcY<9g)#PJ3_iDZJ*%Wu#K0_3#&->n=hq9}UROA{M8FDjM$sZF&p=6Oi!_H3)(|E}
z#8c!p^LRUT#TBXcar3sws%bX#@@GC14Yc+d^T(>yWAnzoR$wF+`z^*QPMn04Z!=1-
z(cZ4To3Sd!T#%dZ!>HSC=PZOw6-(Z>a`hqk(vMO7h3*k>ExS9G;hmcZZqHrXyvNXu
z^f}w>F9HhrvA71R(O5udX+J#>k5mI*+vhLoddcs*<kYKWI8pQf!R1+>H>3M47NgdE
zH6KooL2urNVbe>nQP#_jFK?)GexEPs%OfXw?v@P3ls{hz_~1Q8Fz@#-`#r3v#0Z=6
zhZ3H^cRh23Yc={e2`~NZOM1O!B(Q)NH--_S=EJ&o!s|`?@Xy>m<?|IhK8&osvR7A6
z=IKMSzGO9GeQ&x483mAO5cwvaOybkf7G!Y;eyi67&K>Y|5Z{(CD~_1@N#fpigWy(x
z{n82BEL3fLgFD@+Yg%@}v=eFJT+b%QMhdKMJ2K{k%&nI;M;Ed-E6&WE94%%KzGJmx
zw~p2)I|VztFe=>4Vfu~{&<TbR9<NXvrTq%UfW9eD!-3haW0GJ2-CyPqh&Emc&!r2v
zSKzC_PXEGl%C5Ku|5=BYx*kRUEBuLcyf*#^J&E)+bdLSvL}W>12(0Ff?<SdU>_YRb
zLjWD-vnp;KGI@8T29begg%5xOw24ty#uqn505Dby8a8b6MRP#_GaYl}_DfQ$@A62G
zD0p;wrIgE>=G4*F_;~B+lysTLBNjT=|Lz?gS-QU)3A-0crvzsF61U=BAC3^WBEp-R
z`cq24NT5d^#>2x2*kNKKl?#Ebs}M4Fc0?-K^}6UUQ&~ow<P>1=DUOAl49ohB{*R4L
zlTw8k$caNEQy&tmay(ixf{4FKJ66ohJw9@1LPW`Isu+!n@wzaV`Lm$$iI|<_nyd9U
zjZN)bF*Q55py-?p8l`Alza!<|pW79jCp^Z@KOs*UG`t8;0(e|Q!;2@1yp|*1q9`j?
zGMubo#d5hYK!*r3%qc$LhrHCGa>%u@%jfu5DLcEzwjMe)3}cwCtyjObJUS+|bAKH!
zUu;W1GW5ewx)FZ6`DUhxe!7OvISs{E>WP~9bi@n44~|(5hQUOmPt=RJEM0t_+7w4@
zm-Y_?rXz06<kKEaq$V?Rrtdm9{P&^iRn`@(yBl_wnM}pU?BVx|Oa}sV{M+2X)Xkxv
zvyehhVN#BFRscRGHtt2`)MzOaod_D2GG<;y;AfN_D9A9!cJ~S8=&r7wyNG8-#kzO#
zK@zO6#JoF2-OuyQ4mLmcoBPQ)GL_iB4H!2jNQ(gGdz8Ono>v9hnDeq;#$Z^Pj5act
zK6d-<ZsriY^Hv6x)E`}4^-b<SF-_}@i0U|fV*jLX^}<dXl3ianv(pr9yW#d!L-cQv
z2M!Xb^H=&`u@_@>v<U(c#L~j6MYQx|KZxk~ikCle(5}Bif9TlON01F)QMV61@$y&j
z3(;p}f=Gz<KnL8N9~Nu#K$DR4>u?T)D-xCrR6o~Ne9PKmqLD8&ZNF(uE|Fy+&HY>*
z(EWUVfdHwR6&PcQy6g<i=~_O0G-#3MDtoZ&vcWhNJ20xJqI`n!i8=T`IF2sKkK{IT
zxf3Trf(G_r*PH2qQfd9nNiaU0b%+E7KCkZ0bVi~O3DJmq4dgauZ<4i#TDmsAR1W(?
z;Z!v{dBtMU=N~_K<GhuN1pT4P(wMH*uHF~(rBVPVUSD~sGr7>cs_OS7)4ur9RaM@@
zMkjhk87=b)H5O`u5NeV~G9x0W5RQ}z{W71v-k*z|hjSdrI6J3_Sm^zN-n%}U)JgUF
zjpir&Ka+_j1;{*2?8A{yeo{Ta<^j(j3yW!6z;2_?<jvH<$uM!CVG>qmzC}Os@Y(m&
zo_)UdytZclg6-2EUOS?1HQ#r((SKLX*F0PPMcdbZ%ly?>L+*20ZqVa%*eh@(uGSeY
zGUH^*ffS;Ph*O?Y0os=IzdIM}<mAF&WHA(2_|!3`PyeHRzi%a;&Bl>e(%!k^sZAJT
zy2LVFAqQyjP5APab04UVan;g9$L#*eKNj!zXXC#c&&H$k_9--&e0DPLEqeu)DdmEp
za<-Ux*$3=w{PnM2m2dz7=P%IAk{}K6FoP9}p+T-+r@}2F3k<4;M>u$2%lei<0s*^!
zErHi&DEij^?e;_EW&7_M{cq@<Gx~{>tE>G#n>WQr)6D1}u^$SSmrBis_ios;YX%4b
zl8e=>PV*?Si5|72M;VpUG+_8dv&d4DmZb7Q<^swcujiVjzYK%}qLVG!`bYYo!kU3~
zzE0frX51c0^gr61`|ZDE!R9S=pCgNQ|8_l7D6G#l53c{n6u_JFs@wWk=<X5}pI60W
zTbkR6FjR<>8&rsvBSD2b#2uxF1`+k=Z;zLH^&_dmE4?5Xk*&r4ms5pcph1m(ri4==
zQi{h@N^mYQqThU?f^h}M3hyf;QKBaMzb06^hSyt@>fKxNco1j6LP~`(F`_bnoY=2t
zFqIS;K%izQhyuJQCMj?_x(Lo}QfpH@FKWQASm>zPk|RPWsRB)fiOET;=gR0Mpl{>k
zD?*7#G}XwIKKC(uV}HOC3B9`zO%zh`oNwBG=@rz!erx^qp6flOcM{p)t!p2PB-61-
zggC;V<7ZdnGE^YNK&p_4PT4R02Y)n>(NlK}D*p`hZUlNaEh!~LC#Tt@i1)8Jqo}=o
zZL8|Cecnz|3c0cZUzvq1rIWX16)eWm27^gLG5h}_R(HzmT>Q%XHB-VAy?XC9(a10R
ze7q2<3E|I)%YEeyE_dwB&#zs{f~u*Bv28p)-?jz`bKz0~G%{A3z+s-h<^*L7#c3#8
zSQlJXMRH^m5=f(OJ^CH{JFHC8;N#J4bvN<IQWwFyxD^a+%{l8_JJdA7<3ti9>;}r2
zL!(B!ljP8~VTU>TR5cX$a%e@nr2s@3e+mfFo5wLwM+4q~Z!9sNAG`dDK|lXn`<Dyp
zxi{K>$H2;G^7R}j+{ldWpE1gM_Bhx!E2j~^OaOZRhumI1V*koqy6^^D?6SnFAk5B;
zFj#YSZosVB<zkjf7Q9D{CKDg5#DYj%%)G8d!$7HU*_8X)KfkfDA({T0+7Ci1pFlv#
z0Wa=D@4~Pv;@7U`<tkn~4i5@$05oP^%CKUDSNAAo21np<gY%baVq4{Lt1vcJu*S>%
z2i1o<fMq3Vq336<Wcn{D&Nn?GIZ2|sIZEDFTA#UY+{#~FtzMnC#;=<hd<+ien}iy!
zkQB+ZlFheM@;gTuB%OhqE>16?3W6&NRJXNx>^y<c#Hnu{Jx^ftdD`2(GQm)hSRe)B
z4v4Y%L*U`!h@6#H*-%`Z@ETS>6bMb(a|eF=t9tV}yrd8Whi!pCAWE&;?sYnn?oI&j
z3k+Uas9vO$eabm=N2zo;m0%tgVipc=$hOFc`Xhe7mFoXBS;$j=7%)n$pLm!5;dej<
zCvLk9^O0`eDrf#IWkpBhrIlji#`){7pS#JPXtIPnvtf5gmGPVq>)J(w3Kl8W0Y&Dr
zcoh%!2kOG$+a*Kp6$2pW-c^<I!v%*f9faE|^qaNmgE0qXJS&8Q81Yz$u5ytvmUz{%
z_R-jN7&Tl%2{-7HOhaI~ivD|E@BDp>FTR_=&*;#uzUfJ&E1r1&x8u%^etBHck|tzg
zn_ktb(yVRdY!G??CNcbCQOqJBfamBRcYn>QJ=}(0dk($ObG+W6%1Xw_i2#s^nJs!0
zqq@Sw1Li##$F!N7W-@_vI*?&!XkXt92ECc9ue$2$j2Da8&^`mhG39Q;wTl2)!l@m5
zf)FMInE_#vE)oV6s0x?DD%cXGzwaQ80JvMwAy;wN@%`zu0Lb>H5G%2r)E#Z!xuA#5
zv3Y^fp=q~xG|T|=OogM`9lV%;jSRf+CpN88Q9b62TPnwZeSzpSx7PZ@-(Ogoo%-7M
zj7tM*=QZ`_|NEG<J+s5{ihIG?;krZ(N1zSwUottK5Z;OId*^_M-ZjvJFP$C#=!TqK
z{7Kye%N9e0Bq>!XeHe7EWF&fHjrd;ZgxAsFl;kV;KYkBR4pH2U#4;uG+kFG9XOd&i
zNg@}RWBpJTy^|0vg{;3l6L~RCD><|9_+WOUSPW&H`{}tO2d4Dv#AMFs+Dc*I*E^lg
zE4<-{7*0D{ro`onYl4jDQD}}+_lt~-1A~F8n1QgnjHXE#4#rurO<GQTnS&aUlV_0k
zR1%t!UC80T=baFjlnQrgdaPQL#TBc0&zdq@=v~13ofOhSu=y3)dsCyPtfp#?rULPJ
zC=`ze)aA|2o@pr67E}&ewA<vCsW<?dd&Oj3JGaVvt4E+6H)QIm_#3Bkd+L%=;8tgI
zs49vzxGk1ZM$Ahe-5P$Rs2a%T{PC8ZULUYb!hKSy843Lve)SAN2LGEL<?<dG2V;1{
z;=G%=2$Ql%YJhNEBWt#$hV)Q-i~2S+bV;`*FYCPco$0xS>B1LD0Uh{!bf+z%xlr52
z;;H(2Pb>T&06WW?HFL97>lUOBx9JT3icR(r=O>^Djy&*NfNY{qf{kE^Ffjf(;J@r5
zG2;LVVK$vTL8~z~TW!S$q|Suz5*NCpZ(Zr};z^C1ug53tYPy&=s`g}DkA`rK^?I&!
zPN&-CGE%WR!g4BG%~+&V9XD8+((sL#6}uWH9I9$p%n=U6;^Wm)grE$$hQ)=($E(F?
ztl6XHB3t|k-aw~GhlVDsoPd-ZYf)+Dzsh7DaQ0y&`$R>6%M6raVg91|Ot|eYGO^Ml
zR`$}5-&yi!s=06>pNxhRvBX#|UntDjf$Ru;C6P~vqFfTzULwrPr<)~5wk2TrHxg#p
zf75`hJUUmH&Kv3RY;u&lRI;Npv1qQE4@^jysQ5Jq+$`Bkp+4N+uiJ~`$pQl6AX;)D
zONn2Z7!pKyP^u+dkrAUz%97Ut=lnL^MfyJJ;N8p<NBSG*nWp5Nfq%MoDp`1e<N(_9
z+WPgEuPWBih5U*yegRZZl2c*YRGfG44Ds5M<e%l%Fo`t;E<?M<Mj?KBV*HY)t0ZCK
z_V13*bYy%qvzZ<n*Gt{!x@Ux@sl0;e>#u)a`xLsXGbqhKI2kd`NHQE4umq87Vkoa=
zWk;6|+_Cx^b#eBot$-7Wx`UHTi?9(T+9|zOcQT#IbIwlX7Sf3@YY5irang%Top|t<
zTs2O47ASMOu6=uoWMXlWkI1#@h1}F{KJdT;1NJtUFq<@z_~>dGo@U8<A12O)&#jz#
z<xk!)x_1BT^~ZecmA9)ezjp2Gxb!A%UjIe?%P8I^f`^D4#8~2D0J`Ou%%pX3h;L*4
z<G3W;GGr?!C?salKR8SFltXi~CuLF1-zOBmHQNe>zLZED36F$Bp(BZR#A4A(>>1qX
z@$q|NHWoWLH+KpT`Ckli=`t7f<k~Q+J|9WElY7OuHo(=it1B)`)Ymw$NsExT8@0Q&
zS88u&ae*har>L*Axrk;;&4$4;+etrx6iwiIfcBSJWf<k^0B(0Cm-51)FJ9;yp?r!*
zztFk8zx)2L9Lf|)O52W%epaGg^qaBYjhX%vtoid#Ihmy2ZFBIuolw8{-e+Y1DfI}c
zw2Q+uN!W6!!hegz<B^XxWnKsTzCc3)LZvk2n;h-_Pn`noa>%xm)xXG)BAt~kYSqrf
z5G!4(jDP>2q4#0j4Fp($Kq>hb`DhKhwyS(054gfvX?&>`4%e2(-A@G!;;pqu?ZX#9
z>kTBnYjZV3?;N=j3bouLJ1$$Id73J%SX?RP!>(y=P)<eP^-S9$a~*c~y<Tan1UB@T
zPB%mPB`7HZnYx!Z=fxSEioVy;^_V>jRW)8gR2&nRmCc$~jx+T-BUSL-dc9VcueCP*
z1n`TN?5$YV3R}i3$cZIi`3=tW(R4Z*BO#={Je~JU`%p@W#a>s5ipyz_4$f=_f*7YK
zhz<@K#15xCUY5Q{s~v8^;R)>4hGF{TR7Tg2J2#A`-;k>>*((8wQtiAreeJB+{MHFQ
zj(a3RIpp_RKA(lNfdnjb&`*|jK78Yx3&_$wId6b-;~ezTG!DeKtvrQEMddhLh&co1
z?RZitieAY;IT;&{EvnuorVM1%k^HO+_lz7Ui?tw~Dn?>s3q_K+ebrvrIk;f|Lb~u$
zk9X=wL%-=vDlO<s`M^jiJ(Hh2JRb{@3iiwP!p`vpyZ<z;_0mu#Jag@WACBN6Wa9Xx
zvb-z~81tgg80s3Rut<ifWa33ID!mKp77LzN02~bSZ8)Z&6S4ND%OBS`+FUoy^(Ia+
z!+{jCc&{7JS_JW^L+>OZWSh1DNwe@7lDG-^1cPe{Ws_x}#FvPgR4Ri{;0ew+$2#P~
z!S`EjH`FdM5JUfD;1b>g>e9q%osHgQ<(V#N36V?5=0K=KlR4nhT`zvMQQ&b?#i%(e
z;mpB(CEP<))KhQ|?9SpgE){fl+U^c0jjF0tad=<8(})!ksmV);S;j2$s$^T^K1;1H
zcFy#ACE5JAY<i`^zmB`3KF>5dtfAH4I@@XBF8DyFQ|k4;pte7*wi~6A`aws1=o(A%
ztUA|r_)ub+sp5RaeO;OT6`2CcMB$b<GF{%=-CB>#Po8ZIWS3r-HtVe^v1A>wWR1Zs
zohe!I25%;Bhz&*E#N6Uvr`PM8?UB7j#j2QV#P2C{WfQ_9&XQ&5g|n<1EEqXS{U;lx
zNPeIWxI=jzf+;N~ZRxhDeCkiC29b?qAVH*H$jSKIdTzVd!?3!pw)$sxF6*Bkcp0$3
z_c@UfJI^sLns`S@Y@+M96+@~aa8B`9FXLZ%e2b7RC_L2>!v)om^c4!Vasmm!L=kNy
z0lvsKYh77KCzxY&xjW4>Zo`Tw)-@F#C5wzJC<>3FGiOxWipIUI246*x7=2Os12}*%
z`d<q-=t>K6PA!yW0O_htpSg%@>GIk}?ebD%wLaflRSN}walXC_57e(|C92g#>zexe
ztm__p>M8uwKQ@1z^*-L;jgye^pGAV_9n}bLFEUgK7{CU)B>78a-K|b{yR*LD=`|a@
z-b?Pk?DW<<-a+MM^__3P24wCm^G%2eHI@-h^C=}j<}n(IQL7V|=;$v>brBP*GMB9^
z4~w$o`D>irYW{XCUfJJl{!890hGRy<h=s|?>GACOs^8!!<pn+Ynr_eRZ#L7-e62Im
zxYn$OgZ@&<9}HK`Slszm^oJtVTrjfWrXNsk-_^gWe*$hE;spv+AERI!gC1Cvj7+I0
zb+7YXzeik7?Qd>vZQJe3?92EgBI{?iwsccD*jAc%5zpnGVgWR_c{gbsCpR@wi$n4O
znvh?fR`kdukVpdTkx(=xtE(Je{R;%~pS16ruqWKVy(z!8Ie)4+?VjW+^;Bm(Wx(|$
z>o?qZ*v(;2<`b+E2+k@Vp2sV~h7ga0vO9bRChO=xi#i;cOa#YrR^&$C!ED()8cYy&
zL2i$o(ddrKoisqbbau(^o*KC<X+~cjt?V0t1*bCxJm?k>n@=Feo1#48xu#@T%QBU@
zONfE~kvESK+VxhJ;~aal#JKAXV%*>G)NPZ2Xf!Z++fzm&8cjf7_~+q2Z!e0O<d`Qo
zMJR?iJBZ3D6i=iP36ZEGGMi}Ej^N9jwszt#2S^tkf#ml4FMa7>?CNk`kJcwt>Tg+X
zG0!@!*11+BUCd<EUpCe1Kh1gVr|K~Yl|!v!1C80<*597AEH1ZBv{GiKn09^>Y3Wz@
zrOqksr2bjv&y={1Rtd;MK~~N{gc2#Q0foI%M?4~suG*55x4Jtp+xp2=Ael02OJmhT
zHBZwsI$gkRo<G(R^al#_>A=}if4jAuY_*chtwgJ}9Z1g?#`o27YKgSmNOP2n$z+-g
zq|TN;+2WGHwN$P{|Hvvm5$!72-*AIr#zksFf<unOtV_k{G$jFIU2xS6rROWZdh9!O
z2-voZqFtCgXpP6Rxom7Ke{gc<)c8%2SS~qV%ymRcCu;VmlDSyqrtwqGDmAp{=NtCe
zL?SUUW;Z6w3uRw6lC&bMGK2u1VTIFVB<tg_q)TyWx=d(ISDdblRb>x}Aru}Dh}FWe
z9f%Z7y(fO_JJ2Y^!M&4Lg@Km18@hc}-O=R{j4Tmd7-?*w5h}*sRqkaNTtEw2?VLwe
z7T-J)Lpp$fOz-}=UMGh$k04f#zn^edOO*bqzh0H-n~X3YH@-(aZ&C3SWa(L45H$kV
z7}%!%oBba~?UxrYhab=wt&`qyV!^JhR8pzRO3hxF$oakX(RXD_+2bX>yDl}9O?@mI
z$Y$c%LWaLsHWSE>4ZXiCBQ>SsPDlvkfRn>?Od5B<vX{h|U0GhiX-ct5iBNQ4RHc|H
zsNpw+U$d4(VYTowwd*c2H4IvGg;h6{l}DwrXh1DoVU20tE~lFM27eq5YAyXc%%CLA
zmYMSjo@-=Gyi>m8EzBG^(QKYLFjMe;XGL#$(jZ95d?D@We^J+=`OfMAYqWV0p;SWJ
zoDczF^`sCW#gW7ArR4z#>fi-ec+|&5Uxm%*a{Z0o4()z2zqFLMmX=P(#>WBB#-}d&
zuFKk!uvNU@*(rQu$x;`zN#Si%-g(jYA!Z^zC}ImzQH<{RQ0SAmIv9#o-8|8G(j5uC
zCO}lDb+V_ID%Y;H6mgP{Xcm5;wF&8T;#e-gDvqMm-L1Vsdn1z_Yn6y(|AQGJ#e2u;
zdL)z~jj-}vPYf^q@%isFS>($DVJAK=J2sY;@+L>O50Deg;qBK9Od$ID_mens#ErHq
zIk#hlY8NFy#gsXMTIj-5Lp>ofkBAJHuyxU3+L8)%4>x~oa}!-eR_;(C4{~2RV;gal
zgRVM;!vY>f#0$We-87P0_PzRT{f|mQNy!eghQq=p!=4A5TqR^@;Hsc^l;?uF-5T1t
zx(YxU;S1_CI6H7$;5|B!9TCb)>>ZKY3G<N&Zm3!A5Ok402auDK7ZIzYa8Aoot5=u{
z4G&JzUM#p&17Ao`?r<bl&e)65LV0rR0x^w+{x?&FWGodl#!|72Kb4M=YHuWC+E&K=
z763yhlmkw;ypdRGBseq1`YFGHQw`IC){o`<fn*{bViCqdDq-akkMtB{l9~(jBK~g|
zQDlTS^`A+s{_n{eP+xAh?~<|?Jy|<;>{ye+y&YmKG0>tc4Q4ySpn-(e1{SpR?GGG0
z_<`3~9)7rT&kg3WyCx^^I%etzVvjx=d&#*QZa7z5xZ`kebv1bS4m!dmTH+N@C#j#&
zw(tsAUS9st!%Gi8yzfW!=ElZdAAa$RKYSMi*XfWg06`gA`Jq=^B8;vk%lt|^lW%k2
z50KvO(YWW&6O!3{z<r}0qiU_O+I;c>^)`+$=#|@v<K-obscqt|agkf%%;rYV7318`
z0YBKL)g?ukq;VvEYgdLEmZx^IeIp$>fPTwSToAjQp@rt;O5r3Ga;BKx%apR>#Pl?7
zOW_Zt3(A%0P1*TEaew~hUAf4e-+byMPMcs^kKmshDKdxsn(|;e9EoPqFXy#?XkZJ>
zY7<nGDT0hEatVsbK&LB{FHM4}$e&gx?eKP^gUdNS-7ud1&+b3&IllkJckaK+bJhMI
z=#hOT6wRTufq=aJ^&foi+S+?*4aXDkOR6<S#j#E=Thc))ije#T4i1PXg%D~fk~-%b
z8?Qd{gZ@JQ_7OiSVd08m|K)F3J%9cgp%gzD4hvoO6vAPVAg-|W_kXF`d>JA87rhVj
z{?hl+zwh_a*K(%hU(Dfj6^izslUF)>_Pxqu$JHEUWsD`H=&O0Hi}VLE?bH!F5U2#Q
zlM$d~)H?2If^Qj|lWP#F5mzPL{i4zJx&y&-E<dsKILf=Ss<XYmkedh|h%I$EXB8%v
z{xF{_%lAvwiuVuB{H*&^@jm#=i+<+bhHi3YE6F}{H4KhHJ6OOEc~#+)%0tnypD1Bf
z&`OzYLxX!b^IY5cId+3KE5d9QSFWkmj<k#62qJ(47zlQ_vBBt#M*Dx|Vq-mbr|X|w
zDdiVxrf2H1V0`Ytzs_9S8XH?aKI_j$A(d~JU&~#dfJcn@)6vC9I-)c$<e|amlD#;V
zVNv?jRn4)clbU)BYPilY2|%^LsaS_i7RzXV_S%=PudlA_*S`1K_4RdG(@5gGJ8+Pp
z%d6N=+I2XNp`UcF{}pw)<gAv<T?*zvKa6rjqrrcDyT1ygKPdXz*(cAgoTUmK#aM>d
zyLCW6@rt|Hj3JX_kZP^cI^Y@LXRReu88TdDf~yptQ__pG!8a7v*;AQPHXHp5=76C#
zw@rO*j}j)xprC=WZD7e)zc<ZoUakZn?sz+76n@WB#G8?4wFGMs#6@IVh5rn!B?<&m
zv;?8wk$1S9nEUOG$uU5$vB}2ji4rhSQ*e5B+YsN}23wuQzTt51Z#Lf_oc%OOxN@bf
zErIAw*)*Ht#cLK(1Vk>opnntBIf-7llF+@EXg^2;!lCOmrW$n;gO3`*qU7%8FD7CS
z>+qh;xx<bl*th}-Z=jBWxz%d7uJ9iApz$NO;g%_H4$OAJZcR*FwVb%T6;63)6`df*
zv5<@UeE)%aywg8l8c0}wG0>nE$v!W!SaY?SA5TuwT~02H6sD~4k>k?vdbe_@5i}Bw
zQe$r#<ey6)FYmAKEDP=0Jl^QxANL85kIfS($cj#Wzc)XT@cHf8g1s;P={2>&ygSew
zNsI_-ta?i8bZs!LWtBr1;!A%n>7RaCH2rxQCu(V$?Q`eIWye~Xr(XsKaZ+!5KCN6A
z8fxHo85@G${I3%8oG^Y7xfI;SRKjPbRj%XkC#r@bI4rfZjZD-ei_3uB>5T5xjWvf!
z7Qm@plIF}v7g;~Zv^zrfoKv&{eJIeWLf&}qHbn#n`7{iuH^GVUVVR21>cO8PdK{M@
zNs(NK@*|yD!!Ty%fUgP`sJ1`7a^w6;kaVum;H{yUcf=|jo2hl@L$R=NeT1uksyEb@
zh40O#q)e8r+5C%@`5RY)k?W0cEHt-Tn>kj<jgoaCbej>?lOC0&Mj^9KCYlS_QXEK>
zWmX(|%*;gTo(PPCnq?3!fF6kAZ?jBM8%w#~Dv9XckaPy6ldteZ1B9Ty;w7m}<H}T^
zp}(RqMNn$MA7wEyI~OLIa{t#1{^>`TWB#{2l8X8tc^hPO6X^kuU&cTfegO@@qk>GB
zhTh%i$cnNM6xKf>)1+hpC^1W)RrY!T59@*&3T$Xtf*c}wJGkD3W#jbJ@#9mcjpd!a
zXKySm{!mHR4qlf&QY;=xU4L+}m%eWLrsBT0N|FVWc!TGuN}4_8WkC?bjsvHRat1ab
zGyauJBTbplHKw{{k(GsQ4omhW*?)&ok&aSKoHd$3HMO2T>Cr8(C+G2#yws=rXGmB}
z)aRIwLtavhSw3&h;~NbI{r(xIzH`Rwd+ESXulLr}pcP?;j6oaAtd#DR(9wwBH}3b3
z6R8>T`0B)v4xjM()Cq|(_4-|Mp!m2m8{I)qhLRKlmzqJ0(pE*sx<g{DuJcc4W$6Bf
z7$3yZ(IxUla^d5(p)j_^1qHAhd%o5G=k#9vkzA4GDu@d$k%TlH4fB_|;rmo)^=>H_
zE8E$uU5-KfGckkoWRX;w{IlKfM}1`!x;TCSsT8ZOT2DuHEvq#E6hYfbL)g(99atZ$
zm+(jY4+$K*g;Z#4JewUK!(gbil{HA7<LKV5!|55nyV~c#fu7C~)c>y_V-e=33S!s`
z4h}4duoB7k!NeU3qHDJlPAC(11#_CPb*p{GrF9PwPs(UHk<Cqi!V&Pu0^TIng1_87
z%?Ida<yHeR{1MSCN&D)_uGozuuNquE9-IreCvgD6Exyy+xZa|5Is<quB1`S)4t~b;
z#OW7esHh=zbjV@Wc9sBUS+s3EU2GHzjbd7V;N;X~EHpoR+?o&h$lQ7|7^_}&$14wF
z@6peBVuC@(Jm*eE{o#4*_$)+la!O1=2VZ%|Rn=JVBnu^a09HEshjvs}tSpGh!gFZ_
z@H5~N)hw2Qc@bmlix)Q*i?wj5He3F>+K#CM`g;~P7p-GWv!2S|urPIW$=xZa<2<Iv
zV|qL$CCCKuA;f(k%@DMyOsflHo*wq(&PJ!WFoyO?AXuq2>3>nP`6B;htJGWTWC~ek
zO_y2ob^Ytgow825wV=8(V^DC!UEk$byn_%q*HWV6$T@LnVT=?V`o{+>>ksX@S$meh
zIeSiTz9&$a>r9<}{PD9!)L<PaxhPfmQ+tlH&Sh$VxeC6xS_#~Bk&>@GD}<d1hq}af
zqH+HGDmKV1m#ZswkAnn8Nr$uV;;j+XV##Nqin;XU0}p)g!3Tfpfd@Jez<!VASwcG!
za74wuv@k8)Oq!#+MH<Tp^$>O>Vk6D61Du#Zq2Kis{#(fCCXzQf_y&fF0mf2sbVbGo
zQ-jwNag5z1vo~nWm&K!m@DijOjc;tez%iEI>&Q%hUTcY?OH-U&aJKz|Y34d-*|2n>
zJK2uok`sVK;GGlQkv4`8o>N(ix!GA0R9@Z5ABdD9ky59FcbHk~nhcbVHm3g}#9#!N
zxC*~i-a-nHq}uRJB_)%TqikaCs>2oQOnQAh`Z=k+iR&+tyEwtU_?ngVhIP%S)>yPx
z1v)s=`sbo|o*%s?*IaKMd1y^mwl$T9vMfC<hWg9NC<+*gyB6_$xF+wDppi<0yva)}
zS#JQAATSF?@2|j#rIi<##hyogI{Ir5@z>7+)W!j9U)xA0im`G!G+rJ{m&Tf*?wfP<
zZ?3ND=g!R-)q{~l>Vu7Q8<KP^mUM{ex&nFQG5=f`O|UT+sEy6VM~DIY^mDyr77rwr
zXWJsNc%f5BLvb@1C@xEUJ1Mxg6(u!kK5-&CE(20>4VX-~HpwCblJ|2(Rzh|WRh215
z4IFW;Ap`&J7(|XFYa)|ggoF!fwMFI30{z4-<E!p;ySw45<XMQfH$MGy&IBwhcJdWp
z!#h3ROK;1Xjtv%fEI09mM87^a0A38s&cs$0LyH$&(8k2|axt{fB4c}SXQI4Mds6#^
z_AA;m+8=3uuKf-DL(Rplb;<Fi8@SjB@oka0N@_oNH|er^3wJwl&U5_l1XjTA;LZ~+
zXN?d52FFX!xnWB%2h(XD>0&Nlq-B5~vThz+u3r>HLKdvx3NEP+fz`w0?7JPehDhEX
zeQF3O(0?lsF8jtT-A8^Cf6g!4e6pUCY;Gml<ff7q$6}mg>&wTJtOzhj_Ez?!V)>yT
zvhs)XL&3XEeu#?28f)t3RxCC6;YY<(0=pR>7-;8&^>A$5{T!UXYVh4~UFP*t$e5Y9
zs5aixaBaTFd(@L8^VoS0eYZYjt=oMOiwa91Q9UQ`Knt{7AY>=Q%cVOV_Zs(;Rl3!#
z;%_Fv_OnPH9fp<D)vDhGVH=E+3PML+u~Soy)*%hRrz?(mdvS&E9*gzH7zR1LG@zhA
zofAtU%caEp0ffk!uQSmO_)E>#kv}^UNQI{hED!yNJA2MO`>bdYW+E__A@?ml(gz<|
zTRFKpa^kh=$#nYEORnT}bTT`dR)VWYpHkx*Y0@Mrb*R>c7Z(fWYMlX0V%VC}%NY6`
zLgxU(K^$m7{#(`;2UGCyf!XR@b0%gUtk?^QEK4f{gRg09-B7xrd-7y!w~ojAU%{2&
zLo;L+X^iJ5LJ{xWi;w*q!pL--WNM{q3*zG>B^Ixo5h^C`=QL^tr!R=M&`p?;Y-nE$
z=`bQmLyQlfKn~6<8hjA#iO(-}R^`8Ct0nk4>*cHlW4`%DLsAZ(E|9IBU@RG$;c)$5
zOVv^}p?9*?{kL^KiFrkOxPveB(?oin20nOB0cZ;H^4IVEK<S}dO3U%MYR(?b*@M$8
zqwe0NXp1qhm@Do}^$6u~G{eIr-2=&URY!RAoQHryC3U$64ZaGkaI6|aM;JZoPWqFk
z?a3C)mQ^lhJvPbb3XO$)vX;%(lKF*3q1azn!!n$-)B4%8on(zCYW!sY>0s0!N=KtC
zM96N+2+CrddT-41%Nnu%?07L3S?JW$x~vMNr|X>sY}uWN%utpAP6h3yIu41!RMk|j
zM3Is&<jr{va_$8EeB`_#ab9Iex!_y`cz;qQfjFhzN&x@sw726p3|O=>fT(bCkasc$
zQN?60m9BMWj(pMzD&BY)=|uZy*0}9rBBbu#Z11UIL%>D9Qdw9)!4WW=x%N`T7c-kZ
z8}I+>VDcTvno6EI3v+Z1^)_~;9Mct7dYg$z9MNYy9*y@m-MQG?<m)&BQ9P2UmKKnG
zTm|6(FO?aMMq_5(y~QYpMB0gt-Zq#{ui~^T1pUMd9DDr>9QzEwMu(v&{sF?fo#f^M
zmBY3N`WAdx@nx3DbM#C+xDezJN|1=!634@klbMYr&7fy03^n~EbAvxIHFh0^(o7Z~
zaF9y`Iud#}d+BnFfe~u3O1u65nj#sFL{rRsteA_J?M%il$H5Z8Ye0~;w?(p_ZA8LF
zzke3#9s;^HP=+mLKg)a~zB9p{@C7m6LoY=V9(eSvA&HT7L2Zz!&vwZu+?6iEFGKv^
zx+W{acELmt%Va2CP^~e?)V!QD@34IotDPpnLL{Qu9&>`wX&zsz3u1x*$A+W{YCu+2
z+Vw!aR$~A%n@vjwpQUf@D6n@%gJVbQJBumfDyw@)hi{h6DT{xz4_mXdmUS*7QCyM9
zQ09tc5;VvtFcnYb$EpWnI>RkEE+*gcAQEWAPUJ^iYnOb6Qe<V#PQ=6unLEwRTDd1B
z3N4?Rgprfg2^NqD&O{q!gkav@qw)5B90^!MLUR0BZLjj}Rc<^=D&2W?d9?sCz8VdT
zf{MQV4|fy~ZvV2I1*R~UEsh*k>3yUsV@p;kS$R7#Ui|5g{lo3{!R`J>+*Bs<SkXxo
zB!-q)tP~7_w{fXb;+iTXHHJDkMYUwcyVz)Ik0;pP2|X0Ev7=-R&B<Z6#+}f(&8Qe_
z`A3Eh23iMAbPG*XvNC8A72`!qL`0`uECVIAE17Wzf3m(f4lMuRe&>WjBWBe667AD9
z+6Zk|3{fmkuq5G4q9Psk?wX1U^M_gZgn`gvd6Z5^(!T5(q3YLMRx=*!w9JWYhqUCK
z_mMy5IJ{8PdURk9$K?@PY8j6wTz;zzImVuvu8c#470KWfZO<8{1G2e?p6=*@LTrf<
za$UFt31K~mk-2m_`@EJ-r{^A%xy1aM_D2mx*UsS2<@hk5=Rwwts6TcF0BzS&_V@7n
zQo1scp_?NZ5uH2abymrx-OCdr^X{<|syl$`MkaJ^*jmOQU1PGYGhAI?T*MN6h}lc4
zUc%&+(Cmd|2`UV7qn3xp&sXvJrc`@}!}H}+rP4K}QnJ%&l}dWg;qNLR*+7;HsV~oK
zTeu9j`d{3lQZ6(5|68^uCn7-dW=Pxx4)>BZgMs5rL^5U2q^zj9yolH(`m&6;x|1N|
zfX5@=#o=(e|7S-U*L@UUve9Z&(qSAR-KYe4`P07)BL7i+w$Ydk&f1@E9HAvI73^?q
zdLgNf#qR!}#X2AfJvl7Xb;dfK|M)^e9X)=rOxJk;*U0ZK)KS_0%~@jvJ$23ABTR!G
zBJE^36Xk(M+9e<ZYqsyKeRlSZyF|z39A8w&6-N;2_3wGX5%l^2N5H7uhJH!!D@w-N
ze^9o%X?q0=l#~%rh=-nl7d+JemttY5H(#tuqAE#7r}x~w!3n+f1dQOJo2yq^`+D=^
zH_kPVll`jc8=u=>9@=$JLz7*PM)7yQm>Iy0g#WwNPIL~D3q(p*7|sw!cmYrMVTRCg
z-P`eVmjn!^$&;Jf3a#-4KpVJ0Tk!y#lK6xt7|kcUPuQRB;$;3=`-$$8t52?O*k1y`
z>#cst-dKH-#&kn!Br07nCT9ZCgy`}pABw5$WSEhbWYHf<`Z^Q=^9+sZv+eiqgwVWp
ze^DmVP)tpa=JeUOzkere=C%86_>iF8Vzk2_2<1q)jTD8?2`jqL*xX!OYpkt-d2XL&
zhMtv;8UfC@8d%N+V)SD<$8x*W#l+W>^sOL_xG}!)4|Em?7IV8;IWPh?;E~<_CcjX2
zcMY%7OCKV6+w}pK>6qtP7P@l|aX>u~JX1$Pao|th2coauM7@*hXW&%z60drdyot^l
z60GwiFL>#*bogS1I;#5N3UF3E2v-{Hl{&)brN59SC{w&{6Eqs1rE1EDpmQEK+g+jI
zy9Eu2XZJBoVK*|ECFqzA0L_CRF?T5C!Kb)7i54xq$~*W(qjtXY&O&MBdMWHKi7bvg
zoqVH+hmDRpiq&&dZJ*ZwBMC2QHlOSeeRD=OYL7))x@66hs5r5bLI5Fw8sRBqp<Wk5
z;VM4@E<MxhKPy|c>2D&Paa_!ubWHb#(z7MKRN5ij&*01|DY+L^h!iA2MBg?#xRN<6
zz)O`MZ6|U}<*{;n{3UsiB+>cRVs3eC=G4esZz+4Ql9@c!Xgt>8kfgdy#yezB`=Kv{
zLgHzXnS5u{7b`{L`i~Uj$*RpS3U;UrB>T^ucv8|{jxFap<W#%z3(3ihfQg|ujO2^y
z=}Ws;282KWk~BaD-`Vs1Eqy}<1ik!4*3w|`X#rFFTX9C?pNFE$G5UQ@4h;Swd5QF;
z$~}C(hVnKFiFH{$RRdepv|p!uf$~)f2&4AT+zKg97pHGntS&<MRg@bkXDF|xyp{4O
z<^P~;Qhtr{dz3$=e1q~&RLM^v6vjhh9?w3?m6RJOcT-+P`60?LYnqqqyhu&n4{Mqa
z8-fqRqVNCGH2-6i-{dX1M*x4~0An=pbDCycLt)j|AgmzxFy&u0E%XM;Z)sYX=Y*fq
zv<U1c@)pX!r~HeiMR|wlk5E2H`CUzm@thcHRqXSc7RS63|4~g#cqvy<c(24CXj;;u
z9H7u{$v>i8(6rQP%C|Kw&3mM&U;671G9hL>H}fe?%Ni7}&(aPi&on^}axc>~>-RM+
z{~k>%yi(IfI5$e$j|C|o*R*kbdBz{2e2wzFrrF0Rzo2PFEat@<DZE#yO!*AuziL|f
z&6Lk++648Tpl>J6QNE&S75csMI?7*b+9dro$@Nv*y826+R--*?yj$%7%99lCS>svt
zF6Et+|EOtGcWL;?P<YP<{n7Yw%F~+G<lUN|)wCH-&b*OAo6b`A+3P4jN#XiA>O0?|
z{5wrsplueo|04BY<eEjUS^N`C+eaVndxY{GO<Ouj`Lw1jQ_p4Y-P+Q$73#S1DCPfz
zt?j2!@Ak8rcG&{ulbW`l`|W=l<v(lM<)<k;>p+e2F-<!-MfpulJCvmyq`aH*B~3eA
zqR_X8|4P%Y;GS2!lJW&6$r|M^H0{b!%H5RrQhu32-(2;xl>ee>SKmtcFom&rq(V7F
z;de)P*CV{oH5tln6uuu_r%>OcwEeLO%Iy^1>ss!A?OQ1vKhCwsdB%w(<pkx+ns#!Q
zLYtoamZqJe-%rt(r*oQi-49TBuj_5fn<$L48?L2r{>C8XUdl%(|H{-pPI)KgcQoy0
z?s4;bDBmVA5XW!%4NdEEzb<2@`@5R9%ClErN8z1bbc*tOnszJwcI$^U?Y6^||Db8N
z(|)&ezuS5D+kaov?zox4^M7ERvY}~rUPk#BO}mS0?)r00ySqzy73E3Ff6}xwG0GK`
zJ1Nxfo+~M|&%IH~J2dS+`s_aD?R{U<wEvsB_m1<bxc<0j?!EKfO4+3dOW6exu?8E~
zD8X)QG4>c^Z`h)UXe@||iY6+tMbX%z#uhZj7F4WJV~-j&s0$*pV1&gIG?wT6ne)Bh
zvVi$Luh;X>v)|We=iaGj&YU@OrrdiEK_(8l3?MIut`BYl@cytF&K-UaSnAvnGo3r~
zXy=ZCuA{DXZtUUUAI=>O&BxH5$H3EL=?lm10;U1dA2$m85qyfuTN_LSq&fZ@=YIKP
z@VIj)P>&NX1y6!6ojVaZKXE*G7;rysRd6PNCnvRlseru4?+uWV@ozYHGBSBGJU{tF
zK-)}M4;%pC-GrB&J7pC>-A{SYxl>7Z>P=v&bH5q@b^|W~@;nWBIPGfZPHzGSg89y!
zLHHSyz@JgsD*@7<c^8vw4}J>Xaqg_00DM2|MF7o{;Nhgx!3WNry)hvEIq>2f>VM8_
z&Ye2~+~?e6@|aBfPlmS1$mV&t=iLwf3I5~U`ILA5kH9g`T|gZ!*d0s(?>jeTHE=MX
z%nPZ<h4+9@ox5lZfd3bL?cA?VWr*nk4h6`}#X|ts7em)2CxJ(tyR<tv3OwZ8)LKBD
zrd|i$cJ8;t`7L=~b^>U3?(&@gVV6VO74(TKpyx{3=Bk^WyZRT-O`{E_9SM++X|FQ0
zp);<957$2J+;yvibHP8H`#o`g|99uE-wsgU8+HKCICtY-fHt}bp5H{<-JAmaZYHlk
z^aA?=%KF1c&fP-&Z#f>k;oPnLz;WQu;49~DTN4oXwkw_cV*-%9KmHE9?%eJ8-~N_!
zcTnaX$kd$^zyjy)Is|k&clWQI`;!BYIX8Vj=k9?&_xud})46-8@4e7>?|aVuc?;+6
zs|Sxd_m{1}dEiMf*SY&ocJ6^qz*6TPgr<k6&qMDz_b_#N7=7{Z=M4A6o3RFfSC7<y
zwZN^;J^B+c4t(g`W6=E={CkY@X5v5dD(4=Dw#T9C@j1>t0e_!35M1NjljQLvJb99O
zJxShA!Gou0>!;xJ(_BA&DR|4dXUOxJtHFPr``dKqo?RK73jXcfbL90L^7;HQKwJI2
z2^<5SckTt`>V+G?H_pBInR728uP^Tc7CH9{>0hB8Ufmo#2flLdwZj1Q`A1*yd+?oe
zuW#$z8_@a2E6%++2%P8KKUV_xIQQ22-~r4Z>hL!H@9Y7%|JOEPDwyTmtPQ}&&b@mI
zAiwvJk@wrc831{2KN#E!plSB%;37a-bAAD+*9Q#%-p$<<AP;kwIQQXo&dpm7P}WCv
z06u^8J|-CS&A-^W4%)xtAn<!Yz6-Vm@N!`Wb_RDk_i+Hf1n}_RzXJ4?PvH3{H-TrI
zTht1U1@LC^P;eoDp2f&V=L^m)p<YX-0O<J?IscUUd<qSptpiB&Ic@g&%g%lAb3niR
z&k+EAEbR@*>&txsa`xq?&VAJnTmqhT?!S!y8oq7@n}MH#iQr0rAbkTrzCrH3*##UA
zZU)f%&3xy+9SLaHZ>it6$jW!ygR8--&a=AcSpx99>CU_Jz&+r7=Y2P@3fL6v2TliH
zJD(g6o^(F#4UPs&oX<#`{nPodCAbdEcD}GLc%7An@!%8ZYtL}LZf!8#`Fh;?N#I52
z8-@V#X?WiG#{I$D&UYILczmuqZuc8Ohx0w|b-rg$a6b5(^G!UM)O0TR$ob|o!B@`r
zIvzkr?{&dhU?wK_7{IeheH+2G&aYGtsOL%xobT5UYy+-$zCYLff9rfp2DSoMfrZWw
z*c=?<{6LPN4SdS^LF<D@oX4j0gCBFgbrhHa7CYZYJ=#b!WN$#+p)3>+CGN`Oz#ZUQ
z%>To{4d6@XS2+>f<~+8f9}a(3<wcFF;*O{R)N=$+WUY26_`CC~_XR%(SAY*4@7e@E
z1>}Vd>DPSN`L$@vwJ2+?H#teR7I@kDA3)y^C}ZT#-~s2?xfs0V{JK8`@MXO|;5z5m
zC%^U221__ibr7I#qwpI=T}Hv@QBUx;C(7Rt`Pc|LH-Zlv9R*%;e&gO?doT@9_9iQV
zV*qvBbO1m;Hif>;TEXF9uJb?q1-Qxi%~uB}fmzOP0ga>U!8PDn@VWCpLiT<HFUJf6
z&@tvtfd7`{wdGWR3~e<CoDBX77CFE5y3TI{FSa4=Hq)Koc4Yu<*p7ZX>Wb~?w?{6v
z$8US;yTgycqmJcm0DpJnJ)Ap!=lo9lfXAKRc?9?!c-{G3Rs{!u`<>sFdhZIac7?A$
z*#!L8`Q6q47lD5{|I^jLna=M{zu1HDJ+5(n&lJFeJr_E^7c}ezU-mx5`F%D57dpT1
zrr>Vpf3^;QKl_o#e#qy3pE>{YL%?g!@4qL2@4x5;_5#%D7jH9_B)<d3fm^`8oj;Iz
z9eA1Z2hnZ^&2s)=_;T<C&L2XXA94hE&iO;(>!CB8Ka8-$4g_a|d%^q8A3hMkgTo&L
z(0c^;N9+QA58iYBNYWfh{f>MHaDNoCdK7t$#XWjBnB@F19zf$UGXZ=*mg{3_v*YNG
z$C389+0Gx2-|@GDFP;D8j$jH{;QR?|f#bl-&Ywt}arCj1HU!Av_ypYG{K-SW1AzDw
z_6L-63Ur<VPfmH)`BM)Ae{ud-^zC2KCZ}x$p!M{hflj8~M}ljeKeHeBweu4X0?5!=
z)ZwhxoS#H_lg<NgIMyHl{5YF_dp2!+_G8YU69CueeBk`K@b%oy!KKbmhOd)p=gIWF
z$<Te?#^6){f6l)cP=^bk^MZ-aPiX>M0$o4j{DlVs=)Le8=P#lSFXH;5f3iF<68z2i
z-(2GS#iPL2&R;@)m!9DKRNCUVDfqMVmrZv5a{BG%e|7!}%Dr-B0DrD})%oAu>-^Qo
zz%|{#9V|B-4BDN)c7pTQtp?!b@8RR`;nnrX(haKs^1Kllx{3PVL|t#Do;M@^f7k|e
zI)4lNy%qXz{n+{2klovml|NGVKXy2OJN&*KI__8r(B5~D|DE-KGVh{pcR|nH#J&69
z&i`pca2EK~`RRLso1MR>0CsTxUU+uzqt5?%4KUUD`)UC4aUb;G2ao?kef~n4zdYsq
z{qO?2&0_}m2TlTyJOALZ;B)66Lhc`$%ks((0kr-V-pnAc8HWMlJ<<b^_7Up!=+@v)
z=O6niI2|l;e&#WNKKuB1K>IvFn?CWP^H1&u{^|Tv{Q<J|bOw;6XW-v6M}xbZ|C<N9
zf_uS7&ObW_Om+S_(mY37Jl_WBuYW%UaR0(efVO_&A?IIQ9US2NOTz$VzqHW#SJnb&
zJOAnw=U>|$Jn#HJ$nzgJJOBD%K>gl8zTbGx`8R3PH=+BVdxAGuR@x5S?)=-d>D%u(
z{|;^a&I0HEb*1yOhC2W555TX$-<*Gsc7Bh#y}t{fZQ3sd#GO3}JmvhH5#UDWKfwQk
z@0_1Yo6No3`48zE^A2SBsu>_Z^Lv9wobNc%`2}?VUM#E!PdNWEJotDkfL#3>etiNj
zK6wCq;`}1&wg?_C9s^!+zH?h}mh(#z0DnGh0kqGjpE>{8H0M934qwo&UrYwj{h#5^
zFHON%=f8Zx`LFr_c=2EQ$bX^dYiRkJvcDMy$nTr?o&R=A04?9G1SspfuUz8pcS*7}
znD3I5FN>y~F3A?UB<u+YFN}9d%>^#0tp%65q^>_W(Ixe4GSvSPJm!*yHt<)MH0}eQ
zbV;`#gLy9LehI+su^;%>B|XQ0yIs;m9PFE<`Ae7d+7-OR65u$O^x^P$pP##=Zynel
zyzP>eTEIi#Q<wC+3e0jzf6DFuu1i{W083pm;6j%S{LCeTe&>?Gce<n%T3h#WN!w2V
zY1=+<$&h_qGL$D(SMCp>Y1kt!S>;-n4Bs1YzuItckxN$RBZh1A0ux=bCTZ5{3yuL_
zx@7HhUGjrf!Fk|AmyG-&_?=7EfsS?NxMW@Uw%$iBS^qMZYykf@_>W6A<g<?(o($mK
zhR?ZVqalENH@ej&8}AGL?2=7RbIGP_0LtI=d6#VVmP>xf{SO~?$>#87b7<XSWpEbg
zbjj$00cHK@k1iQA2t4bOE#cQzCjrXXhI($>4~%umcF?=sQ!d&5dY9~Qpi6$dDVXn)
z9jVKXkGo{24Z)S*JD2Qy0Dzud4g;^aWLNmND}4RQJucY|T6a4e+y-87$xq?IPv3LN
z?k@uBxyPY^cHDCUc-bX;tpd&fOI@-z*ax2MyR%Dv20wl_5kUWb@aX3?06O-k495QC
z7x3kPjQ~795IHyq9vu8jFvBH>{L>|e!mC5yb;)7y;&AGD`0ZeUOOD|F$O4f2q)U#P
z1lnCPmNJfZfHpcN1=qXe*ge4SU2<G4z-8?xIeu#ZUB6rloa>Sk9&pKt4Pbph-A_bb
z$88KQ2OqfPq@Lhl@F$myCwx3@bn@x|nV)coOHSDqj0b-JZ@J`D==l|Gb=r@>bzq50
zPT$ZaXAA&W0cbvRWtU7`6CCc6v$hA9f`?o(iTg<(yX5Sjf@@uJP79a-;MKX$xMcDu
zmz<XZ+HA^t;6s;ONL?<1_FvQIe)E`1E*=MHt4sdwl1mQ)@NjA?K<0jXs!J~G0XkfA
zIkI^Le7xd3K%6V#{gt%URn+Y&%Dd`)m;8>p|86UAGMEnLxa8_)ms}$}4$!C0F@M_k
z*gvfL*I)G5>~mL_;Njd`H{Y<K+<zVT#Lwg=C>tEwA*R6LL5k?F|No!;vEj@<=4i)u
zEdS*S8<g(Gy0Q2umc?AdO^jD}l>8K`9F%SkLKSXtlq2soahJzX-3=wCV&y*`ha!f`
z<`Iv0t-Sj1aE#@uYsDDNf0ZB_MpO4a+{w6OW6IoDxu`UYH#Xks$#I3--_OW}GiN|C
zUCdLdR_98k=ufq<T;w;}?atk3r?YCxS?NX-OEK(PenyE-tjcc<H>4D*{PeRp<rFH-
z^2qCDvBpM!h2_7?;hz0e{vLoc3h^hNsSf3z%84i6iDfm_J36ea^$6=jXkCoK3J>?A
z$$2Z+2DO*77GRXRqHA}R|1T$nIBzi~l5PWhcn3&Kp|%)HyNiZBV&2OC<anhp(Qd!J
zaQnC)$9T#?=~Y|B*`RnQ>dJrOea;Wn)@p51CJJ?RhkGEFJ~75r?ejmCtQ_>G*!jJv
zP+H}vvh7Opp|aGb%1bmEl@m*xS6uy!E~CJ57S*~^&gGx#Z+WV0<IioeT$Nq@Qz}Os
z`L5~K;lE0|Jmx0eufh2P<=+RXRY+b|`O3;Q3MWG28j&}OCqI>MR2W5lI0mE^QFy-?
zL*c5&KDetyAIlN1Sgz3~3U-Y2h^9&^EVXh}Y5Gm%%IaZMseFYh-#uc8wSdtzG5RZ9
zzfFMB>et5|P~^E@g{k{J__~c+L9Hd9ywtHVt$eN46N|1<bUC4y6L$?BaFN`orNt@b
zv4?wu<D%E`lhhdXC%c*WI^N`=7<nCxCfzx5x4Y3?D-Y$ZvZND4i~LoOHRv_^uh<Hg
zpMDd$R&A7z{;xrKo8ao+a?*cYOZsy^E63`rxJoHMi>I8Fs{FH3^ZR(1gt!)4zAG2w
zs?^G#<j(rg9vmAJb)v&^SN&At_V%uYVh&b@(PA7hAEgzqEv@pf^7UV_&EI?#S3mJi
zWw?0NCq8bGhZz6H##n0=W2&w7oV<Qx<A3G7Z)^wiU4t`~%2%Zsb>_cEjIDA;bEUkE
z=O!7}UP@z>8nsGk)abt`QJOr54LIO35nu6m-xy*vu}K%>T1zUn<$edbi7x$D`J%&d
zFAm5@T5L2qsuWQ&8a+BTYJ$<6&)A-OQLqO-xz11y%0K6>uK&ONm1}JLGv0|dE7?Ul
z6-#xOf8NfPQa<uieAQO^Z8Wa<S{wazWqIk!YH#&d4*D4{bfp-Vl>C(UDnKE3M7K{Y
zeK`NOz|UwM&9fV8a<?9SV{wIbfqttxX5TS?-H8hGx4W@1H<i8xeO)Py64honvBy-z
z7I!Msx(W(Z1Em!5pUQGzEa?>5pX;2bqC(u<1DqdI828Lyd^B2>-`E%~36iCwI<Em;
zN}b;g#%C>{FkSbFZ6H^E*7I~XqJjd2D848d8)I2q{m<L5HF8z@zej8}*)FP;YO_18
z(&eS-O25H`Np@A1`HYCJ>bDtJd+<aFC-8Vq$gCh;8y`fuD9Y0*AIX!_7)LDJa#aiM
zR*e7Cm`9#Y^i{^(ojjU|U2Y+>vBVuKIWJQ=?7=9}7nErk9d*9K#sXO?dHdvXeu1y(
zv3uofQf@U8hvj22tQ}SB9z|cX2oyuos{huCUULZjmHy*X^_RMg$;Bm(Juttcmrb~B
z(fu50J4Y!)T1w&BigH=$mWzpQ<aghda#u)Y32jhf36#e$yRMnySec3U@r@STXEl`U
z_s6q_ez-9YGoRX?wb!?IYj0}r)84;*Nc*t%HQU!|-?;s!?c>_Vx6f#Qto^C>#j{VD
zefjKZv!9&(?Ce)&|7-S~Imw)(=R7s%xj8R<Q2Rl@4>tLr{ew^D_L{r)+|eJ7`tbA*
zXU}V!xBa~R<{dciuz4rVdvM;<^WL5J{=C^A4g6@ek2>c2`Q7KQG=G!%Kbe2x{QKv>
z)Zsb`9X&d>?AW^F^o}z-CUsoUabd^B9aB3l>$sxhs*Y<quI;#~;}0FTb==-@SI4~_
z_jNqb@kqy$9Zz?>-0^zH+a2$A%<h=mF|VVe<KG>NIzH|AqT|bsuRFe7kSrLsVB-Z_
zEZBa*E(`Wq@QVdUE*Q7ql!dJeS6jH_!d(_kSaj>6j~DN^__)PW7vHvc`r@Y-zr6Uh
z#j_UAS^V+h&pVUOtg}aFb7$|)zMTU)&*+@gc~0kfofmaJ)cM!W=R05Pe6#bd&RL!F
zIu~><>Rj6S^^(Gp#wGohth{8kC2KBOd&$Tp8!p-OyYJxpNcekTyMw=t?LFFi!`}hz
zE4PnmU%P$1_D$ROXg{g_PwkJkKiU4w?5$^C0)KCUzc0>yYj*qWZ|4l3Gh@y(@VDlJ
z`VU$@xb}lNA9T*`Gk4^NYkj!!hfmJyK5u3C`-^!8NB%xl$={DYncpzKY5w~2cbfmx
z`6tbPaQ-VDNk?r*6a3va^7s5I{$34#Zz%D1I{dxA<Kd2(@b}q{S3BN>zwJf-ehhz?
zbbMaquUk;JVEBSf7K~o7!-8EG?7QHA1;;NqY2ko{BNlGDaOXuEEr-9aM*c2b{Q2Uq
z;BTR`smR~cJI{*zy`b|N`1@$*3!SgS-+y(!-#H)tcEVo=e^*-4vSigIYefF8yJVB^
zzWeSU-`)M)U2P+V*TQN3+IqM3YHM!m(bm1KTU%pW!z$OczS{aq>x-=~v`%O}sCB>A
zJzIBc-MMw!)-78{w1&a=5B|&GKMy`-@Pxr95AHL#_u%HiO@n(58a8O?z;_4UGw@G?
zZ{Ulte;Pb<@a+RP7&v&~pn(Gi%^&pY0KVijpmso^WkJhZE&ptJv*nGJ*IWM4@><KQ
zEw8k^-11V(3oU<Zd8Xybmd9IWwmjDIXv-rlGg=;Md9daFmcO+8x#gag=`DY1xy!kh
zTU-9na&yZ~E!VeP*D|f;nwH<ST-kC(%VjOUZMn4N;+EgE{JQ15mdV7M2-sb28P~$T
zcnkaE{cr2f&V8T1_1UP;b$x!``=vhp`!x5S*!vdedcWA4eeK@#{od?T^Z%9J+xOni
zxn39aI=$C3^6AB1d34!>kM70zy$0skJy$RHdMRF4=oY^_-<D_R{Qoz9_x>L#ok~1*
z>fMbo{%!ofJ6_!x|5yF<ExPrb8HgC}H?m;QX$<}Ok)Cr){&;`BzYO;Zf0d_2JbC*2
zz@vVqe~k|-E9UF|Jx+%9EHoAx3f&4l3VazXoDxnAzskmjL7|Q}>ij6|8BPqhhlfH_
zxF)O-b_q9!{ldOs0#98J2_J;Nh9km^;KIq_s%&ZYW%l3f>+IX?yO4xJs0p>9G4u;9
zVPF^>T0>hH8deSKg!RM5VXLrR_;J`R>=Awz4h)BcL&M?W$Z&l4Wf&h$4`+t6!lmJ|
zaCx{QTp4~BriE+6b>YTvQ}{!;EBq-;5BG!z!^7d_@LG61{42Z{=7f&$arjM`8ZHhm
zhU>%ZuprzJejP@Hy~A5!i}3q!OV}qI7k&_a62^r)!~S7pcs2YZ>=kYeW5Y4wsBkn-
z!><%p3B$v>VRRT1wh23gN#X2pPB=H57ycgJ5A(y8p*_43&JXK_55v=8RCqKz67J;*
z^uL7D!rNiPuzPqi+#miOo(Z>wS>dVhZg?Qv5oYoh>`TIGJpA}(_-FWSxFAdphlSO{
zMqx_0FkBS=7M=~yg^$9*@J@IvObk1Q=fi;T=df*9JFFab4)=whhk4<Iuxq$GEDrw(
zpM@{N((q+i6gtCy!>8f%u%wXak+(u!p_YeBUHGox`G#>CzAj|0Q7zq*(<S=z2k?(m
zB8;|<@z^mY7`ove2<YF;^jtemyN3J`xb=ntW<Wc+35A}xq!9}8>tQG~;3^Ch6wb<}
zP*8YpLqUGnXF@?`^*3ONy7mEJ2<5JgyE2gVumP^<Sd(j3O4}8-4%eKHX<rYhE~9Zb
z1)P@QWWH<P1B~PP0Nj(nc*^R9`zJ61|B1Mdg2%Z24epcRDXuTUML)GK=9)e^duwnC
z*N@;5Hv4j}m*7q_xTUx^0n)oKai2A)kIsG(yaLau)9kmvzqm$g&Ta>2IlnUQx14fH
zxE_ux9L+V>(;R4=13mr(T<Dp@i6Z|i+!qY~Oio4BfLi<~;?hPRNFz+brR)zj;rdeC
zYXRl?dvPiAgHO2r0=JWsRPZB7ar*#xno$1Skzh2};6vKuLo`Y96I^)w;ptre441lo
zIGgM1otxJkv~dj|=TV<|oH$Be!`;u2eS`Z8fNTZDJs2Fubu%vQB7_ZaA2fu6aH;pa
zr^yF?&U@F8{1^9qL-I8)<qHY<e>Bh#GThY+*;lw7h6EmeM7`&G;(v#WjLwIal={za
z0xNM1=C2RnTRIqbCqTW^RdA81`6qI{Ixh6izn|+L<3jWNm$?2lF6~TlF1;C-_UtHd
z{RS@W(}C=#@8D8a$Cg~v4jssqkoCbuUOV7z)))6oLq_=>lMLC;xaWflh_egsg@z3J
zIxaS3yWvhXWYF7jnIYR9_X<O{2kupdY){;)!8PQ$7w)x&Y#-bkz)kq?i~9#d_H*3Z
z4B7s;w;M9rw&N~Cb^z{la4%^O#J$gu9fAwbIv&9PP~3;XBU~SjI}<#C44i`dq#+xN
z`?MjWKXg0`UMBuAxUYiOxuzXD-UM%Rt+ekNveR+f0kV;ufjifbO~jpN$j-v0v4l)K
z{uun5>$7ne8M1S6mw-?4pN#uC_=0P-!<U9^3NErJWNH)SOvo<cw4nnD*T2TC1H-t!
z1a~;tnCm-nH!*}kxSJY+;%;ULYvTUU5PpQaxq)41w_poHKrR=I2HTV8Oxzs|f%aK|
zj0)i)+#L-88C<ZFA<*^<kS!ssfxC+#$lVp}L!Qs$A_qc1wio=&5cb0@A}IXlhA;tl
ze?#boi+l)S2<`#kNb;op790=8as3`HZ7GBgaK{_MUvW=1gd=d3F9<VmPcZ~|yl?<$
z#UEZS9AOBgTezAbAnyw|1=K$y|9JY7`en4|qK$ysVks`^7ZES}FE0FF1m82-auGZi
z0&Teno-d*u0)2bY7(-~p-O>>H;cjIJEx217!a&?@z;>h^j7wVyVJI%`C4^ORX)7VD
zgA2VvSRa@65(2a?qOF9Wa;S$8$afL#B?RSxUJwF0VNnrb53bP*Liic(?uKw6uELP1
za0o8CKnV2BMSB|pZMFzmSVTJq+HH~2gFss?LI#9zIxaFGgfnsXH-xirX@4PHii->^
zI+*Lra8(`%zr#HgP-d8hOM5S(%y1*_QHJmb+_8pm7w*yESmOK%_c%j%5Lfhp@G$N#
z4dG?n6Aa-sT>6X<UdJ702>-%G28Hk*uIdKD99-l{2pzZ+4B=zkTMYp^7U>>@VVn?#
z9|9*u++t`G!V9=l4FMi3zRjSgv=&b{geP#HHUwm6F?0(7nijum2*1Il4nk0Vvkc*n
zxX>zuH*gmk!o|4IC4?7oKR1N_xS|h)>v8{U;6$%m{Iwx0!2QM$ZovK45PpsOogs|i
zG_*4W<fYRa!dtkBA#8!083OXxN&gYT?{RAk;TGIlLqOI#>kI+jb=Dig4{#d{;U~C_
zhCmy3b~A)Kal0D=GT7O}5JuuQ83MfQY&L{{;Py6zxww4|0eS5lU<k--C-N->`bOs&
zhCussI>~iT!e2C=V+i8Gd4{kP?gfT`{B}+;gkx|oG=!sYFEWIqajyZ>$Wydj3$EjO
z6<qNPgmrOgGa-z|rEP>T2KPoo*ar6|L)ZcLW&phbT04<FA&5rgMhJh$z1<Mr$GyW4
z=HrT|AfV?u?=pmT+`A3o72H1=!uhz!vk=z9y~hwf#J$%Lknzqx8^S2u`wZbx+`kyY
zBe?e)g3>);2mzOVE(FDW$PiA${i`8djjOyscpLXIL)Z{^rXlQ(`?w)IiTi{hs7&31
z@Ne9w4B;7E(G7z5r+X0Sf1Q6b1jT*U5Z=Xo&JaZV^M)Y4zF-KV<wb*5TRUGegiCN=
zHiXr1#a|HC!j<g4#`T-HuN%T|aq06yxBypSAWX(pKLlZW+<zIuVYs3jgw=7?-XLs*
zt9G5k^%UF>z=vF`e)A0BBV5S@2n%sL4B;Kz1%@DgFEWHPa61iQBJL7H*b(<rLlAF1
zGX(Xy&kaE`@`WL6i~Ao#SQ~e#A*_u1wIRSivX2Nm<9b6tzBoY`5q^#fuZ2LJmSl!-
z0xq&8gk5n9hHy7-qal2PyOJR+#_eYa(6yw+5U9rz>L3JYUosF3;u?CF3^oLKv!vA!
z;LVaYL-;T55JP}BONJT({8&Ogg+K+DtZFEzP9qEj(Tl7I1=V8>L!l0LO+%p;cWp!X
z26v<(e2crTp-_Xno`EdglJyPYJKPNn1@U#1p-_*zp`jqYZej?u$&yVCtU>hr?wbgg
z!7JC~x8i>d`=aa!WKif10Cw&9a@qmK>x7kv(~8&nbaLE5AbwU6M=!RRRg6<$U+W9E
zr8|yiwNG&;@M_e<-4Sk_YhzDuBqu61;%Zw$kHi0H_F>oLetUPUJDAmmHuod^j>g@s
zl<vfMcc?p&xF@h1c&Iysm^-mfGA{ZY$(2%UPY%bC&xxcxl)O*E_drr?6Me@;_XPY8
zCGNW9FcNnY@O?R1j15>5Sq~Wf8*@HEl$;2KDzA+?DYtc473rE+nWnY6P$f>szwgc_
z-{t>#b`0$F8L}V$IFv@ZRoTHAK^t0Fy=&B3QT+4#uXlstsXzL_amTWMOV8rTBTfn9
z_!Evk@^JjPipXN9KAYul-O~->h4J(Jc7CdV(9cVTB|9X?Cs#D@+j7~euZ)~H>gp{o
z+4_(jYImBt%R&20IdG%HUO(crlW&|b|IC?J^u9K^uKva)x6Hk@*>yuE*5ozNqumbd
zFz!#gpMdO4W<BSsY)xdXA29~8w>8wYWvf$qBXTn+Ta7EdP<K!^f~)#?wJKM2@oG3%
zwee~du4>}dFs=&mYGtk@eS@;0TxIcU2yPm$+Hm>YO|}NS>PIfklw787zihoOG_6BQ
zD`6y8R>BXsvJ%$j%1T%Z*GgEw=&l<}2-Ij8ryDkNTd`)*z`kWS*9uRD&_YAlmmKH@
zWTU#2xuNBd{0_IyrP&5CCw+#qA6(j~OYDs;HancEk+`KgjmS1D(y?im_?svmbF0Ml
zu86%wG4|$NV*gOF(Tw%b-3yAlLAO5O+sbuL(T}>M8B@$_bfhScwN;l`TNh((Sru#B
zF0r;N#@Z&vI@dS)!G2xsiTcU@M*py%lhh-bn<Tp>M<kPytCRbZ8Of})kglDMNsmr1
zOCL<%O25b&v!U5$*^b!(*{Rvp*}d7b*~hGb4`ZGC1Xh5jvsS%?721A<bqkvnb}k%W
zm|D2Aa9`os!koevHHDhqH6v<9*BnqYuI8MY>uc_-d8f8eyKe0PwHMXSsC~Bfo!U?8
zlDh77Yu9aFw}0Klx;yJ$=LPR$>QAe`uYN(p@P@q`PHVWV;n9W{8s2MI+St2slg8Z}
z4{My#IIZ!i#`bPWw}IW(?zT<0{kxsh?dooKcbnPmoo)-decQdc`|91-?Y>F(9lIaa
z{haR8x<B82L64q2hWFT^$6-Cr=y7$A`_M48oDb?2rKp8AZ%sErT845zkk)B-1HiD*
z2l+F<Zs;Wo>q|&m=v@)g3rSpsyav+7y+SW`vhy@~$bgt@3oXw}rHI)zoKF!TPkmU&
zXefm>QBHp_#5ISW<eaDJPLF^BaunU&_^<vD`$EtME50vY8x-_)Jz29X*Q+W&e?PK1
zlzyiChQNvLt|#)YPcaQC-4{!9ZT<ve%U`kdfoJh;h+mW3%f3dT_&MCKQOw8Ut55V*
z9a&SUPSH$WqO^aa&*ThoE&eZXwT)lj*bd!Q4s{<ysiJdWwk!NwHhciNtW28TxVgUA
zg;JM|sT!-@d*<=jRjTV6FWtCQN^dAA))zX4z_ZpUGty9eL@?c`R7!PBl~EBp-4I?I
zH7ksljw;o?I!^ystLAhA+~wt=j~O<l>(fTdgr@5ieI-e4c}>!FX@@qrYJ8BcE%J>O
zp&IVQ!=6zp$HE=mtL{Z9N&Z6WR(=DKP|5fpT<N-|teF~=Lt0~t=%w7!hyC4<WCn7v
zobcqYP+9g@Z$OJCkHWLEZ!gMg%}a{hAL!bWKXA2zILXabVajVDv_^`Po1z@#bts25
z#aay@R?iqCav`~~s$R>)P9BW)FXtxC49IB>`gD7l#)^E67G~d-^{fsr(vv(=RYDK$
z=&z(#|7}ZdsN!E9`gm+h_1M1jj%HS8)oyl=w&BVov^lw+F>VmQHdgCv<CW^NvRW<F
z5>H{$jFM@|#(>yAime)IN--q$y$P2NEy<J{z?x%YF^?X|!9e2ovs{=Fr-by)W+G?#
zh*|7!={lquz;7TjHh?tJ7E$xCS5k+M-nm@r@99WtOFxLM+}AZRCoRNO(j2X<fGUNg
zaCodiPwIL#(uf5VYgVE2-MzFI(n?wC>ncI|x1_6BA*qYuW}`?CH>dAXdVhWz9q`FM
z<jU^FElCl!8x+$H?2ahC;wr2MDOO=eQlo%0m}HMwlx@9GG^_U^yX-^iJ4!2#rCg*j
zNnOy1*YAs~a@CrQFYI+nKj-;Ij&ZjtVam-YDD`G`Oe=F<e(Yi&W=D0U|Cw_I)yx(G
z@inrxq(49wrTbcGCGmAYx_0DT*@tmBU8~BkI}*^8t{HQQ@v^z(CY?Ws988n7LBCpU
z2)Q>iU#lsGtE}PfKc)D(*LbFpSEF>KfjOG>P}$?lhC>lC)Z<j*vN6=+>bq)Nweo+6
zzoNJm@sfF@Q#`ejXtLfY*_0HjFPB3qtdQhGsQ<sFYsR{X{Wh6PjaQUPJnK!F1No_4
zRC*KqR4X<mAAAp;T~k)lIp=%m?3%7j=WKYqB09w<jrOt&M4w4<8&`d)WpmOVb<pxT
z+AFr4ja$-nqM#{xKj!znDOkK{h}_ZmIh1ro4V&?@T2iYm)W4<a)QalaU9_tIGkQy3
zyO+Kg!Y)oNcTMEhhcuGk!_kWJF`dwjS?f@80_>9OtEc6VlGTI-H(WKS2ve_>HdXmO
zV;iD5*zc~+TiVpdj<1V!s8m@Y{n9mJekx7<Nh7P;Lfq2W8EMVRsU$D-&17ff-RLM&
zR~$#6rlfDP9ZPk|d!LOb^kH_ndKUArv7|HxkVdUMB)OnekFGHmm+E2trC;`ATFfX?
zn;GqBXFs;&-!t+mw*qIDI9WYXN4-z!);}L(M7CTjVr4s^t8(AGJ?|?~B(701yZ?DB
zNDpe%kgUjldlX$|>Eo!uN!2_*rL-}FC-aJN<QH{dvVEy8-Kk-j^N%q4k{{<E<o3wE
zjI_u?lC~Mb7`Z*P^yFt_aBc@SGvcjI-qj%$HBDEe#OlyUaXNy0yZRfQHo|v{R+C0Y
zY>jkPbn*AZ&H}L%Zrst?YNgYBqrz59Kcp>|iIsjsjjMfa3>?B3&@FO&SgNZP#rdpQ
zLn~YTLiR|r`?M;JNn~sV+HXmbn|Yd23$eQ^E2_--o!m4x!@cC@xTU_C+5Gx`XTPr>
z&uo5%Z};COgOkmZy^|A?i;`QCnaMlJXME9Mvvj}og!H2HmUJfb`6XH3Y-F}Wc35^=
zb_uij*Rr|U*PLtX$w{_#IURNw=gscpoY&W!pj)%BQDM8nL4{)r6APCVZZAB~oc?R(
z^IO&IUNgRCO3hWw=V#WuQ!~Hj>)P(wNAS5?F2$vi<>4kGMOERP@6epPjrx`3G})0>
z(QHb#qRkx{V?!Gpl7{Y2>nK-g_h^HsqZ!kSA?X$|tu&2BpW?{QDI2BL`FfLrlFsx`
zlD3sFG*vb`rZS7N57!zaB<*Of(26EAD_&Z;l~9dQqEF+7G@RKG=u-a#r73Q|SaVrW
zvPOHOhcoglSxZrp)OS@!>EOQP)Z)|FGi7mUew6ob*^JB`d_o<TmqT&=!21=1cPDQw
zI{$d2ZQ0!G{md1F)cMC&5K`+OT|r2Ve`EzA1wUg2A;JH31tD4X5-qLv><&+R@!uq)
zqJ3D!R;y_2G+#-8=AO~wjr?zQ{rpC7N9`n=O>Nl4n)VwaJ(c0nw)Uf-tI}7c50@nQ
z4Z4JsTE?&6CB()6O7-iZ9V&B^L^7xKnt50HOYYSAt$rQotqfU?UF}D9NiDrBiD~se
zSSCazqIdk-aG)~Z3cKI0)rAx4o&7nPRYwX*wj>&ky0&z4+NRpCIMX3T9G{4xoGVjx
zt89n#hiHYWaCV`@Bc(9QI?rh{W~0$Rn;Nee(fz}5ekFYo<NAllO>-){$LjVEl3VVR
zkHV_|1Ek3PbA2MqOko_;j$xYDs>C7mMzhFNZ<{I0qWKP9Dv#=Tl0mJsnZ9Xq-!3;d
z@y*&;R=@1XnK4Dz+|+lK<3RTf{O?j4CvQwQ*sNbv_l^2U8b#X8?3{j_#?ov?HPOh}
zhtoTa+)GE9rDwH7-q@?u=&AYLz~m=zlQEq;Jy%N~<OEO+S51V*Q7xNCK9VQ#L|VK&
zDt=9E)B~*#YQ&Uo?FVcX<iE5_b+~#~larNG?XNXWjr?CyMs-N8$+fm%7G@rIX{4sI
z^wJ2EY5ha_NW(HNaB4&r){tTy2C1IVA$vr%q?P>fa9%C1ktes$7GRIZej%=AFUIo3
z&(>%sm>!B$W&eVsntw6|aGFZBQ)_A5FsnJrNxEswFAsSlmZ&?e$0<c~Sc%rKwC2-~
zvlODHM=a4O6Blw`h@YxgtONT-Utuw<?ziy=`HB8Ae+&Ck&-+<^vHvP*PDUkLCHp0(
zCR4E+-b|LHJ<~PQt<wF|<J0rg+tR1f_tK?VbGBx-Uv^G*OZH&)e6}Q73?s1^_T`lM
zBu<|{6<!MS3$D<codB~ME-O4$m{XJ0^sE_HGZLHO=$Z*NH`YwAd9&uT+WOkzwWDiy
zuRWvoD)s?p)y}W$SvR6?-MZcDPN=)0?$Nr}>K4>}T|cybbo~zXd)FUQKcW7T`swvA
z)X%A3+Ay?X2X+RIYM9h;b;ErPuQkkX_=3HG)f=~IJihV##_JmIWq07E#wC10a9Fps
z{lAbjjmWm5qj{0qvN_qd!e8OWt!DoY?UKjOM|O=aSib)4iZE$Ujiur@lHlKp`C2(P
z!`IrbWQ!G5|4&*p&$XAz$L~#AH1~@V<MsXO+()}cwS4BF>{E+Rjeo7er+`oJuU6!(
zH89rG{Xfu=F{jk(X)-OF#b#kmoVJ!dqTZ`MTC{C(WhKkbk}N-qRF>j!MnRfc{n&bS
z93j~aS&KZx4dYgxpT=s^vg>bSp7foq$48qheGf{-t>MHf+9duJX1I!{^#)O)S&7yh
z<RhC*y+%6DdTg_Q8Q&GfKQmHQnU_+@+EQ!&t(4NVoz1@0XPVtJkz%W*m8@C&5cf2_
z*GkLNNQ<im7t$scq8>Vg8PfZuJj_SqF7{q#D|^b-{JYwa*OchW!);!MHNg3Xy!>)l
zv@MwxbPXx)pm5&SLR2&Hy`<GREo~vPGm2vnWe;&Hhb6^U$U|gJY2GK>Lwt}7Rn#{5
zD9X$L{>v_}SbZht08+G|qu@I6EZqv@anfIW)at9sAx$>0<RdwRgUNNVG{v!f50hv~
zg{<R}#!KgMZFxmGgciAyt6{8syu>I_5t=m>?^~>7&JK$^E&TGf)_A57Y)UC+4Dl~U
z3ZuOR4Xe_xUx@aT`DlDrytd>==nBcS?n|vejm#dZu#o)UqwFjbGu<ZIJ@ia}3e+io
z*#>dvBHl5|_z9#fhm===PNuh&{o`JxA5V?Se)%4Ue3a8k)S@~RdGO<^O3p1O>f}!>
z+8fZsseD;R>_On#j7?fFAB)sywO6`2a`t_(q!TMGsUH;SU2d+ND$|V6%9Iu}tD#~Y
zE4jT$q0(Ov`4Mg5C>i4RQ!zaHaRyW$de(Ju7Dz0c{b}Vet}SrRNxZf=-QrlR8Aw~Y
zb<8J9C(kNqgecBd$-`!jePdrSEoS3$8>gl9k@0+9yA}D`tWy$bGg?^@(q5%`akc>Z
zH2br8vBnkcPm2n6G_np_upDZ7zd89M>1EHYOl<XH<z3Xj$!)Z5b(reM3?&SQUkZ^;
zqIC3)^jqqd`>7X}s3%X;6h(_W-LjakQdh-HTakfs9&t6OYijOgBgNjwb1Y>#tmmwf
z+zP+*Jg$UVvlA6sIq$Ec$X!9(Eic~r^s(sA>D1iXTY*iLj)~kCUD$R|DPBv@YAhV?
zpO39&qlnr}<Eq9H^?2>!GoSU(;cNQE+O;x{X>7GnZ}%XzR*%w%C|!&O&EBR4^0VF5
zlHN<MKp)u{EPVqdoZnVy$}e97)4r9h&X>~pvxt+&T4r|QC&HH)n$3@vs;xf`<hdMK
zx9S;foLe+ISv$zZdZ#)&AiXOsV7q^sclS^KPV40UlJMdfK~Cc0p!9j-=i%bN&d-<x
zH)XFN*9yzmd1RZlW-nLy+6db}dkpTWh16qhU0tnewHNQKSF6YTg)%B*+Dt$-v%HGh
zE4d}sznCM>JBZsh8mSiz@Xy8?=XQqKlC+%v+cN%Yl~(@@eWPrbsD-Rw4oP3ZzcNIW
zNH$~H{^?lXayioFL;O>by4?5Vn1jiU<kIG7xgI_*=3t?kXQ;Oh;e455nXkrNan5$7
zn%wlrO$*bmg;uak!&~o?#M%7g+*sRXW1dq{rctTBb9R)RJhtgM*#bEos(F(;E6O0T
zGOc$j%=}Fjq?h#(IN6Ep*kziZb&Vq)#895yk*sR&XS05+jpW;yKeM>>N0E!Uq-fRk
ze)o!d%e6C$N|;6M?|<X(_D`_px-=;yZOKN-uE|l!Y02c|?&PIpRx*!+a{X9&J&5_!
zE$Q9qE9u;Lj%rMHL^dV6J9{C{pVsB+*JD|4y_>mHdsxiVu0xqS?OGUDm{Pcn6I5>%
zmNIu5&FQHLthGK^^IFZ~+U~UjYgeybzjg=CP@P{pjq~4)*q^ej)gD?awpH$y?3(3-
zXg1&EYgyMv`}6!;O6><`uMyMct#M72yz-ULQN$o5+b>F`Nr9D+&k(At58kETpZMi?
z8kzFZ%V^YHl_utiyp@)lMms#x6<y-<WTmZwT9|A}E29`cd5V@T)1bAP?mUqw8Ii4Q
zyX!W;m+nJD`h$?wJk<J^js4Fd1@f2fY2&FeS%ex<tUToyt;w{5^wQI28|yqxl-qQE
zmA~z}AnhC?HOqUMx}`fsTT*s+u@9y@B9qFynWv`IvS!zpPXjD#N&FQGE8}&sqIg=g
zP!9K#WB!cGJlP<satlS;TD7GQ@N9<aR}Rrg!uophDSfHZ-%7H*%^t*u?qmruzdsI^
zVDiNOh$VgwNuGqSE6j_hS5x@ZMqWK}HQrcHD4s$>Q>g_QUy{d>5a}-KEzwToytpK(
z(%O{$pmi(RTpAe^ZwSw^)e}!Ut_m{^)Ryc^T={mj>{WJu*Du+JkmZHjhzQk$4oUWg
zq7}zNuO@pz&GKSsAEF1k551S1&;RAc(d=&kWh|c($+>z`%!4P3mY+wo+mk(4K&NaO
z^@-uh9xF&6NAP6#6@<q9BXVCpFD2FV*yN`x438_C$!^6Ks%neuRa#3Ullqn{2k|kt
z?0?OSt}l7_k8{c<cTvni_ZC;JGsxdfDp}1%>z_MY877XeA%}`EKb_pl_g&UL{i;!>
z@|@JuWRYm*tl3Lkhw^tqLuC#+o6^H;Op~u{8Ld1ReZ{?Se=eL^Hq`ir1?F`cDe6P&
z(4RT*IWa!F_LOPsR<bSCcWjP)HvL|6?sB-aPfwnwUa5<})+6Gah}g#4ik`$XZlX(E
zv~x^d=27Vm#d5UIqxI|D(z+_9(>!1OO{@CSi>3Nx?J-<di#TE<SY^A;MWdO8EPW+Q
zPnIy6EB!9=QSECXRU=aRb(c`nBgWa*RNpi%<?3g}JB=F5{Ie&}rjomU=|{AmS>dt(
zHKL;VeJJ{Bzg;tdxO$WA9rcSW-%{NOx4D8^Mk719r`tuFr79lJxyz2R8Hh$B<+=$w
zVpH5LtYgjdnIG!6;>7m^e~G`|-^-fs9KSfJWv6(3o=G?=8P8tv%~&n3VY4J@_jG8w
zLwagDHJuUnio0hcvR$!RCS})WcV>@f^EmmvCTqTj@J5eIc!SCG@C5HE`IhtFJyY!u
z>7<ZsGPO0@-_NBUtI(p7>%9G_2^<;dKcKc<!(@Zn3@P|I-y5F!+0?shdi8FN@xix$
zPpH!NTqdoZ!pTc-{~s|j|2|`NRr$O_pdtFGZ<?$|eVOh`zf;WIf1P4VNv<^hkmSx{
zO0}d$F7;?~Nbcz3FNxJE;$WmsImY<uE-{vDcN?{3JFqLAzKOJ{XK4On^Bn2Vzg79#
zdPH;bOqH+g<PT4trVYwDX!X`ciQ?{7x-+xCVt8_K%t7Tu4Q3LM{s-FB@*20>7&A4`
zV-+l$Mo)?UJb{_7lWTmA78!AE)XweDG02v!rI+KZMl7?yq|d8*up0qgdDuwO+N!_!
z9i=b%gdSHhmx??WpQM3?!@HseVg|NSRlLemGWmQ~(r#2W^G1UP;@f(GG>!Bb_t`D@
zsZCenzA|0Dzo2@@9+T<haye!N$7uDN(P!l_X@6;LWFotxD%C)EEDdcd(Kl74k`-Rm
zrP+;ep`4$zoMuPTuti-*T-mEPP^-##sx9a3v)ik3wltEpw(O6@D5tQqlKHH&&HaYf
zF*~+@7)@W0R7<jA+w)|#_A!lm@lQ5`&D_P$eAH|U+Iy~!CkfNah3#{;h96R!t}!e}
z?W;*=4-1>c+$&2n{)@X!VN+_@HHT=!@NNdP{={R;Q+$gS2+vFE)UU18u@0BMOnr;(
z!TSz$4$JzgdIfXctQ8*Qer91!A@|%zT0>>#qvF++lZVOI%2$t-?rrn$(X(QB_E#)o
z_`x%<8R^w8PjK^?!M5-=t)2ZLJOy;MpYEUWZ}KEiAsLYzkX)5K!KtAy*#BFdQ$v%}
z>5KxO@%+!O**Kp4c{F<~Tg)4!HbMVi6t3qTS?_U9s9#}ZVe`Vi%vvui%qToln9CWV
z`kI04_-#|OTh0D8N7PKNnO1Xe%`-LawHdS5QMJ3)9$P!L_V(K6Yv<H1t?SLxKYP}V
ztD91HOWlKY&)3bW`=s90H`foVA636y{hsy5)}LR0cm4DA?=@r%{TkM6*uCM1hEp3R
zH(b?lf5WVXZyN_Uj%*y$xNqaQ#>*OSZ=BKivEKzA+ex01%q4fjwPjX>;j&JRN(0}8
z_F5)9`xw4SlbhY4tBO-7JddjrBPvO23dOQ`I$knZ`AmZ3+N@9MzEya#QafLjF>2jG
zF|SI$0<Cx8GQN6J?giwlGX2HKm+p0fXlH2AwfdK|zEP*1Bkia0v57cF;R@sUorqbP
zizG{9yW~n-DDPiL2j`<sf4}4Zi*)MK#+g?CWAsU7d6HH2D($GtIyTFO)n+eSu{x&h
zxg1Px)&A<=>cwqdrxh#1G#W%5;kWA&q7hYG8sd+p?8-Fao~Y6+xU{21?$VdCPW$_9
zyVPNYDf~7ojG4=**`-Z>Yjj~(D%6J3bfQ((1LF(N9#_|1`bAn3?diAVe`Ov@A>CwF
zf$sA2RoLZz%=gAty2{u;>LP8DE3<OcwozvMXxz&3E8|F(G#eP=xA>l%Y>lVC-@Hp}
z<*QY#{)b(pBH9>8`et3qHlEllMDi8S+4)VolwBE1+FvKMHtEu4m2rxvvdOO(>;4;e
zX|u|hnj?wt^he$nVCSi9#FZu2k8c;M9j#?-7B(RAlTm^v=8bdWuU0v2)+kA^c~x8T
zENw3S+sI=wqV|e&TYpB(yE0TgL@m(dPmla7huPe6fIls+6&3x{eaJyFWhYmp)5>er
zd&iNoGED3H%!IN>(Y$#ojbr)Rv@{~~g6t7;S$?=#!|MB-)%RaBip6-TPFm>7PDzRr
z(#n!D){@eHQkTk5Su03<@-ymE^7sFZc1K(fihLR1zoI=9SC)ZVL8r&QME{ok@^h3+
z(YNx2cf6a(uKQs({ykENZImq}RDDo=Rcqv$&6Qd{yOLbZ0+79;79cEnDEj6nU)8&1
zdp!wNrgLTKiKETD`$VU=lumn2!)b4uVGiMq7`cYFkxgTg>`|SNRlShAR3{V6SEGV<
zIdnH9-7DrQ-5`yo^RvbBQk@h~9EHfWvl5!m{wLOxbus0PzpOJ!Z=~IS5veJMiW=QX
zGPTR2e)V~zrW{A(4qVFyMQf_;ua-0YtF|BFp6`;b816rdTr8*4+w)t!PG4KuMyKS~
zB(crw^mS#Jag(vpcS2!hNJSfxpEPrvqx;2OxS+L9lU?R9yva(fU8X3~?-zBUsF8bd
zocX8!1lg=i(dhr(#izl4+{LHfFYMw|=NEMGsr4OQd}{nhU3?0DUKgL>KkVX@dF=s~
zDC8ZEk|=4)>fM0Li=35z)ovPZ*wZScrRbvPh$|mtz@N(XiefE{{lapPUeqa^V`8rH
ztO+S?9bRLz$+Kc<AM&J_GLL0XryN=3r(QdZ_g$#<^LVnAH1ezUs`ERdDs2;epf#HX
z$JFyB@tWE6=Up#$t`Zqa_lTjg9f~@VH+yJZPZpc4lBlPtFG-URbQAdBHPm{itwG10
zk?xK(YKE>_O1p^bRkLDZsJ!YJ8Y#sUX@;LdS5<g2E&8Y)`Rq_9m~Ad$T*y}pb%Htf
zH=D&~@J+n6Nu_FaMNe5;D&;7>&e|4l1=C8IEJ|s~;yym_W)UswaiWmZF}xjarJ|4J
zA=@$TPmr^8oGi1PgK#|EEzWwBLx0{OF~;ppi%wu|cbdD~J<M+2Ecdbd*4Hx|8s&H3
zROHcqoIi(?k=Oe>{S4j{qrD%M!1J%^e$bfTX>CG0>zC?@&$6#}Et_}^iB=wBy6nIh
zu2!_xM5=hbjh>`7Kdq3dp5=R;irF>hAYQil?y+3ivC@~?uV{9I{kO#!)SLGjDnFGS
zx!}Kv`PqFOanhd^W7EdIf!NfCd~AHv8AH3bbs%Xqz0E*2K^@dvSjjK@H?1!VqZjGa
zpCql=Z@fK4yHs$WcY>zm&@0`Sl4Qje*P`5u@m}p7B|L41D#@C)j;>`FwE6RhXV)45
zo6@C}s1e>qxY9}sZ-_Z4w&x_?Fg=~o;7wkQ)RTGbo~(4L74P?NCP~tl=VA6_UOPFt
zjy29#l8@8cbYMCv-8DUeXJRI%H>UTdPo(egR7{ff&Q{Mh%C^gn&&FrxXIJy4wG8@@
z!SrBg9l}qN@CLqiZM-l`Otz5vm3rOBv{`PU$zNk>Z{E>lyN9xN&1NgMSf*1);v^xw
zfztYHEAp(-*K7w#`k?e6?v3M>Va0P!>4CAIh_{uYT6xiG)^OgBC{5BeTr^a!)bCqr
z)yiDd165~wYqDRYR`u+keL`C)MD4@w1n+t^9jh6cS+S-qOJ@ss3!dqlt}!%sMVIpy
z<>frzK>kLj%?XPu9oZ$wr`E>B&ti|{ZGF-`=4UpH?PH1K8u_JD(FobWQI0L1jqw^u
zn$iQJ9OEDM;@&I{^>yhj)xUS-u4z{F)ji3lI+nEh(DWB@rounnpHj_UEm@%CC<?Vo
zMlT?S#yVNFl`&#3<vo|n3lndL_(R}A*K~Sj#r*6!P{q`UFg$&g5cN1&@R9~S>ny#|
z%)8_4G?7B2GmEp7^yhFSrpT^EBZ?={>gJt?iX|I3*S=k3i8owJ1C(MUp?Gg4_V)M0
z5~ZosHj*OKNf#{Rud$=2Kfjp17(dZ_jAW~+^;J$k-urCtOi*jv_`<l5B+zZ~kjcc8
zOMa&o+zpAbd(~MpB0Je5oh`Z~7aE)P=N&pt*+1f_r18>5w`ShisBucRvDUV^$_|2K
zwn{$OZO(hL_T}vT^*pur3MWT;`?WcNf0UoX>5&&WJJQTP%tpx=p4dAhxiNV(c`wb<
z!Ra=<eP=?VQyRSIg||mb&ZV<$%@V0e4~M1!k{jx8<7PhZHr+nJT?$3t7lXQ!i^k05
z=h8{37A8rEeSr6>>iG@zeLd-|u{N$*lZ#})cwTYBm=j?Kz#ZESvbkED*IYtAIpw9N
zPW>LVdu52pNk6}PtVubA%2GeB*k$nA6Ru2KUU8O28sK;9l80Kn%PAHAlh}^sa+I=k
z{?{LeY*dyYOGUD6a$C`p7&&+CQpZx<^f0vN0D2$s(?eq{>8mb%F+Btc(rM~}>A$df
zBwMx~q*XoDUYwT>Dp^ZhORuiNlcCB#UZ)?BPTF5>Ctj)Lq)D~b9<?B?a0x!;I5ua@
zQ`|{Dm0^*SF(>thw(JmclEgC)jO{6Ih$87VNuzpBYqATq%wt)PD#qh&q}qM3^pZmx
zNtSt{GLaT3$J3aoRXwv8OH!Edfq*<#_AXK<?Ub)nDfM99$9BBCif5(g_<|q7o7oQY
zll(OL;Y|PQScl<}Z=z0pU#{w*@m;bK<=0;X&AiEIg)voU&1x_FAMuKF9)B_MyXKeA
z3Gx-bX8)VmYAY@k8`WR3oH&{f$bz#Sgnr5N$d&4R@>Y#)=BHA#uJmY>GOKL>-`>zX
zr8)=MJyD)`H@_sPI#hP6EYIH}2VKJ?l|8bjX{~$=QRz*73O-eFvqfla^>~x`0oZ=e
za29W|cUbSkvHG_1d;24>{LbgQAUCti{iuJ-e~kUtn5>)Zm>hz3y*_y=X=i7ncRGR{
z?xT1fdV2bN+Rk%LJ+rlW9{M1jhn~vGym#Wsyp8xC$OOI$G9$dnsk~u@P2!u)&M919
zc(m{mPeFfH__n5zC!sgtS?K+F7WyKdYI>@so#&w2YB#DKQ@eldIknSj@2-8Ow!QX~
z+OK)GY3;hL>W-)zUw3}pG<G>&;Mt~u*&Fc0_9@hB%pQ!K;BAyOgvi>6{Ube|`+;ya
zj`_GBlG0?;)^F6u;|QPhrXOfzS0C9BJ)*hOprltEL-dS+#)l!Ymy+fxKiO-|i9H38
z$E!<v#&Yxf+N4L-eNDpiNU;RVw~%y?rN{W$;f%Yon4+B#j));~XEZ%7Qg3I$tE`ap
z*ho_zqB;x+hevzb{Op83*Xc2_Zd`fET-6R4HIx?5^-<(#IILJ^<)~$I|H~M6x~3O5
zB(cl-Gj1lQA%|T<B<C6d<4EcCriQLDy4Xi)0-ass#M1zrpZZm?&SpQWpRh}noQi8H
zY(G?Gmfo+CoKobSr4a|3lL;kC^HmGcsC7)6PYp><j=D^mLNQ9Kfz&0wy@T+)uGQgY
zjYzh}m+ERU><m-Unu9_#anM*-rd%V8Mt4FIJ!MiEqFK-IWL&9DEKkiBR(0Kz6TA3}
zM#=37Rh*Gcq1Kn)?@4aIEOFX$Q&{m$Q_1mFIYtW<&b21Fj2d6eN{{dUOOCCgSY<HQ
zCC5~iq1xHgNIDI7bmV2uW7W`h<!oMI7DsVRPV|0}GCx$mIM+&!B2~4&#s{;4`X@&+
z-jqY_Jv<r#^Ab!ho0B7|+Dh8R>`KW*(V9zS6_)eT+PrBOBqtnFRTIseG&-17q4~Nj
z4b7^sHIl=sYGM`_dmPAQr7Tovz2s1=opQ-GGRZpCDG>cvjU;z@Z4Rm8iTG=?0oAHc
za&T2UDU`80F>5++3yrm{$${itE?1ne^#<7((ZWp*sOnpa(USb4icdDrEZR=VfmM{*
z>Xz(H)6w(Mnz{AK^LB13x##y<|I+;I;W#R)uChg#>7_@b@uH5&UPrU`jb~bDnPfX+
zNXKahM3#%{rZ!Lyx7A&R<^A#Hm<v8$eNyR6Q;M&~mF9FIEoUJ%w<=mc=>j;K`-`&p
z9)xr@r50l#^P0!o+22Z=ct)(D%>nW_n@74!y@WeGd#By3o_u{&b*c=LO>5)IVX?f*
zFwG&Y=Ec=R-WaPIEE6Ybr1p}ewxIoD&0}<@w34af?4EaA+j^^HPnNaDVD%HVyLMdS
z3PaLB8FAi;U&Ty5sgKr+cBGU7%6P}N#gy&cN`6`?!^%wdrv>zGG5IS0(tc+0b6U6*
zl8%jcMN1)h7+y-kMN4s)$X|tzY(3RNGx&T}RyIPL*M3uFXw-}T3TUhJm2D*}P_k3x
zw!b`<T+BB;ikfL2q5Y(2mn2#vwArso4<mMZWURL=IceLf@jW{<#xI94nr17-b=}-g
z?-j^rAo-l7I*;1eA}fra%F@vJG?l+2tAqEt*WDM)yw~)jSsm1=mm7I<<5|wUIPAj_
z@f_s1WE!*YIoOBwX&Yx>My1=OyQSkf0dqCaZ#<LEjnBVt!a11ZvkBQWo`0W}E#*6K
z1NoZS&V1o*LOcsOlW(Cdh^Ha@awcZC!eNC8g>!gs&dkDGo`N5at$0w)@imipbI#4l
z8OVgK-kavh=h8aWl&|Vn%5P=gSbmIB4?+4RJGNI_nTPe0V<|cBXBE2)$*#0b**}hi
z$x290+0W)^&Djj3LcV&xSPN^^_6&_`kn2s8{o<P|!fDVVy`UJ{w<v4zL5bcIk%!rg
zU!ju4IGSW*S$7$fXvb6QWEux-jk>s>mS}Ig9FouYa&B%KtxikVPRjg=67>_)n&R3j
z{^}Sn)+x31TN`7<>DVj7uaJ6;#rcXyY270BT=hfaNE2_c*I4{NV}?`7dByRtYxsVY
ztjHDRWG!?Lt)}r=d?~Kv@V%n4pHkDKnfuw>Z4^%$O!I|RljoxqO=`X`q<MoZ?xs{L
zYtpvTi_(5gDc{yLpG5nqvbiL+Wqlz{WVQ;{Ul<=}1sb&@7rpjDqMa6{(&+wuEKj4)
zaDN1)Sh%Rg&a0@i_;6BeV`)!m6q7NHLqc!APt0AR(&!qChIpMu5dHEKmrLt7?$5Dx
zbW$&u!_p2saZ4*~eznN2a=b{j9}y`n`*wNaHhGRUyB2aeBhsPOdmED_fucrIXQOO?
zzVOnQpY*2cC96=}kghYEOrwI*DZDL9XcMcm)_^$0%2%=^!Rj-z-tskSt$Os~%MY?B
zR5OhLw$HLjv^unh6zk$PjydXHtx4J8m()(F#78^HZExN)Jw6~DPuPmX(dB%NAdNAu
zjJ37;YrIfhx{L)pfvaa)tK(b_jpi4}7rz&+ptQ<CEw8h=&Dl{grFLVLXPhNw*H`!z
zHDU6n;%GnA{|=31Yl848`vU3E2rp?9b+%%Kl!W7`p~+BgAy!%E$hKyv7NaDkncn#y
zXK1v&watH!ZjI5*i_>2cU+trJz6`+CoqCo=VYOe>K<-s)x=gHa3^C1DZIY+3Q+>sp
z!qMcgyf}IISn8CAn_iXWP(e%3++x`n#q`;c6`?j?s7RX~5iJC@5WEaWMo!qSq1G>Y
zCZ{72vNG<9wvOuCRSsUEm5dV`u%mYlYvs?okJ-x`<qz<u`P<padzNpzE?}*EWU@1B
zIj6?my!%<tnZpwcL(}zH&)Jt1^Yhbb>7Bf*W>)$w@2Xil8^x;5{*2aBv*|o<sV5iu
zF<S4yS5YU2%X}|JL0dtQtrXwRgFLi($yx3nXLiso`jNu4jvARh*33s-&2_VSY{eLm
zYW;D=G3jlob|Jnm2E8ej%&s_2vDZ@8_fb`zdo-sZ)=e}oOaGeqF25{knJzY&|7FzP
znwhqxC(!0fDbAUNacUeb@Cm<(T$a4aUX_d~UQ?o{^p(bJ6or|dw3W&-Uq_S1;;E-9
zmZY*6Km58Bs#-=pNto<@bbHWKTpH(ePR`~rqze~T`Km9<cS@{Jj2pE7Bt328jMn_)
zb8X@LqQ6RytEDQ1tE=b%im#Ge!g-OV%JI<lN;EzW&pwa6U44JK`lk>o!X<r@D~$+6
z%P35aytec)yr6GZsC1niDy<iWbK?kXXOtKR!#Txtn$4@meUim7XK9sXo_Yv+8e4gm
z=IrRbNyQwCqg5d-aznaDYjcu*+)VGz$!CK$j;Y;;hqDOH{Z$*A3!3JYK55F{q}1GB
zG2nWb2o<@Xjm{b?qa64qG)pgXof9>(#w%;(X3mP7S>b0VWd^t{qSm+deC1+ok2Lw7
zF(j^v(w?$ir4#5Q$={(};{@xa#gO7!I=)Sb&Tv(SO229Z?&o_flV_20d_786>I>G6
zw(?uC3!hvVN5N8z<jgoW$QICwO;P70I)|r`J@-}rlLY}M5<O+pHB2)i^*VY`A}y?(
z;#mx?rQbA?!j+_7)ab=9zJVzHt(Eto>}KxhjzB|CbvN=n{7Za%w$}Iao5eSf{)Q(D
zG^&(#l#w3EpX9A~_$_%_82k!Ti!r6Q@)5W=wq<%RlVVCciq>w_S+*(`Qn<93OB^u^
z1-PV`W;-^eI@c9#0n(`b==Z7C5pzG4WE>h6E}?a*{qu7aCz4-vh-Of69u1FL(|=Q{
z$+}7y&bJ7)&syxC<ZtKPWQCSjk2>Ii?c%AHw%(w2ixy#aG^u1emGdZBq3JB>uMUfA
z)>#Vu)&Amwdd9@K%RI*K#(v0ne-XPOGyQvh0dINh$6Ma^<10kxCztV-w+Ho>0_MAp
zXZ}{_O$9r%Cvr)8J9FJRSv_xv-HoUI&WP_Sn3>JXzT%tXJM*5mY2gLtw=ISBdEVoU
z!c~RoJn=EB@KsIUn)P|V+Y!udr`6nF^GeOfwT-nSYPYF9r1rAf>3r$s8NTyUTQ|IJ
zOx;m+lk0A;n_2f>eW89t{WkUc)gQ(49k<lasDG=Wwqf;#oq4unTEmQncN!MQXFJwz
z+^TU;zWH)d<Nb~AH7@Apy480Z-R%gz_ws1BFS@sN-?RG}-LLQdRQET#&+oppM}3dJ
z;ZAg&Y-nly$gP4_+w^?2I4pk~Yl<>LEVGKtPHpo#xl|E5+(GZl?@QKm+AGSU<=Hdb
zP8>a}rJQUhzBjV*M_Ny^8&46%xsUqppyV^kl)vOVN)h*3%SR_><B$;f=DW3`xcIak
z^RTlSr;4HBHt5u7C`r<J#XDk3jgHdk(uOw6jaE#$s2HlV@A<llv|5zNbP{PK;~LMT
zXQkCdt9T+UF1<1=(L1Eev1~?k7j-QADMj4fP8P-yHRhPz8b=?En?(yDSvC4-ywxhD
zcyM*>@$$)QThhX$ie+Vsi?h)F=~>iWeAbx@^~&ZLf{w_pqh0ddh2i1Wm^SC8a#8KX
zk><1s8uF)2ZT@ph(MQ_T>V6dQrNOk)8P{I9&re<+Psv@w%>FTnisJy^X44a7)j7mi
z>D#5eZJZY8i{nhtQ-GFgnbCn0C8kxi!lN;@{BEhLbuzbgiN3D!Wc_KzseZ6EdE_Nk
z=a$FX3fazMNH(K33^x~jW%rxJa^5yMi&j@$M!4)ma+mCz{Z`qo*57FBMDK(ar_I)2
z1WLYwDqH0##Uix2W=+YLNMe^*=^T7a>*k}H<t!Z_U7Y)>^@pSrV>y-n%ZZ(6$F*x}
z^@l;!tyiKGsrjmh*?-K-3040Qca^*D)W_g=vgQ9NzW5hsyvZ1Bk^h~)xUJezMzRX!
zl~YJ&OY48hkCDW3n6+-Sq{2<mS`N{?CiW^^Nv7HxeG+b@&MS&lv;vc1Rb^D<l&p-N
zD5n-bwC>lE3`Jsc|J(7?wX}_mhO)&>8)--Tk5II1xaq^*{<>n_t5e%r$8F0^ncH%=
zF1K9iLfOjA{#vB1OSy?o(&c`Vhtm3A@=8^RRs@RcK*`HhA$jTaLa+BXmUGi8Y4I+3
zsiIc4Vkx~Y{`E^<te`vBAzJOR^W06@2~}w|D&)GgDf=bY<r39XE5?~*X;rA&QTifp
z<rj)_EKX~MP+C+YhAcLlZP^(edn%{ZUsFYgSwNC1SwO!lwm*5LpP<E+Pg}SFxwCnm
zbXSzWD2K9Jl~R_IWb%6Ww%mBh0%%qX>Pu;=w^EjDuJC*A%AqD>;u|_A=>3wFVH#tL
zr!+~WoYbqcaBY`7D&i#<MGEuMi*^X{D>N*p2yAW3C@jWF#p}w_t2AGBd>7jC@uo}r
zg=v&jnM)q8O#L-o%BhNx_UJ;Jjac0oTT8j7XBKnN*IsP*M|!+Cb4t&s2rWr7;aVN-
zot|FIUumUlM1S}6H13qYe9bzR9TP32^jFAS9;Vh;TdI!MCv09LJzJa|5#KnVyp|h3
zJ+;_I7DFke?@ZeiZJ+cM`bb`CE{CRX)t2I><S?$$5w~38a^t2G=qu&iDz&V%M9);x
zRhoxEOLg1d7I{{jr4bt2GHr})QuGaaHryyO`$e%dI@qp78(*c@`l=|7;o+*7r|4Jz
zkk!L3a=4OFSr&_0MlH~mo=mz*pZf{PHJ&6_vM<glcBu{cYOUt0wl7j8`(5kC(;4=L
zCFRjIW^RW_N`8d4DCU?pK)d>^R)r-+Q7dHsM2E<?U$_E4=^9zt;<Z{=(kW>WUu4^=
z{jAN4<8`7ZUH%WL!sT$PYrNwA3uTyWROj3l<)oUPE-A9(psH)G6+0_&T#y8Hp*lM@
za=JS2<)#alEr%-_2Q-RyJ+)u5Vv^S7aAi5ElEJa&)pV%+Y}Un2H!&n_%a5VnuQ-FE
z{8hwBzbN|HoCf<o85ku}t)`hub2>i8&^|$NK9tr+S&>g$c1(<|Qv%j68fd+>-JWg|
zD;W=SmT(@k=AnL6_!BavXC<|wB`(X>AI=j)S{*Q7NvDlR*0W>{O15NCUxT*zzIai~
zMVV`L+H29MDX0hK7PiJztz~VGy;Ke_@BVH_t&0As-uI+y&8)14n_Sy_j#|@m$XVgG
zH>9|tQu5y#?k25f9IB1=h+Kz@g4Tjg2UdrNa2H&x^xM*%4{z>ez5aEcruxKv&C^sP
z{211QCi4{46P$3L<v-(HLqn78lD(4&$!|D?IfM7hf5t9*Ki)9E5${JF7uW5z?l3D|
z%*uUtp268O?y=vOwew|~`q0ArCbr^hv*W{*a7&mOUI}w~>qKAPlz0H&rMa>2LZY+k
z`kJdGQfEZ46~lwEB{d>djJe@~$W`n08Z&Zk+>h4KDr<A5?{rI|?m?bpx5=*3T5VIh
zB+e|QLC_rj_wi2aPjD;kL;|F(ZIwqWU*fBM6SOt4cS)OORBNlR#r4l*b?A}JB%P@c
zQO5b<WVKkAvVS8~**K=vFwrB*wB|i5>%<09y)}+Wf0lL)!(Sp57GgTuEF0-*ja6;w
z6zUz*hWlt+U8%Q9GhPd2c4bdC$;M+m2!D<<FB^Ha<}{2a?extClS0+m<T>u&W!fvN
z4zc-!XtlXNnjyV_vMXXGXCs?-FI_L~t#QRH1$O<C-^5W%QeP3Cokoi(l{A8KUpd^1
z%ky&NVY%7UFyeP}p*GT7873PZZIPajtDdjAC?|1FZ`4uSw7B`P>~g5hFW!oyaPF&j
z{pY&F#_9e%pQh(Oqdv)grE)6ze1(KkUgdaqSgcc7JJdRzps7r&w}j{!ph`czBV^|y
zMNzM0r$$a_T~m@K%ff7TxjPkWR27!#G^z5e^xd(TXY@;7i>)RuMU9ev8EaLxl%?}!
zm&7$V!X&S8yiP_$4wqv}X4Ge*_Rn-?wbJ4)j_gqm>{P}HvBYxvvP@Zf(%#w0$ZusX
zc50#7y#ZB~{?)v%vbfM{qN!X?W!!&6UKGQUdm}GIha{~}SQ;hR-mt9xpqf{#8oSrx
zOb43M^I|^YASI=XW6ex=h$E%5^<3N8mDX&0Y#GJLPc<~TA4f{XH|r@jHmPme!aY&a
z6{dNmT3<6y`gl4yQe6rO(__xE_0685HpwLTm}@81t~k18Z;`86u(o<5T@m#~b`q&=
zJk(rNwwc+<^rlpMWXfNomF!LFPqnG?koMG?kFA?Y<7#bxMX^akZsP0mbBq0w9Atqm
zKSotqZii?sSj?F`8FDkb&U5*qT1&Df>*jj9?<Affosm4t*HQEg!Jh0mPfD-nJ$Wzi
z^eA7J&$i(ig7NG&-;&**&1bK9SQr)dWX=3k-jsI>qt>kOG2c`h!ML?^;Z)x5`+7}M
z)4gVB&1N-w)*Qvk`9(EX*Ze<)oqMoVRUOCA-fQnGkIQ|Wd+v>=_a3zS2bmQ)Mn=Xo
z#aL4_WmKe=4bvDoMGfOLj+J8$npq+#<0zS;VJadj5(1JUnNPG*M8!vnWaN<J6hkv;
zPT$Y(x7RuQoO^+P;M}!-Ypvh<t>1e+_SU2J*d2n|W9E-ptS_Ui9kX3uMj119XzUz)
zAN|K;S1NP9bL^h62bDdauI%}Oap#X)I_}1CtH*5}w^QFnd24*<_<`|5<BuQzx$z71
zg_MhxOJAq2r@z&ibq;l&(D~WUg`MYhuIPNEbDzGBGHb$u3Ckwz?ds{8-L<f5ao5tW
zRbA`#we(lI-szs&ePZ`1-KTbcv-`W<mv(RIezE&t&%~bDJqvr5^=#|e-#fi`Ztue0
zCB18UpQ@(S<EwM3r&gC#w^aA_)%s@joz-_?--^DCeY^Vh)H-TYYsb}2uFb10sGVE8
zq_(tnOKnGOfB(__r}UrGe?kAU{_FZT_iyiiz5l>K&%pG7;|Au0+qAO7k|eAmwu0;r
zexqAS>2^VI<L*!p78|8xSPub{!oR$mOh&&&!>7+$E3bhcN_mm&dg<fX%E#C#Nw$*o
zgX+=u6yU6Kw&B^fnuh()cS^d-ZKD1EfZCVK;qxLVmo3rnavidcHb8#r89M~jN^^(R
z;(lb16QOO9hDu7>Opx*<+8|pYZk29mgUB+C6U#=42HM6TejN$@+fpgBB+oQd`Lcdt
z`LVq2RpHwdzw>9*GaM1^EgA-ks`=+Tq|-`u;bxWdcl3+s1s}GRYMg6sg>sAJv8(&M
zjZAy~v{o%bqk~vaY1Y*DCyRG@^QR2UZt*M`3|1DO&HaUWq9%Jv<+|?|@TDHr65TkI
z|FwWG)rH^LOdBu#rT3WU>u<xMsfqiUt83s<ZnLEulv4o<xcqP}B3B+S-YQOg=YNqT
zw48%T&anAF3r?bw2lUm$)79#w%e2z8z|u*A1*biw>_XW;FBONUe0k3O!oouq%#`dJ
zD`hTt$MmX|PA}4$`wX$L#9;7_@0Ya9CfsCrTl-|XsOGJlXYSDK`5PH=>VhBk2>%6t
zrJDa)>m6ZAQd9YoWZ%kjvb3xvaU=95c6D8qE5hVUV{Qr2G@PcPU*IAK<Kx05H`u?U
z!{W&iUx1~bNLpFynf-azIC=o>JzrnyxgB;y&ta8O3@nH8C&YW;j}(BX<`u~E$Fdfm
zDc^pmns7|1A1JF=B-9U-^}dNFqAxk!D68`PapMoDBV0Q0Nr8vXE}_0p;69eGS3Ucw
zt!WtwKf<Lr!aS;x@fInkHPN8fEW1Z-Bkhn^JTUkQ-;`eTJKI=VIbc|6UY3@v$bR2e
zhraQ%NrTyX(WcxtuO8IY>u`3rdMMZ6S2~xHNrx_V^}SAV(D+N^;Qw`Hn}t=ml)RMt
zO_J;Et~Pwo(@wqNY?I*1Eujq@7Uy}VXjHD}yoOdSyQ8gLLAyq~wQU%o`5OIXx3|^0
z{&bw`*_t-`gA3;<S@(z+-wtW?r};Syw-#)D^2gffMEPL0L7dcR6|g&41=hCV31%0F
z?<s}1*iYhjv5R4UK|OXV-Zm`Dby4CQIzHSuqJ0A<VSl%^Z@;r8tCFmehAP!1r%P@;
zc7RWPF8dYXsVsj~vvB!C$Fkclk0^hnr4%eFeOPlVVDpDW3x2cXQLUV*w$5YpA3b*R
zhh56+kRcHN<$tnY@Y<<r&0MA`V_3}}6coIVJ!X|$mWs?u`iyWP=TE6e1)^=bL-?yS
z<6SOzy||61ztHYPHbdFJttE9XpU7!7VclGR@*YdE9{C?7S+TS=u3#6Mc!zUeE>$s8
zh6N(-nwlOb3ZqB(%cIs~D_;~mSYa1DcLF>#8>(<qBGwi8x(u3oz64zX4$Sjun=>9P
zIved)iiVOKWkazBjoJhr$MVG;D?B;!0fpa?5I>Dxf0SU1H}rq8vzRd65uo#JhlC;H
zWIZNF8xBpZ;2GqGjG60I^J<c5!n{1*NI1@Ht7XF8-;p4R5baE5GNtmqBS7Q-wtP)h
zZQ)Sg9YQ~QE)MQ&P%4>m#Cf4l>d9pB+2OHm^qD_!MA!yh^S32Y<};+97hdF!Etf4^
znK{xV9?CfVN1dPdg149}?>?1E)BhQi^EvvAb*U$36{Xk@w^Pb3hZ}6PQFAk4rPds&
zD(7wBf<g!9d?|Xg`dT11@)}0cNtSS(=4U0@`O+BB5WeXR{nA8^VKw|leWNw-p2#~!
zn+sj4iFUb1)N;<M8TSzt`U{BYxyj*L;osgLn!{zk8hqcgbv&$som2`dM!}|`Wx_S4
zAzIrOSs7u3gii@qYi8}^Gc*69A?w=EJAqTshlAy=jdljZRijX$+^6S)m<95Jf5z_A
z;d*YiK!3@b4$EzITIW_C105gzoUU-?D3oA4-z}xjdbq-DOKXoFPZ#;j@GJ3QJC=pc
zQ0tMjVaEbFEPWe2EK?8deT+Df5H7df<5pbYYP=32IqZ(vPSH@m!qQPz5z7bWa3)@G
z5u1g}#P=;2<o6dPSRA-=Qt;ckP!N3|eRPk>vA5(HsN<|TQqmhHi{1`5dJCuIh<24t
zHq-WzM#8xrst4Y38#&Gh_%P8{yuDv=L~9WjObWbiKeDewV4B}&tIzp*XzuwAyidtu
z{s(!U^c3rg)4=&bjYBzh6#v+5IyO^QH@ng}&THM1WtRRbjo+_+K^n>0=UWWcU$TS3
zo&#b<;`;28?riLUY9#Y5GyeiMuld_dlN)TUJ)*Lc3i-X(E{<DR?(j=#KzPBhNhS)0
zIiSawy~Uy_8FfkvUm^QRMQ={&wZcx7nD?WZ)27g!`DXoUt!a!PIQM3XZ?`1xkzOpr
z;%5;_6?~i^SLOP6I>|k<GGzZDA)|L)M6(H!I(nZYBF<!yYyw(I^UODi4#e3|So$E;
zL_2I6p5dent>GR!`E~cU{Omz*;5)o6b;<XPdd$<k0K7ToR!>&iDDVkfJeXZANWUrP
zE7PPUucmrUAvKlf#Ya|>E|D)t@9q(q_RTq+NWc7L_rWx)&s3II)@ZMJt32wr>??AU
zlbOl9<Oe#Vy)t<)c}{nc2eeZ<Q+J%^rwjC5mJ4-G`?_?UGR`}6R(o&yPUzIzV4T(d
zf^yH7>aNp6dY%8>Y-%<$`;>Cei}jV3YqM?2J=e5fx=1hduhRQ9+w<M|oBBS>u->rw
zWXJrDAL>T(3Z2`2q~rDMQc0QYwCH)PsEZzjnuF;9(VP8L_v%)Q3y%r+>Tlu&Xa#++
z4Mm<Ka3j5~E<H&UB6C;G|0Z8wS)-I4Mf5k?mUV{X)Jxc8<u29q%1)7Va@eSqgzJ&#
zSl+5{h{M|<{A_GJ+%rm@=@yN+LHNR>=odIqtC#*-qr@`S4a?*fj}iPE0Us^3D^47x
z%hf|{hbE1h3|r_l@>4}62}-XNZD=z&y+T~iFF~ffe93S8JlU8)CV{`PQO@yTZ08x0
zTh#;a0S)DR?ZG0sut(VO3;u^sWv%j;EatNlu<0yuF`grO%rsS4Z*9qF{M_1>UpJhR
zT_PRTcoRWA`i{!o)}wh{VVzc1*@WafDx*hnPx=w{<Q5A`SeulW0GnkU=?TK5`L}i}
z(-W-+bn0OEPouWT?W7-W^vP;*yRe$Rpx(WYXbIq5lgV(G{>L}w95?=?Tlix2v!5A-
zyf)Suo`Qrn^)StR+*Sy$xl_2so~><mu|{o{6l27hH+tm7htZ(CS5BRbs10jvEav2z
zYbe`gy);YU3Swm>ayXqSD*M?HWU*QykKliE0(mHZQM2;Du_2|1J;UdUHEni5Ga!zV
z+-3OHhlYyOWuAwIat>ytv?kdE^Hn(QGQ!Fj<=}Q;W8a;|{q68XL~Xkp8GDu^u>cZY
zc*(pA@28MssGNMerM!q%l)3hOQnITisrd_9FTd~W9D~%?^IhU$xKpuGy31?{nvNNx
zFAJYH+pQAMC?TuN+_jr&xb#EfbbJBNmar~E*+r5vl_l(-#PhqfBj3@J+^m1gr9K|3
zsC-7^->UVq3-$c@QV+gAr3`%jTuUh}c{Ai}(IWO6wU1^QZZF1zlIYK-hlJO<#&G5C
z8z+`d(yr>+m2>sV;4QLy&*`S#f#euL4C&RkU#Ne##O%*9U-RMeSH-pD5umj^n2tWl
zaCz^~y~&7KZ`dze)vV`y4_L9Q5%)^Ow;kiGoEQvR#Pevq>3S=N2gp~sH!0ak?`|uH
z3povhwq-r1R$kRgp-W5NW&VmJ7M+9ikss-*yuWfrWszP3SfwvGKdBpX?<Q5fRyS9#
zkep|Bf1_?T@6|gbwRA>0S9X7~ZfC95H+Wvw8L3X4keVCj>lKnKbT4ar*c}e&jpEs|
z^h>kN+0OK3jW$g<H1a+A;v2N1gy?TLds+W7Gus)|Z?{fZ6#Nq6P&C6Cnu$Z9NnAos
z7f+PSTtA*Bs+3DvV|3Hk+RCFAyvcgDNZz<rE1W?UcoW{nKDgvYOYxG88*8y-lFRU@
z{smWVGr%Qgy{xrtW$?^fTW$JjQO9#O9-CFe!@>rcCKE`suY01wZ>xG4zBnr<yPWgo
zzz9pv_|ldO3w(7s*06s7KK1aRC=g4@G!&j`@UJ&`|IT;yjC;uuHhKtyVVkgurD#yN
zzp#Jd0h^2WVwN|ZUBWNM^0uz&$4b3>jlM~uQun8sdo0BV!z(fE5Vn?P0ED0SniB3W
z;pK6O=Rn2b;l9#XNCGlD9EjcGOni?GiRnt%H7GK!l5bI2vqV24SF90lcEox{A}{KE
z_f?xeYrx(G>+_oajj&j=miSxeI-#Y*BORq%FnWs@?3#7VA8GxHQ7D!>1(5pY>FFQY
zY?~0+?n&v3##MgHrii67c3{jVXe97uSCV|5ac)OVx~{#}wHo{ft|nE<nSyGEqc7)b
z_j;x!-!Oa2N;bzTLm_8{ADevr2(awH5hux~2wQ|RqkI0@eg0xMJm0PLXsw$e`kkel
z!S=qY&VhF6UhoXPvAS4qv0ttCIJf95=w3xQN9(<%S$dIkUV54$oJ-Ob=?0w#eIq>>
zI>K<6BW?Gsuqd1_jkh*Dm2=mYTpy<lhINa0pJ<7F@)*G*RJ<e0#3a1Y1_xqw(Mq!K
z*;V=<KIeVPxQF69G|;$^uWY&aVKgYWN#=oMHF2lIz?J3JeWFIQ295ND`PH03_iu6#
zwZvTddxc@l>4Rm=nVJ31-;iX)TF*!T0}uKNIH${pN&jmy0fvQ?B*z*jdPxzz=l?XB
z@-pW{pK~q!mvFR^^b!W%dE*6)3b)!lj|bMCW${~l)qJnuVx;KWnSEKj8@SJMX<<N^
zncf!7iP`J<KQxwS*Iv_Drg`-*THzewjAkwC0lrGEvUH!~&YtXY)lpAI8O|@gkDkua
zNYr8PiQ<Q|rHv9WkgTS2i}v8@a*tnNGLe2lt!WSKp$-^<XRJS2*irAVj`Et-aQbo0
zfHKafK$|zs>%)o-WtXWYdh6_V;RBR>r~GxTMy$v0L&uqh415KL8jszIm{i}bxy^dF
z^8D|jBHFUQGDA2Z3Hb1m1-)5<*T`t_IQs^JVY}f-89WC4kPYyh6dt#+n{{Yn{1#-I
z{uQH#$80W580SkcVdUOQQpv)TS`U{6{3^Hw{-mCHILEqw9kedfD<`CvnG_MTL@9DV
oc3RjW2;ccDYQoc+Wh`Nyspg-leMKV-XvP!GiVtfKa<EeQKNi8F>i_@%

literal 0
HcmV?d00001

diff --git a/app/javascript/fonts/MaterialIcons-Regular.woff2 b/app/javascript/fonts/MaterialIcons-Regular.woff2
deleted file mode 100644
index 9fa211252080046a23b2449dbdced6abc2b0bb34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44300
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
QW8}wPUeo^@jR61v08@RD2LJ#7

diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
index 889983ed4..a4645d3f8 100644
--- a/app/javascript/styles/mastodon-material-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'mastodon-material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/black.scss b/app/javascript/styles/mastodon-material-dark/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/mastodon-material-dark/color/black.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/icon_config.scss b/app/javascript/styles/mastodon-material-dark/icon_config.scss
index 610c7e308..99046e176 100644
--- a/app/javascript/styles/mastodon-material-dark/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-dark/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/cards.scss b/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/account.scss b/app/javascript/styles/mastodon-material-dark/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/basics.scss b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/mastodon-material-dark/theme/icons.scss b/app/javascript/styles/mastodon-material-dark/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/mastodon-material-dark/theme/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
index 5068d6386..cda781b7a 100644
--- a/app/javascript/styles/mastodon-material-light.scss
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'mastodon-material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/mastodon-material-light/color/black.scss
+++ b/app/javascript/styles/mastodon-material-light/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/icon_config.scss b/app/javascript/styles/mastodon-material-light/icon_config.scss
index 610c7e308..99046e176 100644
--- a/app/javascript/styles/mastodon-material-light/icon_config.scss
+++ b/app/javascript/styles/mastodon-material-light/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/cards.scss b/app/javascript/styles/mastodon-material-light/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/cards.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/mastodon-material-light/plugins/plus.scss b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/mastodon-material-light/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/base_config.scss b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/mastodon-material-light/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/basics.scss b/app/javascript/styles/mastodon-material-light/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/mastodon-material-light/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/mastodon-material-light/theme/icons.scss b/app/javascript/styles/mastodon-material-light/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/mastodon-material-light/theme/icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/mastodon-material-light/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/mastodon-material-light/theme/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/mastodon-material-light/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/responsive.scss b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/mastodon-material-light/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/mastodon-material-light/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;
diff --git a/app/javascript/styles/material-black.scss b/app/javascript/styles/material-black.scss
index 19f29bc08..345077ab5 100644
--- a/app/javascript/styles/material-black.scss
+++ b/app/javascript/styles/material-black.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'material-black/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/material-black/color/black.scss
+++ b/app/javascript/styles/material-black/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/material-black/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-black/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/mastodon-light.scss b/app/javascript/styles/material-black/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/material-black/color/mastodon-light.scss
+++ b/app/javascript/styles/material-black/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/plus-classic.scss b/app/javascript/styles/material-black/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/material-black/color/plus-classic.scss
+++ b/app/javascript/styles/material-black/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/material-black/color/v1-dark.scss
+++ b/app/javascript/styles/material-black/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/material-black/color/v1-light.scss
+++ b/app/javascript/styles/material-black/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v2-dark.scss b/app/javascript/styles/material-black/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/material-black/color/v2-dark.scss
+++ b/app/javascript/styles/material-black/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/material-black/color/v2-light.scss
+++ b/app/javascript/styles/material-black/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/icon_config.scss b/app/javascript/styles/material-black/icon_config.scss
index 610c7e308..99046e176 100644
--- a/app/javascript/styles/material-black/icon_config.scss
+++ b/app/javascript/styles/material-black/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v1.scss b/app/javascript/styles/material-black/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/material-black/layout/material-v1.scss
+++ b/app/javascript/styles/material-black/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v2.scss b/app/javascript/styles/material-black/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/material-black/layout/material-v2.scss
+++ b/app/javascript/styles/material-black/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/cards.scss b/app/javascript/styles/material-black/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/material-black/plugins/cards.scss
+++ b/app/javascript/styles/material-black/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/material-black/plugins/plus.scss b/app/javascript/styles/material-black/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/material-black/plugins/plus.scss
+++ b/app/javascript/styles/material-black/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/account.scss b/app/javascript/styles/material-black/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/material-black/theme/account.scss
+++ b/app/javascript/styles/material-black/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/base_config.scss b/app/javascript/styles/material-black/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/material-black/theme/base_config.scss
+++ b/app/javascript/styles/material-black/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/basics.scss b/app/javascript/styles/material-black/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/material-black/theme/basics.scss
+++ b/app/javascript/styles/material-black/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/material-black/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/material-black/theme/components.scss b/app/javascript/styles/material-black/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/material-black/theme/components.scss
+++ b/app/javascript/styles/material-black/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/emoji-picker.scss b/app/javascript/styles/material-black/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/material-black/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-black/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-black/theme/icons.scss b/app/javascript/styles/material-black/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/material-black/theme/icons.scss
+++ b/app/javascript/styles/material-black/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/material-black/theme/material-icons.scss b/app/javascript/styles/material-black/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/material-black/theme/material-icons.scss
+++ b/app/javascript/styles/material-black/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/media.scss b/app/javascript/styles/material-black/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/material-black/theme/media.scss
+++ b/app/javascript/styles/material-black/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/material-black/theme/modal.scss b/app/javascript/styles/material-black/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/material-black/theme/modal.scss
+++ b/app/javascript/styles/material-black/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-black/theme/responsive.scss b/app/javascript/styles/material-black/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/material-black/theme/responsive.scss
+++ b/app/javascript/styles/material-black/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/statuses.scss b/app/javascript/styles/material-black/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/material-black/theme/statuses.scss
+++ b/app/javascript/styles/material-black/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;
diff --git a/app/javascript/styles/material-dark.scss b/app/javascript/styles/material-dark.scss
index 8cfd6c6be..ee4230ba9 100644
--- a/app/javascript/styles/material-dark.scss
+++ b/app/javascript/styles/material-dark.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/material-dark/color/black.scss
+++ b/app/javascript/styles/material-dark/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-dark/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-dark/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/material-dark/color/v1-light.scss
+++ b/app/javascript/styles/material-dark/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-dark/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/material-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-dark/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/icon_config.scss b/app/javascript/styles/material-dark/icon_config.scss
index 610c7e308..99046e176 100644
--- a/app/javascript/styles/material-dark/icon_config.scss
+++ b/app/javascript/styles/material-dark/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v1.scss b/app/javascript/styles/material-dark/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/material-dark/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v2.scss b/app/javascript/styles/material-dark/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-dark/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/cards.scss b/app/javascript/styles/material-dark/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/material-dark/plugins/cards.scss
+++ b/app/javascript/styles/material-dark/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/material-dark/plugins/plus.scss b/app/javascript/styles/material-dark/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/material-dark/plugins/plus.scss
+++ b/app/javascript/styles/material-dark/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/account.scss b/app/javascript/styles/material-dark/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/material-dark/theme/account.scss
+++ b/app/javascript/styles/material-dark/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/base_config.scss b/app/javascript/styles/material-dark/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/material-dark/theme/base_config.scss
+++ b/app/javascript/styles/material-dark/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/basics.scss b/app/javascript/styles/material-dark/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/material-dark/theme/basics.scss
+++ b/app/javascript/styles/material-dark/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ b/app/javascript/styles/material-dark/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/material-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/material-dark/theme/components.scss
+++ b/app/javascript/styles/material-dark/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/emoji-picker.scss b/app/javascript/styles/material-dark/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-dark/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-dark/theme/icons.scss b/app/javascript/styles/material-dark/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/material-dark/theme/icons.scss
+++ b/app/javascript/styles/material-dark/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/material-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/material-dark/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/media.scss b/app/javascript/styles/material-dark/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/material-dark/theme/media.scss
+++ b/app/javascript/styles/material-dark/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/material-dark/theme/modal.scss b/app/javascript/styles/material-dark/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/material-dark/theme/modal.scss
+++ b/app/javascript/styles/material-dark/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-dark/theme/responsive.scss b/app/javascript/styles/material-dark/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/material-dark/theme/responsive.scss
+++ b/app/javascript/styles/material-dark/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/statuses.scss b/app/javascript/styles/material-dark/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/material-dark/theme/statuses.scss
+++ b/app/javascript/styles/material-dark/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;
diff --git a/app/javascript/styles/material-light.scss b/app/javascript/styles/material-light.scss
index 9818f14f5..228057b12 100644
--- a/app/javascript/styles/material-light.scss
+++ b/app/javascript/styles/material-light.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/material-light/color/black.scss
+++ b/app/javascript/styles/material-light/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-light/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/material-light/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/material-light/color/plus-classic.scss
+++ b/app/javascript/styles/material-light/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/material-light/color/v1-dark.scss
+++ b/app/javascript/styles/material-light/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/material-light/color/v1-light.scss
+++ b/app/javascript/styles/material-light/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/material-light/color/v2-dark.scss
+++ b/app/javascript/styles/material-light/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/material-light/color/v2-light.scss
+++ b/app/javascript/styles/material-light/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/icon_config.scss b/app/javascript/styles/material-light/icon_config.scss
index 610c7e308..99046e176 100644
--- a/app/javascript/styles/material-light/icon_config.scss
+++ b/app/javascript/styles/material-light/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
 $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v1.scss b/app/javascript/styles/material-light/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/material-light/layout/material-v1.scss
+++ b/app/javascript/styles/material-light/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v2.scss b/app/javascript/styles/material-light/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/material-light/layout/material-v2.scss
+++ b/app/javascript/styles/material-light/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/cards.scss b/app/javascript/styles/material-light/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/material-light/plugins/cards.scss
+++ b/app/javascript/styles/material-light/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/material-light/plugins/plus.scss b/app/javascript/styles/material-light/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/material-light/plugins/plus.scss
+++ b/app/javascript/styles/material-light/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/account.scss b/app/javascript/styles/material-light/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/material-light/theme/account.scss
+++ b/app/javascript/styles/material-light/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/base_config.scss b/app/javascript/styles/material-light/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/material-light/theme/base_config.scss
+++ b/app/javascript/styles/material-light/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/basics.scss b/app/javascript/styles/material-light/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/material-light/theme/basics.scss
+++ b/app/javascript/styles/material-light/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/material-light/theme/button.scss
+++ b/app/javascript/styles/material-light/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/material-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/material-light/theme/components.scss
+++ b/app/javascript/styles/material-light/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/emoji-picker.scss b/app/javascript/styles/material-light/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-light/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-light/theme/icons.scss b/app/javascript/styles/material-light/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/material-light/theme/icons.scss
+++ b/app/javascript/styles/material-light/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/material-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/material-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-light/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/media.scss b/app/javascript/styles/material-light/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/material-light/theme/media.scss
+++ b/app/javascript/styles/material-light/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/material-light/theme/modal.scss b/app/javascript/styles/material-light/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/material-light/theme/modal.scss
+++ b/app/javascript/styles/material-light/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-light/theme/responsive.scss b/app/javascript/styles/material-light/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/material-light/theme/responsive.scss
+++ b/app/javascript/styles/material-light/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/statuses.scss b/app/javascript/styles/material-light/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/material-light/theme/statuses.scss
+++ b/app/javascript/styles/material-light/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;
diff --git a/app/javascript/styles/plus.scss b/app/javascript/styles/plus.scss
index 9cbccaa5f..45fa7f979 100644
--- a/app/javascript/styles/plus.scss
+++ b/app/javascript/styles/plus.scss
@@ -1,2 +1,9 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+
 @import 'application';
 @import 'plus/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
index b299981b0..6aa7ebfdb 100644
--- a/app/javascript/styles/plus/color/black.scss
+++ b/app/javascript/styles/plus/color/black.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #000000;
-$menu-background-color: #121212;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #121212;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #000000;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #1e1e1e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #121212;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
index c3c168316..4ed9a7e07 100644
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #191b22;
-$menu-background-color: #d9e1e8;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #313543;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #282c37;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #9baec8;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: lighten($background-color, 14%);
-$icon-background-active-color: lighten($background-color, 18%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #fff;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,9 +99,9 @@ $border-color: #393f4f;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 26%);
-$scroll-bar-thumb-active-color: lighten($background-color, 32%);
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
 
 // App bar color
 $top-bar-color: #313543;
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: #d9e1e8;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #1f232b;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
index 54d894fec..d4d84a626 100644
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #2b90d9;
 $secondary-color: #2b90d9;
@@ -22,20 +24,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #eff3f5;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($background-color, 6%);
-$menu-background-active-color: darken($background-color, 10%);
-$menu-background-active-hover-color: darken($background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -55,8 +56,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #282c37;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: darken($background-color, 4%);
-$icon-background-active-color: darken($background-color, 8%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -64,8 +65,8 @@ $top-bar-icon-active-color: $icon-hover-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -104,31 +105,33 @@ $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 // App bar color
 $top-bar-color: #ffffff;
 $search-bar-color: #d9e1e8;
-$search-bar-focus-color: $background-color;
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: #282c37;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: #e6ebf0;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $tab-indicator-color;
 $text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-background-color: $tab-background-color;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
index 60c8370a2..eba9c0f18 100644
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #db4437;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
index 77cef824f..d925f3d65 100644
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #303030;
-$menu-background-color: #424242;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #424242;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #424242;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,16 +57,16 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -97,38 +98,40 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($background-color, 30%);
-$scroll-bar-thumb-active-color: lighten($background-color, 38%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
 
 // App bar color
 $top-bar-color: #1565C0;
-$search-bar-color: lighten($background-color, 6%);
+$search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #424242;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
index 64f8d5842..906b8e459 100644
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #fafafa;
-$menu-background-color: #ffffff;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: #ffffff;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: #ffffff;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 $top-bar-unread-icon-color: darken($primary-color, 30%);
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #2196f3;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $top-bar-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-background-focus-color: transparentize(#000000, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
index 8c575bce5..94c381ee7 100644
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: dark;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #121212;
-$menu-background-color: #1e1e1e;
-$menu-background-hover-color: lighten($menu-background-color, 6%);
-$menu-background-active-color: lighten($menu-background-color, 10%);
-$menu-background-active-hover-color: lighten($menu-background-color, 16%);
-$card-background-color: #1e1e1e;
-$card-background-hover-color: lighten($card-background-color, 6%);
-$card-background-inactive-color: lighten($card-background-color, 10%);
-$list-background-color: #1e1e1e;
-$list-background-hover-color: lighten($list-background-color, 6%);
-$list-background-active-color: lighten($list-background-color, 10%);
-$list-background-inactive-color: lighten($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: darken($verified-color, 20%);
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #e2e2e3;
 $icon-hover-color: lighten($icon-color, 30%);
-$icon-background-hover-color: transparentize(#ffffff, 0.8);
-$icon-background-active-color: transparentize(#ffffff, 0.7);
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,7 +99,7 @@ $border-color: #2e2e2e;
 $border-active-color: lighten($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: lighten($background-color, 20%);
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
 $scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
@@ -110,26 +111,28 @@ $search-bar-focus-color: #ffffff;
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #1e1e1e;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
index 20336e96d..9317004e9 100644
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -1,6 +1,8 @@
 @charset "UTF-8";
 
 
+$color-scheme: light;
+
 // Base color
 $primary-color: #4285f4;
 $secondary-color: #db4437;
@@ -23,20 +25,19 @@ $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
 
 // Background-color
-$background-color: #ffffff;
-$menu-background-color: $background-color;
-$menu-background-hover-color: darken($menu-background-color, 6%);
-$menu-background-active-color: darken($menu-background-color, 10%);
-$menu-background-active-hover-color: darken($menu-background-color, 16%);
-$card-background-color: $background-color;
-$card-background-hover-color: darken($card-background-color, 6%);
-$card-background-inactive-color: darken($card-background-color, 10%);
-$list-background-color: $background-color;
-$list-background-hover-color: darken($list-background-color, 6%);
-$list-background-active-color: darken($list-background-color, 10%);
-$list-background-inactive-color: darken($list-background-color, 10%);
-$text-field-background-color: $card-background-color;
-$verified-background-color: lighten($verified-color, 20%);
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
@@ -56,8 +57,8 @@ $badge-color: $primary-color;
 // Icon color
 $icon-color: #757575;
 $icon-hover-color: darken($icon-color, 30%);
-$icon-background-hover-color: transparentize(#000000, 0.9);
-$icon-background-active-color: transparentize(#000000, 0.8);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
 $disabled-icon-color: lighten($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
@@ -65,8 +66,8 @@ $top-bar-icon-active-color: $primary-color;
 $top-bar-unread-icon-color: $secondary-color;
 $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-background-color: transparentize(#000000, 0.5);
-$media-icon-background-hover-color: transparentize(#000000, 0.8);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
 $control-border-color: $icon-color;
 
 // Button color
@@ -98,38 +99,40 @@ $border-color: #dadce0;
 $border-active-color: darken($border-color, 30%);
 
 // Scroll bar color
-$scroll-bar-thumb-color: darken($background-color, 20%);
-$scroll-bar-thumb-hover-color: darken($background-color, 30%);
-$scroll-bar-thumb-active-color: darken($background-color, 38%);
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
 
 // App bar color
-$top-bar-color: $background-color;
-$search-bar-color: darken($background-color, 6%);
-$search-bar-focus-color: $background-color;
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
 
 // Tab color
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
-$tab-background-color: $top-bar-color;
-$tab-indicator-background-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-background-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $text-tab-indicator-color: $secondary-text-color;
 $text-tab-indicator-active-color: $ui-text-color;
-$text-tab-background-color: #ffffff;
-$text-tab-indicator-background-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-background-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
 
-// Poll chart color
-$poll-bar-leading-color: $primary-color;
-$poll-bar-color: lighten($poll-bar-leading-color, 30%);
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
 $read-secondary-text-color: transparentize($secondary-text-color, 0.3);
 $read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($poll-bar-leading-color, 0.3);
-$read-poll-bar-color: transparentize($poll-bar-color, 0.3);
\ No newline at end of file
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
index e39986220..3e06e0820 100644
--- a/app/javascript/styles/plus/icon_config.scss
+++ b/app/javascript/styles/plus/icon_config.scss
@@ -6,7 +6,7 @@ $favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
 //$favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #ff4081;  // Heart
 //$favorite-icon-color: #db4437;  // +1
-$favorite-icon-color: #ffffff;  // inverted +1
+$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
 
 // Reply icon settings
@@ -16,11 +16,13 @@ $reply-icon: "comment";  // blooming
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-@font-face {
-    font-family: "Material Icons";
-    src:
-        local("Material Icons"),
-        //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2");  // GitHub
-        //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2");  // Google Fonts
-        url("../fonts/MaterialIcons-Regular.woff2");  // Self-hosting
-}
\ No newline at end of file
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v1.scss b/app/javascript/styles/plus/layout/material-v1.scss
index 825deaf8c..926c3325a 100644
--- a/app/javascript/styles/plus/layout/material-v1.scss
+++ b/app/javascript/styles/plus/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Media radius settings
+$media-radius: 0;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 0;
 
@@ -39,7 +43,9 @@ $avater-radius: 50%;  // Rounded cropping
 //$avater-radius: 2px  // Material v1 square
 
 
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
index 853d82b15..f79f91005 100644
--- a/app/javascript/styles/plus/layout/material-v2.scss
+++ b/app/javascript/styles/plus/layout/material-v2.scss
@@ -4,10 +4,12 @@
 
 // Navigation bar radius
 $nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
 
 
 // Search bar radius
 $search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
 
 
 // Bar radius settings
@@ -31,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
 // Navigation drawer item settings
 $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px;  // full rounded
@@ -43,18 +50,10 @@ $avater-radius: 50%;  // Rounded cropping
 
 
 // Chip settings
-// If you want to use contained-chip, please comment out below.
-.reactions-bar__item {
-    background: $outlined-chip-color !important;
-    border: 1px solid $border-color !important;
-
-    &.active { background-color: $outlined-chip-selected-color !important }
-
-    &:hover { background: $outlined-chip-hover-color !important }
-}
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-// If you want to use material v2 styled non-shadow button, please comment out this section.
-.button,
-.compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
\ No newline at end of file
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
diff --git a/app/javascript/styles/plus/loader.scss b/app/javascript/styles/plus/loader.scss
index e962aa921..80df5cab0 100644
--- a/app/javascript/styles/plus/loader.scss
+++ b/app/javascript/styles/plus/loader.scss
@@ -2,6 +2,6 @@
 @import 'theme/material-icons';
 
 // Plugins
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
+@import 'plugins/cards';
+@import 'plugins/dense';
+@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/cards.scss b/app/javascript/styles/plus/plugins/cards.scss
index c134cbeeb..d9b3906a5 100644
--- a/app/javascript/styles/plus/plugins/cards.scss
+++ b/app/javascript/styles/plus/plugins/cards.scss
@@ -10,13 +10,13 @@
     margin: 2px 0 !important;
     padding: 8px !important;
 
-    > .scrollable { background: $background-color }
+    > .scrollable { background: $bg-color }
 }
 
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     &__prepend { padding: 8px 8px 2px 0 }
 }
@@ -28,7 +28,7 @@
     @include shadow-1dp;
     margin: 8px 2px;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
 }
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
diff --git a/app/javascript/styles/plus/plugins/plus.scss b/app/javascript/styles/plus/plugins/plus.scss
index 5b220631b..86a5f3e1e 100644
--- a/app/javascript/styles/plus/plugins/plus.scss
+++ b/app/javascript/styles/plus/plugins/plus.scss
@@ -14,9 +14,8 @@
 
 // favorite icon
 .star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { background: #db4437 }
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
 
 .notification__favourite-icon-wrapper {
     left: -34px;
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index 5f573e339..fc965880f 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -21,5 +21,166 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
 @mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
 @mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
index 34a8a1816..b6d517e12 100644
--- a/app/javascript/styles/plus/theme/account.scss
+++ b/app/javascript/styles/plus/theme/account.scss
@@ -7,8 +7,8 @@
 .account {
     border-bottom: 1px solid $border-color;
 
-    .account__display-name { color: $primary-text-color }
-    .account__display-name strong { color: $secondary-text-color }
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
         border-radius: $avater-radius;
@@ -29,9 +29,9 @@
 
     &__header {
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: none;
 
             .avatar .account__avatar { border: none }
         }
@@ -89,7 +89,7 @@
 
                     .verified {
                         border: none;
-                        background: $verified-background-color;
+                        background: $verified-bg-color;
 
                         a,
                         &__mark { color: $primary-text-color }
@@ -105,7 +105,7 @@
 
                     dt {
                         color: $primary-text-color;
-                        background: $list-background-inactive-color;
+                        background: $list-bg-inactive-color;
                     }
 
                     dd { color: $primary-text-color }
@@ -113,11 +113,31 @@
             }
         }
 
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
         &__content { color: $secondary-text-color }
     }
 
     &__section-headline {
-        background: $text-tab-background-color;
+        background: $text-tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
@@ -131,10 +151,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-background-focus-color }
+                &:focus { background: $text-tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-background-hover-color }
+            &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
 }
@@ -150,4 +170,8 @@
     color: $ui-text-color;
 
     small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/base_config.scss b/app/javascript/styles/plus/theme/base_config.scss
index 73ff009e1..13fb4ad75 100644
--- a/app/javascript/styles/plus/theme/base_config.scss
+++ b/app/javascript/styles/plus/theme/base_config.scss
@@ -18,10 +18,7 @@
 
 // Search bar hover settings
 // You can enable/disable search bar floating.
-/*.search__input:hover {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-}*/
+$search-bar-hover: false;
 
 
 // Status font size in timeline
@@ -31,4 +28,19 @@ $status-font-size: 15px;  // mastodon default
 
 // Name font size in timeline status
 $name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
\ No newline at end of file
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in /mastodon-material
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/basics.scss b/app/javascript/styles/plus/theme/basics.scss
index 4c122d1c6..32ba6dc8c 100644
--- a/app/javascript/styles/plus/theme/basics.scss
+++ b/app/javascript/styles/plus/theme/basics.scss
@@ -4,7 +4,9 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $background-color }
+body { background: $bg-color }
+
+.focusable:focus { background: transparent }
 
 // Chrome & Safari scroll bar
 ::-webkit-scrollbar-thumb {
@@ -21,6 +23,4 @@ body { background: $background-color }
 }
 
 // Firefox scroll bar
-html {
-    scrollbar-color: $scroll-bar-thumb-color transparent;
-}
\ No newline at end of file
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
index 1231bac98..7c2ad7937 100644
--- a/app/javascript/styles/plus/theme/button.scss
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -4,6 +4,8 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+@include button-shadow;
+
 .icon-button {
     color: $icon-button-color;
     border-radius: 50%;
@@ -21,37 +23,54 @@
 
         &:hover {
             color: $icon-button-hover-color;
-            background-color: $icon-background-hover-color;
+            background-color: $icon-bg-hover-color;
         }
     }
 
     &.overlayed {
         border-radius: 50%;
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
     
         &:hover {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             color: $media-icon-hover-color;
         }
     }
 
     &:hover {
         color: $icon-button-hover-color;
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
-    &:active,
-    &:focus { background-color: transparent }
+    &:focus { transition: none }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
 }
 
 .text-icon-button {
     color: $icon-button-color;
     border-radius: 50%;
-    font-size: 12px;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
 
     &:hover {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
         color: $icon-button-hover-color;
     }
 }
@@ -91,7 +110,7 @@
 }
 
 .spoiler-button__overlay__label {
-    background: $media-icon-background-color;
+    background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index 54effffd3..af7776a0c 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -10,7 +10,10 @@
     margin: 10px 8px;
     border-radius: $card-radius;
 
-    &>.scrollable { background: $list-background-color }
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
 
     &:last-child { box-shadow: none }
 }
@@ -45,22 +48,23 @@
         background: $top-bar-color;
         color: $top-bar-icon-color;
         margin: 8px 10px;
-        padding: 10px 12px;
+        padding: 10px;
         border-radius: 50%;
+        font-size: 20px;
 
         &.active {
             color: $top-bar-icon-active-color;
-            background: $icon-background-active-color;
+            background: $icon-bg-active-color;
 
             &:hover {
                 color: $top-bar-icon-hover-color;
-                background: $icon-background-hover-color;
+                background: $icon-bg-hover-color;
             }
         }
 
         &:hover {
             color: $top-bar-icon-hover-color;
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
         }
     }
 
@@ -93,6 +97,7 @@
     &__wrapper {
         @include shadow-4dp;
         border-radius: $bar-radius;
+        opacity: $bar-transparency;
 
         .announcements { border-top: 1px solid $border-color }
 
@@ -105,11 +110,11 @@
 
     &__collapsible {
         color: $ui-text-color;
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: 1px solid $border-color;
 
         &-inner {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
         }
 
@@ -119,9 +124,9 @@
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        padding: 8px;
-        margin: auto 0;
-        border-radius: 50%;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
 
         span { display: none }
     }
@@ -129,21 +134,21 @@
 
 .column-subheading {
     color: $section-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 12px 16px;
     border-top: 1px solid $border-color;
 }
 
 .column-link {
     color: $ui-text-color;
-    background: $background-color;
+    background: $bg-color;
     padding: 16px;
     border-radius: $nav-drawer-item-radius;
 
-    &:hover { background: $list-background-hover-color }
+    &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-background-active-color }
+    &:focus { background: $list-bg-active-color }
 
     &__icon {
         margin-right: 32px;
@@ -153,9 +158,9 @@
     &--transparent {
         &.active {
             color: $ui-text-color;
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
 
-            &:hover { background: $menu-background-active-hover-color }
+            &:hover { background: $menu-bg-active-hover-color }
     
             .fa { color: $icon-color }
         }
@@ -191,14 +196,19 @@
 
 .column-inline-form {
     padding: 16px 0 16px 16px;
-    background: $card-background-color;
+    background: $card-bg-color;
 
     .icon-button { margin: 0 16px }
 }
 
+.columns-area {
+    background-image: url($bg-image);
+    background-size: contain;
+}
+
 .setting-text {
     color: $primary-text-color;
-    background: $text-field-background-color;
+    background: $text-field-bg-color;
     border-radius: $bar-radius;
 
     &::placeholder { color: $tips-text-color }
@@ -206,17 +216,17 @@
 
 .empty-column-indicator {
     color: $secondary-text-color;
-    background: $card-background-color;
+    background: $card-bg-color;
     font-size: 16px;
 }
 
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
-    background: $list-background-inactive-color;
+    background: $list-bg-inactive-color;
 
     &--unread {
-        background: $list-background-color;
+        background: $list-bg-color;
 
         .conversation__content__relative-time { color: $info-text-color }
     }
@@ -275,15 +285,16 @@
     color: $icon-color;
     padding: 16px;
 
-    &:hover { background: $menu-background-hover-color }
+    &:hover { background: $menu-bg-hover-color }
 }
 
 .getting-started {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
+    opacity: $column-transparency;
 
     &__wrapper {
-        background: $background-color;
+        background: $bg-color;
         height: auto !important;
         border-bottom: 1px solid $border-color;
     }
@@ -303,8 +314,9 @@
     }
 
     &__trends {
-        background: $background-color;
+        background: $bg-color;
         margin-bottom: 0;
+        opacity: $column-transparency;
 
         h4 {
             color: $section-text-color;
@@ -358,7 +370,7 @@
 }
 
 .announcements {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 0;
 
     &__container { color: $primary-text-color }
@@ -386,6 +398,8 @@
 
 .react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
 
+@include outlined-chip;
+
 .reactions-bar {
     .emoji-button {
         color: $icon-button-color;
@@ -424,12 +438,13 @@
 
 .notification {
     &__filter-bar {
-        background: $tab-background-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
         z-index: 1;
+        opacity: $bar-transparency;
     
         button {
-            background: $tab-background-color;
+            background: $tab-bg-color;
             color: $tab-indicator-color;
             font-size: 16px;
 
@@ -442,10 +457,10 @@
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-background-focus-color }
+                &:focus { background: $tab-indicator-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-background-hover-color }
+            &:hover { background: $tab-indicator-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
index ae5bfe158..46483923e 100644
--- a/app/javascript/styles/plus/theme/components.scss
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
 
 .drawer {
     &__header {
@@ -11,11 +12,12 @@
         background: $top-bar-color;
         border-radius: $nav-bar-radius;
         justify-content: space-around;
+        opacity: $bar-transparency;
     
         a { transition: none }
     
         a:hover {
-            background: $icon-background-hover-color;
+            background: $icon-bg-hover-color;
             border-radius: 50%;
         }
     }
@@ -40,14 +42,15 @@
     }
 
     &__inner {
-        background: $card-background-color;
+        background: $card-bg-color;
+        opacity: $column-transparency;
 
         &.darker {
-            background: $card-background-color;
+            background: $card-bg-color;
             position: inherit;
         }
 
-        &__mastodon { background: $card-background-color }
+        &__mastodon { background: $card-bg-color }
     }
 }
 
@@ -57,6 +60,7 @@
         color: $tips-text-color;
         border-radius: $search-bar-radius;
         padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
 
         &:focus {
             @include shadow-2dp;
@@ -64,6 +68,8 @@
             color: $search-bar-text-color;
         }
 
+        &:hover { @include search-bar-hover }
+
         &::placeholder { color: $tips-text-color }
     }
 
@@ -112,7 +118,7 @@
 .search-results {
     &__header {
         color: $secondary-text-color;
-        background-color: $card-background-color;
+        background-color: $card-bg-color;
         padding: 16px;
 
         .fa { margin-right: 8px }
@@ -120,7 +126,7 @@
 
     &__section {
         h5 {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             padding: 16px;
             color: $section-text-color;
@@ -137,6 +143,12 @@
     strong {
         color: $ui-text-color;
     }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+    }
 }
 
 .navigation-panel hr {
@@ -146,7 +158,7 @@
 
 .dropdown-menu {
     @include shadow-8dp;
-    background: $menu-background-color;
+    background: $menu-bg-color;
     padding: 8px 0;
     border-radius: $menu-radius;
 
@@ -155,11 +167,11 @@
     &__item a {
         font-size: 14px;
         padding: 8px 16px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         color: $menu-text-color;
 
         &:hover, &:active {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $menu-text-color;
         }
     }
@@ -173,7 +185,7 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-background-color;
+            background: $text-field-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
     
@@ -182,7 +194,7 @@
 
         &__suggestions {
             @include shadow-1dp;
-            background: $menu-background-color;
+            background: $menu-bg-color;
             color: $ui-text-color;
             border-radius: $card-radius;
             font-size: 16px;
@@ -192,40 +204,76 @@
                 padding: 8px;
                 border-radius: 0;
 
-                &:hover { background: $menu-background-hover-color }
+                &:hover { background: $menu-bg-hover-color }
 
                 &.selected,
                 &:focus,
-                &:active { background: $menu-background-active-color }
+                &:active { background: $menu-bg-active-color }
             }
         }
     }
 
-    .spoiler-input__input {
-        color: $ui-text-color;
-        background: $card-background-color;
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 8px }
 
-        &::placeholder { color: $tips-text-color }
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+    
+            &::placeholder { color: $tips-text-color }
+        }
     }
 
     .compose-form {
         &__warning {
-            @include shadow-1dp;
             color: $secondary-text-color;
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
 
             a { color: $link-text-color }
         }
 
         &__modifiers {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
         }
 
         &__buttons-wrapper {
-            background: $card-background-color;
+            background: $card-bg-color;
             color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
         }
 
         &__poll-wrapper {
@@ -235,7 +283,7 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $background-color;
+                background-color: $bg-color;
                 border: 0;
 
                 &:focus { border-color: $border-active-color }
@@ -251,20 +299,16 @@
                 &:active { background-color: $outlined-button-active-color }
 
                 &:focus { background-color: $outlined-button-color }
-
-
             }
-        }
 
-        &__utilBtns { padding-top: 0 }
+            .poll__footer { border-top: none }
+        }
 
         &__publish .compose-form__publish-button-wrapper { box-shadow: none }
     }
 }
 
-.no-reduce-motion .spoiler-input {
-    transition-duration: .2s, .2s;
-}
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
 .poll {
@@ -283,7 +327,7 @@
 
     &__text input[type=text] {
         color: $ui-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: 1px solid $border-color;
         padding: 8px 12px;
     
@@ -292,7 +336,7 @@
 
     &__option input[type=text] {
         color: $primary-text-color;
-        background: $text-field-background-color;
+        background: $text-field-bg-color;
         border: none;
         border-radius: 2px;
         padding: 8px 16px;
@@ -300,9 +344,9 @@
 
     &__chart {
         border-radius: 0;
-        background: $poll-bar-color;
+        background: $progress-indicator-track-color;
     
-        &.leading { background: $poll-bar-leading-color }
+        &.leading { background: $progress-indicator-color }
     }
 
     &__footer {
@@ -316,7 +360,7 @@
 
 .privacy-dropdown {
     &.active .privacy-dropdown__value.active {
-        background: $icon-background-hover-color;
+        background: $icon-bg-hover-color;
         border-radius: 50%;
         box-shadow: none;
 
@@ -325,7 +369,7 @@
 
     &__dropdown {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $dialog-radius;
     }
 
@@ -345,7 +389,7 @@
         }
 
         &.active {
-            background: $menu-background-active-color;
+            background: $menu-bg-active-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -355,7 +399,7 @@
             }
 
             &:hover {
-                background: $menu-background-active-color;
+                background: $menu-bg-active-color;
                 
                 .privacy-dropdown__option__content {
                     color: $secondary-text-color;
@@ -366,7 +410,7 @@
         }
 
         &:hover {
-            background: $menu-background-hover-color;
+            background: $menu-bg-hover-color;
             color: $icon-hover-color;
 
             .privacy-dropdown__option__content {
@@ -386,7 +430,7 @@
     box-shadow: none;
     border: 1px solid $border-color;
     border-radius: $card-radius;
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -410,14 +454,15 @@
 }
 
 .block-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
     &__container { padding: 24px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
@@ -451,7 +496,7 @@
 }
 
 .filter-form {
-    background: $background-color;
+    background: $bg-color;
     color: $ui-text-color;
 
     &__column { padding: 8px 16px }
@@ -466,18 +511,23 @@
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
         &__bar {
-            background: $card-background-color;
+            background: $card-bg-color;
             padding: 8px 16px;
 
             .display-name {
                 margin-left: 16px;
 
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
                 span { color: $secondary-text-color }
             }
         }
 
         &__extra {
-            background: $card-background-color;
+            background: $card-bg-color;
             border-radius: 0 0 $card-radius $card-radius;
 
             .account__header__content {
@@ -491,7 +541,8 @@
 }
 
 .mute-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
@@ -500,13 +551,14 @@
     &__explanation { margin-top: 16px }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
         justify-content: flex-end;
     }
 
     &__cancel-button {
         box-shadow: none !important;
+        color: $text-button-color;
         background: transparent;
         margin: 0 8px;
 
@@ -531,4 +583,19 @@
             margin: 0 0 0 12px;
         }
     }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/emoji-picker.scss b/app/javascript/styles/plus/theme/emoji-picker.scss
index 70e22752d..1b42121be 100644
--- a/app/javascript/styles/plus/theme/emoji-picker.scss
+++ b/app/javascript/styles/plus/theme/emoji-picker.scss
@@ -7,13 +7,13 @@
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
     }
 
     &__modifiers__menu {
         @include shadow-8dp;
-        background: $menu-background-color;
+        background: $menu-bg-color;
         border-radius: $menu-radius;
 
         button {
@@ -31,33 +31,23 @@
         border: 0 solid $border-color;
 
         &:first-child {
-            background: $menu-background-color;
+            background: $menu-bg-color;
         }
     }
 
-    &-anchors {
-        color: $icon-button-color;
-        padding: 0;
-    }
-
     &-anchor {
+        color: $text-tab-indicator-color;
         padding: 10px 4px;
 
-        &-selected {
-            color: $icon-button-active-color;
-        }
+        &-bar { background-color: $icon-tab-indicator-active-color }
 
-        &-bar {
-            background-color: $tab-indicator-active-color;
-        }
+        &-selected { color: $icon-tab-indicator-hover-color }
 
-        &:hover {
-            color: $icon-button-hover-color;
-        }
+        &:hover { color: $icon-tab-indicator-hover-color }
     }
 
     &-search {
-        background: $menu-background-color;
+        background: $menu-bg-color;
 
         input {
             outline: none;
@@ -76,16 +66,16 @@
 
     &-scroll {
         padding: 0 8px 8px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-category-label span {
         padding: 4px 6px;
-        background: $menu-background-color;
+        background: $menu-bg-color;
     }
 
     &-emoji:hover::before {
-        background-color: $icon-background-hover-color;
+        background-color: $icon-bg-hover-color;
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/plus/theme/icons.scss b/app/javascript/styles/plus/theme/icons.scss
index 1367647ec..987767544 100644
--- a/app/javascript/styles/plus/theme/icons.scss
+++ b/app/javascript/styles/plus/theme/icons.scss
@@ -16,26 +16,8 @@
     &__icon.fa-fw { color: $icon-color }
 }
 
-
-.fa { vertical-align: sub }  // adjust material icon font baseline to other font
-
-.fa.fa-times,
-.fa.fa-eraser,
-.fa.fa-plus { vertical-align: middle }  // adjustment exception
-
-.fa.fa-check { vertical-align: initial }
-
 .fa.fa-lock { text-transform: none }
 
-.fa-fw { width: 16px }
-
-// icon in tab settings
-.fa.fa-chevron-left.column-back-button__icon.fa-fw,
-.text-btn.column-header__setting-btn .fa.fa-eraser {
-    font-size: 20px;
-    margin-right: 16px;
-}
-
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
index 747856253..f27de96e8 100644
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -3,8 +3,17 @@
 @import '../custom_config', '../icon_config';
 @import '../custom_color', '../custom_layout';
 @import 'functions';
+@import 'mixins';
 
 
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
 .fa {
     &.fa-bars,
     &.fa-navicon,
@@ -64,8 +73,19 @@
     &.fa-compress,
     &.fa-user-times,
     &.fa-check,
-    &.fa-quote-right {
-        font-family: "Material Icons";
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
     }
 }
 
@@ -118,9 +138,11 @@
     &.fa-download::before { content: "file_download" }
     &.fa-arrows-alt::before { content: "fullscreen" }
     &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "delete" }
+    &.fa-user-times::before { content: "person_remove" }
     &.fa-check::before { content: "check" }
     &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
 }
 
 // bookmark icon
@@ -148,12 +170,42 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-.no-reduce-motion button.icon-button i.fa-retweet {
+button.icon-button i.fa-retweet,
+button.icon-button i.fa-retweet:hover {
     height: 18px;
     width: 18px;
     transition: none;
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
\ No newline at end of file
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
index 9d0203828..0b8b92acf 100644
--- a/app/javascript/styles/plus/theme/media.scss
+++ b/app/javascript/styles/plus/theme/media.scss
@@ -6,9 +6,9 @@
 
 
 .media-gallery {
-    border-radius: 0;
+    border-radius: $media-radius;
 
-    &__item { border-radius: 0 }
+    &__item { border-radius: $media-radius }
 }
 
 .media-modal__close {
@@ -24,7 +24,7 @@
         border: 12px;
 
         &:hover {
-            background: $media-icon-background-hover-color;
+            background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
@@ -34,7 +34,7 @@
 
 .media-modal {
     &__nav {
-        background: $media-icon-background-color;
+        background: $media-icon-bg-color;
         color: $media-icon-color;
         height: 48px;
         width: 48px;
@@ -50,6 +50,12 @@
 
         &--active { background-color: $media-page-indicator-active-color }
     }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
 }
 
 .video-player {
@@ -75,7 +81,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
@@ -93,7 +99,7 @@
         }
 
         &__handle {
-            transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+            @include material-transition;
             background-color: $primary-color;
             box-shadow: none;
         }
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
index 2748c8723..209678c84 100644
--- a/app/javascript/styles/plus/theme/modal.scss
+++ b/app/javascript/styles/plus/theme/modal.scss
@@ -6,7 +6,8 @@
 
 
 .confirmation-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
     width: 300px;
@@ -18,7 +19,7 @@
 
     &__action-bar {
         justify-content: flex-end;
-        background: $card-background-color;
+        background: $card-bg-color;
         padding: 8px;
     }
 
@@ -42,7 +43,7 @@
 }
 
 .actions-modal {
-    background: $card-background-color;
+    background: $card-bg-color;
     border-radius: $card-radius;
 
     ul li:not(:empty) a {
@@ -50,7 +51,7 @@
         font-size: 16px;
 
         &:hover {
-            background: $card-background-hover-color;
+            background: $card-bg-hover-color;
             color: $ui-text-color;
         }
     }
@@ -58,7 +59,7 @@
     .dropdown-menu__separator { border-bottom-color: $border-color }
 
     .status {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-bottom-color: $border-color;
         padding-top: 12px;
         padding-bottom: 12px;
@@ -71,7 +72,8 @@
 }
 
 .report-modal {
-    background: $card-background-color;
+    @include shadow-24dp;
+    background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/plus/theme/responsive.scss b/app/javascript/styles/plus/theme/responsive.scss
index 9ae304041..d0e1a6635 100644
--- a/app/javascript/styles/plus/theme/responsive.scss
+++ b/app/javascript/styles/plus/theme/responsive.scss
@@ -81,14 +81,14 @@
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-background-hover-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: $tab-bg-color;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-background-focus-color;
-            border-bottom-color: $tab-background-color;
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
index eedf77c2a..d095c2292 100644
--- a/app/javascript/styles/plus/theme/statuses.scss
+++ b/app/javascript/styles/plus/theme/statuses.scss
@@ -86,12 +86,15 @@
         background: transparent;
         border-bottom-color: $border-color;
     }
+
+    &__visibility-icon { color: $icon-color }
 }
 
 .status-card {
     color: $icon-color;
     border-color: $border-color;
     outline: none;
+    margin-top: 16px;
 
     &__image {
         background: transparent;
@@ -110,7 +113,7 @@
 
     &__actions {
         &>div {
-            background: $media-icon-background-color;
+            background: $media-icon-bg-color;
             border-radius: $button-radius;
         }
 
@@ -136,7 +139,19 @@
         &:hover { background-color: transparent !important }
     }
 
-    &:hover { background-color: $card-background-color }
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
 }
 
 // Detailed status in mobile
@@ -152,7 +167,7 @@
 }
 
 .detailed-status {
-    background: $card-background-color;
+    background: $card-bg-color;
     padding: 16px;
 
     &__display-name {
@@ -167,7 +182,7 @@
     }
 
     &__action-bar {
-        background: $card-background-color;
+        background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
         padding: 12px 0;

From 5fababa870bd5cbf0a696072fe1e862d2328fb3c Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Fri, 2 Oct 2020 15:13:18 +0900
Subject: [PATCH 052/200] fix transition and shadow

---
 app/javascript/styles/mastodon-material-dark/theme/button.scss | 3 ++-
 .../styles/mastodon-material-light/theme/button.scss           | 3 ++-
 app/javascript/styles/material-black/theme/button.scss         | 3 ++-
 app/javascript/styles/material-dark/theme/button.scss          | 3 ++-
 app/javascript/styles/material-light/theme/button.scss         | 3 ++-
 app/javascript/styles/plus/theme/button.scss                   | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/material-black/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ b/app/javascript/styles/material-dark/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/material-light/theme/button.scss
+++ b/app/javascript/styles/material-light/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
index 7c2ad7937..9c10a3894 100644
--- a/app/javascript/styles/plus/theme/button.scss
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -39,11 +39,12 @@
     }
 
     &:hover {
+        @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
 
-    &:focus { transition: none }
+    &:focus { background-color: transparent }
 }
 
 // Checkbox with label

From aecdaf5a8c001a6e0e75a20072564de754ab5f8b Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 14 Sep 2020 13:04:29 +0200
Subject: [PATCH 053/200] Do not serve account actors at all in limited
 federation mode (#14800)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Do not serve account actors at all in limited federation mode

When an account is fetched without a signature from an allowed instance,
return an error.

This isn't really an improvement in security, as the only information that was
previously returned was required protocol-level info, and the only personal bit
was the existence of the account. The existence of the account can still be
checked by issuing a webfinger query, as those are accepted without signatures.

However, this change makes it so that unallowed instances won't create account
records on their end when they find a reference to an unknown account.

The previous behavior of rendering a limited list of fields, instead of not
rendering the actor at all, was in order to prevent situations in which two
instances in Authorized Fetch mode or Limited Federation mode would fail to
reach each other because resolving an account would require a signed query…
from an account which can only be fetched with a signed query itself. However,
this should now be fine as fetching accounts is done by signing on behalf of
the special instance actor, which does not require any kind of valid signature
to be fetched.

* Fix tests
---
 app/controllers/accounts_controller.rb       | 11 ++---------
 spec/controllers/accounts_controller_spec.rb | 20 ++------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index db77b628c..f5e82692e 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -7,6 +7,7 @@ class AccountsController < ApplicationController
   include AccountControllerConcern
   include SignatureAuthentication
 
+  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
   before_action :set_body_classes
 
@@ -49,7 +50,7 @@ class AccountsController < ApplicationController
 
       format.json do
         expires_in 3.minutes, public: !(authorized_fetch_mode? && signed_request_account.present?)
-        render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to
+        render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter
       end
     end
   end
@@ -149,12 +150,4 @@ class AccountsController < ApplicationController
   def params_slice(*keys)
     params.slice(*keys).permit(*keys)
   end
-
-  def restrict_fields_to
-    if signed_request_account.present? || public_fetch_mode?
-      # Return all fields
-    else
-      %i(id type preferred_username inbox public_key endpoints)
-    end
-  end
 end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 93bf2c83f..b04f4650b 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -348,24 +348,8 @@ RSpec.describe AccountsController, type: :controller do
         context 'in authorized fetch mode' do
           let(:authorized_fetch_mode) { true }
 
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-
-          it 'returns application/activity+json' do
-            expect(response.content_type).to eq 'application/activity+json'
-          end
-
-          it_behaves_like 'cachable response'
-
-          it 'returns Vary header with Signature' do
-            expect(response.headers['Vary']).to include 'Signature'
-          end
-
-          it 'renders bare minimum account' do
-            json = body_as_json
-            expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey)
-            expect(json).to_not include(:name, :summary)
+          it 'returns http unauthorized' do
+            expect(response).to have_http_status(401)
           end
         end
       end

From 0abfa06b2f4d57363be8690aaf8e8ca3e1bfb221 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 30 Aug 2020 12:33:59 +0200
Subject: [PATCH 054/200] Fix inefficiencies in fan-out-on-write service
 (#14682)

---
 app/services/fan_out_on_write_service.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 276eac0c1..21931c2f1 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -6,8 +6,6 @@ class FanOutOnWriteService < BaseService
   def call(status)
     raise Mastodon::RaceConditionError if status.visibility.nil?
 
-    render_anonymous_payload(status)
-
     if status.direct_visibility?
       deliver_to_own_conversation(status)
     elsif status.limited_visibility?
@@ -20,6 +18,8 @@ class FanOutOnWriteService < BaseService
 
     return if status.account.silenced? || !status.public_visibility? || status.reblog?
 
+    render_anonymous_payload(status)
+
     deliver_to_hashtags(status)
 
     return if status.reply? && status.in_reply_to_account_id != status.account_id
@@ -58,8 +58,10 @@ class FanOutOnWriteService < BaseService
   def deliver_to_mentioned_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to limited followers"
 
-    FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? && mentioned_account.following?(status.account) }) do |follower|
-      [status.id, follower.id, :home]
+    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id).reorder(nil).find_in_batches do |followers|
+      FeedInsertWorker.push_bulk(followers) do |follower|
+        [status.id, follower.id, :home]
+      end
     end
   end
 

From c98b7751ca6f7c638997c26b0807af5b51915593 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Tue, 1 Sep 2020 01:11:27 +0900
Subject: [PATCH 055/200] Fix limited follower id in fan-out-on-write service
 (#14709)

---
 app/services/fan_out_on_write_service.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 21931c2f1..e05d02cef 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -58,9 +58,9 @@ class FanOutOnWriteService < BaseService
   def deliver_to_mentioned_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to limited followers"
 
-    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id).reorder(nil).find_in_batches do |followers|
-      FeedInsertWorker.push_bulk(followers) do |follower|
-        [status.id, follower.id, :home]
+    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+      FeedInsertWorker.push_bulk(mentions) do |mention|
+        [status.id, mention.account_id, :home]
       end
     end
   end

From 4acfc3ce83a0f7492137ef0a3b0c78cce0773e6e Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 1 Aug 2020 18:20:37 +0200
Subject: [PATCH 056/200] Fix handling of Reject Follow when a matching follow
 relationship exists (#14479)

* Add tests

* Fix handling of Reject Follow when a matching follow relationship exists

Regression from #12199
---
 app/lib/activitypub/activity/reject.rb       |   2 +-
 spec/lib/activitypub/activity/reject_spec.rb | 110 ++++++++++++++++---
 2 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 8d771ed81..886dddb23 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -4,7 +4,7 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
   def perform
     return reject_follow_for_relay if relay_follow?
     return follow_request_from_object.reject! unless follow_request_from_object.nil?
-    return UnfollowService.new.call(follow_from_object.target_account, @account) unless follow_from_object.nil?
+    return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
 
     case @object['type']
     when 'Follow'
diff --git a/spec/lib/activitypub/activity/reject_spec.rb b/spec/lib/activitypub/activity/reject_spec.rb
index e7205df8d..fed4cd8cd 100644
--- a/spec/lib/activitypub/activity/reject_spec.rb
+++ b/spec/lib/activitypub/activity/reject_spec.rb
@@ -3,6 +3,14 @@ require 'rails_helper'
 RSpec.describe ActivityPub::Activity::Reject do
   let(:sender)    { Fabricate(:account) }
   let(:recipient) { Fabricate(:account) }
+  let(:object_json) do
+    {
+      id: 'bar',
+      type: 'Follow',
+      actor: ActivityPub::TagManager.instance.uri_for(recipient),
+      object: ActivityPub::TagManager.instance.uri_for(sender),
+    }
+  end
 
   let(:json) do
     {
@@ -10,29 +18,105 @@ RSpec.describe ActivityPub::Activity::Reject do
       id: 'foo',
       type: 'Reject',
       actor: ActivityPub::TagManager.instance.uri_for(sender),
-      object: {
-        id: 'bar',
-        type: 'Follow',
-        actor: ActivityPub::TagManager.instance.uri_for(recipient),
-        object: ActivityPub::TagManager.instance.uri_for(sender),
-      },
+      object: object_json,
     }.with_indifferent_access
   end
 
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    before do
-      Fabricate(:follow_request, account: recipient, target_account: sender)
-      subject.perform
+    context 'rejecting a pending follow request by target' do
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender)
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
 
-    it 'does not create a follow relationship' do
-      expect(recipient.following?(sender)).to be false
+    context 'rejecting a pending follow request by uri' do
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
 
-    it 'removes the follow request' do
-      expect(recipient.requested?(sender)).to be false
+    context 'rejecting a pending follow request by uri only' do
+      let(:object_json) { 'bar' }
+
+      before do
+        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'does not create a follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'removes the follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting an existing follow relationship by target' do
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender)
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting an existing follow relationship by uri' do
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
+    end
+
+    context 'rejecting an existing follow relationship by uri only' do
+      let(:object_json) { 'bar' }
+
+      before do
+        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        subject.perform
+      end
+
+      it 'removes the follow relationship' do
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'does not create a follow request' do
+        expect(recipient.requested?(sender)).to be false
+      end
     end
   end
 

From 8f79ed0487fb17ad59182b49b3fbe46043cbaedd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 13 Sep 2020 12:52:17 +0200
Subject: [PATCH 057/200] Fix reported statuses not being included in warning
 e-mail (#14778)

---
 app/models/admin/account_action.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index b30a82369..9edd152f5 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -142,7 +142,7 @@ class Admin::AccountAction
   end
 
   def status_ids
-    @report.status_ids if @report && include_statuses
+    report.status_ids if report && include_statuses
   end
 
   def reports

From ce6aaed4325d1a5dc15a799856d26b3d22222633 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 8 Oct 2020 00:34:57 +0200
Subject: [PATCH 058/200] Remove dependency on goldfinger gem (#14919)

There are edge cases where requests to certain hosts timeout when
using the vanilla HTTP.rb gem, which the goldfinger gem uses. Now
that we no longer need to support OStatus servers, webfinger logic
is so simple that there is no point encapsulating it in a gem, so
we can just use our own Request class. With that, we benefit from
more robust timeout code and IPv4/IPv6 resolution.

Fix #14091
---
 Gemfile                                       |  1 -
 Gemfile.lock                                  |  6 --
 app/helpers/webfinger_helper.rb               | 33 +------
 app/lib/webfinger.rb                          | 93 +++++++++++++++++++
 app/models/account_alias.rb                   |  2 +-
 app/models/account_migration.rb               |  2 +-
 app/models/form/redirect.rb                   |  2 +-
 app/models/remote_follow.rb                   | 10 +-
 .../fetch_remote_account_service.rb           |  7 +-
 app/services/process_mentions_service.rb      |  2 +-
 app/services/resolve_account_service.rb       |  9 +-
 app/views/well_known/host_meta/show.xml.ruby  |  1 -
 .../remote_follow_controller_spec.rb          | 10 +-
 .../well_known/host_meta_controller_spec.rb   |  2 +-
 spec/lib/feed_manager_spec.rb                 |  1 +
 15 files changed, 114 insertions(+), 67 deletions(-)
 create mode 100644 app/lib/webfinger.rb

diff --git a/Gemfile b/Gemfile
index 414bd2c30..0891371be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,6 @@ gem 'doorkeeper', '~> 5.4'
 gem 'ed25519', '~> 1.2'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
-gem 'goldfinger', '~> 2.1'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.7'
 gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d4fce643..62c20bf07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,11 +250,6 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    goldfinger (2.1.1)
-      addressable (~> 2.5)
-      http (~> 4.0)
-      nokogiri (~> 1.8)
-      oj (~> 3.0)
     hamlit (2.11.0)
       temple (>= 0.8.2)
       thor
@@ -708,7 +703,6 @@ DEPENDENCIES
   fog-core (<= 2.1.0)
   fog-openstack (~> 0.3)
   fuubar (~> 2.5)
-  goldfinger (~> 2.1)
   hamlit-rails (~> 0.2)
   health_check!
   hiredis (~> 0.6)
diff --git a/app/helpers/webfinger_helper.rb b/app/helpers/webfinger_helper.rb
index ab7ca4698..482f4e19e 100644
--- a/app/helpers/webfinger_helper.rb
+++ b/app/helpers/webfinger_helper.rb
@@ -1,38 +1,7 @@
 # frozen_string_literal: true
 
-# Monkey-patch on monkey-patch.
-# Because it conflicts with the request.rb patch.
-class HTTP::Timeout::PerOperationOriginal < HTTP::Timeout::PerOperation
-  def connect(socket_class, host, port, nodelay = false)
-    ::Timeout.timeout(@connect_timeout, HTTP::TimeoutError) do
-      @socket = socket_class.open(host, port)
-      @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
-    end
-  end
-end
-
 module WebfingerHelper
   def webfinger!(uri)
-    hidden_service_uri = /\.(onion|i2p)(:\d+)?$/.match(uri)
-
-    raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if !Rails.configuration.x.access_to_hidden_service && hidden_service_uri
-
-    opts = {
-      ssl: !hidden_service_uri,
-
-      headers: {
-        'User-Agent': Mastodon::Version.user_agent,
-      },
-
-      timeout_class: HTTP::Timeout::PerOperationOriginal,
-
-      timeout_options: {
-        write_timeout: 10,
-        connect_timeout: 5,
-        read_timeout: 10,
-      },
-    }
-
-    Goldfinger::Client.new(uri, opts.merge(Rails.configuration.x.http_client_proxy)).finger
+    Webfinger.new(uri).perform
   end
 end
diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
new file mode 100644
index 000000000..b2374c494
--- /dev/null
+++ b/app/lib/webfinger.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+class Webfinger
+  class Error < StandardError; end
+
+  class Response
+    def initialize(body)
+      @json = Oj.load(body, mode: :strict)
+    end
+
+    def subject
+      @json['subject']
+    end
+
+    def link(rel, attribute)
+      links.dig(rel, attribute)
+    end
+
+    private
+
+    def links
+      @links ||= @json['links'].map { |link| [link['rel'], link] }.to_h
+    end
+  end
+
+  def initialize(uri)
+    _, @domain = uri.split('@')
+
+    raise ArgumentError, 'Webfinger requested for local account' if @domain.nil?
+
+    @uri = uri
+  end
+
+  def perform
+    Response.new(body_from_webfinger)
+  rescue Oj::ParseError
+    raise Webfinger::Error, "Invalid JSON in response for #{@uri}"
+  rescue Addressable::URI::InvalidURIError
+    raise Webfinger::Error, "Invalid URI for #{@uri}"
+  end
+
+  private
+
+  def body_from_webfinger(url = standard_url, use_fallback = true)
+    webfinger_request(url).perform do |res|
+      if res.code == 200
+        res.body_with_limit
+      elsif res.code == 404 && use_fallback
+        body_from_host_meta
+      else
+        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
+      end
+    end
+  end
+
+  def body_from_host_meta
+    host_meta_request.perform do |res|
+      if res.code == 200
+        body_from_webfinger(url_from_template(res.body_with_limit), false)
+      else
+        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
+      end
+    end
+  end
+
+  def url_from_template(str)
+    link = Nokogiri::XML(str).at_xpath('//xmlns:Link[@rel="lrdd"]')
+
+    if link.present?
+      link['template'].gsub('{uri}', @uri)
+    else
+      raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger"
+    end
+  rescue Nokogiri::XML::XPath::SyntaxError
+    raise Webfinger::Error, "Invalid XML encountered in host-meta for #{@uri}"
+  end
+
+  def host_meta_request
+    Request.new(:get, host_meta_url).add_headers('Accept' => 'application/xrd+xml, application/xml, text/xml')
+  end
+
+  def webfinger_request(url)
+    Request.new(:get, url).add_headers('Accept' => 'application/jrd+json, application/json')
+  end
+
+  def standard_url
+    "https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
+  end
+
+  def host_meta_url
+    "https://#{@domain}/.well-known/host-meta"
+  end
+end
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index 792e9e8d4..3d659142a 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -33,7 +33,7 @@ class AccountAlias < ApplicationRecord
   def set_uri
     target_account = ResolveAccountService.new.call(acct)
     self.uri       = ActivityPub::TagManager.instance.uri_for(target_account) unless target_account.nil?
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index 681b5b2cd..4fae98ed7 100644
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@@ -54,7 +54,7 @@ class AccountMigration < ApplicationRecord
 
   def set_target_account
     self.target_account = ResolveAccountService.new.call(acct)
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/form/redirect.rb b/app/models/form/redirect.rb
index a7961f8e8..19ee9faed 100644
--- a/app/models/form/redirect.rb
+++ b/app/models/form/redirect.rb
@@ -32,7 +32,7 @@ class Form::Redirect
 
   def set_target_account
     @target_account = ResolveAccountService.new.call(acct)
-  rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
     # Validation will take care of it
   end
 
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 30b84f7d5..911c06713 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -56,7 +56,7 @@ class RemoteFollow
 
     if domain.nil?
       @addressable_template = Addressable::Template.new("#{authorize_interaction_url}?uri={uri}")
-    elsif redirect_url_link.nil? || redirect_url_link.template.nil?
+    elsif redirect_uri_template.nil?
       missing_resource_error
     else
       @addressable_template = Addressable::Template.new(redirect_uri_template)
@@ -64,16 +64,12 @@ class RemoteFollow
   end
 
   def redirect_uri_template
-    redirect_url_link.template
-  end
-
-  def redirect_url_link
-    acct_resource&.link('http://ostatus.org/schema/1.0/subscribe')
+    acct_resource&.link('http://ostatus.org/schema/1.0/subscribe', 'template')
   end
 
   def acct_resource
     @acct_resource ||= webfinger!("acct:#{acct}")
-  rescue Goldfinger::Error, HTTP::ConnectionError
+  rescue Webfinger::Error, HTTP::ConnectionError
     nil
   end
 
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 83fbf6d07..e5bd0c47c 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -39,17 +39,16 @@ class ActivityPub::FetchRemoteAccountService < BaseService
     webfinger                            = webfinger!("acct:#{@username}@#{@domain}")
     confirmed_username, confirmed_domain = split_acct(webfinger.subject)
 
-    return webfinger.link('self')&.href == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
+    return webfinger.link('self', 'href') == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
 
     webfinger                            = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
     @username, @domain                   = split_acct(webfinger.subject)
-    self_reference                       = webfinger.link('self')
 
     return false unless @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
-    return false if self_reference&.href != @uri
+    return false if webfinger.link('self', 'href') != @uri
 
     true
-  rescue Goldfinger::Error
+  rescue Webfinger::Error
     false
   end
 
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 79af3fc54..8e260811d 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -29,7 +29,7 @@ class ProcessMentionsService < BaseService
       if mention_undeliverable?(mentioned_account)
         begin
           mentioned_account = resolve_account_service.call(Regexp.last_match(1))
-        rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
+        rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
           mentioned_account = nil
         end
       end
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index ba77552c6..3f7bb7cc5 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -26,11 +26,10 @@ class ResolveAccountService < BaseService
 
     @account ||= Account.find_remote(@username, @domain)
 
-    return @account if @account&.local? || !webfinger_update_due?
+    return @account if @account&.local? || @domain.nil? || !webfinger_update_due?
 
     # At this point we are in need of a Webfinger query, which may
     # yield us a different username/domain through a redirect
-
     process_webfinger!(@uri)
 
     # Because the username/domain pair may be different than what
@@ -47,7 +46,7 @@ class ResolveAccountService < BaseService
     # either needs to be created, or updated from fresh data
 
     process_account!
-  rescue Goldfinger::Error, WebfingerRedirectError, Oj::ParseError => e
+  rescue Webfinger::Error, WebfingerRedirectError, Oj::ParseError => e
     Rails.logger.debug "Webfinger query for #{@uri} failed: #{e}"
     nil
   end
@@ -118,11 +117,11 @@ class ResolveAccountService < BaseService
   end
 
   def activitypub_ready?
-    !@webfinger.link('self').nil? && ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self').type)
+    ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self', 'type'))
   end
 
   def actor_url
-    @actor_url ||= @webfinger.link('self').href
+    @actor_url ||= @webfinger.link('self', 'href')
   end
 
   def actor_json
diff --git a/app/views/well_known/host_meta/show.xml.ruby b/app/views/well_known/host_meta/show.xml.ruby
index 0a6bdc322..b4e867c5f 100644
--- a/app/views/well_known/host_meta/show.xml.ruby
+++ b/app/views/well_known/host_meta/show.xml.ruby
@@ -5,7 +5,6 @@ doc << Ox::Element.new('XRD').tap do |xrd|
 
   xrd << Ox::Element.new('Link').tap do |link|
     link['rel']      = 'lrdd'
-    link['type']     = 'application/xrd+xml'
     link['template'] = @webfinger_template
   end
 end
diff --git a/spec/controllers/remote_follow_controller_spec.rb b/spec/controllers/remote_follow_controller_spec.rb
index 3ef8f14d9..7312dde58 100644
--- a/spec/controllers/remote_follow_controller_spec.rb
+++ b/spec/controllers/remote_follow_controller_spec.rb
@@ -43,8 +43,7 @@ describe RemoteFollowController do
         end
 
         it 'renders new when template is nil' do
-          link_with_nil_template = double(template: nil)
-          resource_with_link = double(link: link_with_nil_template)
+          resource_with_link = double(link: nil)
           allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
           post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
 
@@ -55,8 +54,7 @@ describe RemoteFollowController do
 
       context 'when webfinger values are good' do
         before do
-          link_with_template = double(template: 'http://example.com/follow_me?acct={uri}')
-          resource_with_link = double(link: link_with_template)
+          resource_with_link = double(link: 'http://example.com/follow_me?acct={uri}')
           allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
           post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
         end
@@ -78,8 +76,8 @@ describe RemoteFollowController do
         expect(response).to render_template(:new)
       end
 
-      it 'renders new with error when goldfinger fails' do
-        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_raise(Goldfinger::Error)
+      it 'renders new with error when webfinger fails' do
+        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_raise(Webfinger::Error)
         post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
 
         expect(response).to render_template(:new)
diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb
index b43ae19d8..643ba9cd3 100644
--- a/spec/controllers/well_known/host_meta_controller_spec.rb
+++ b/spec/controllers/well_known/host_meta_controller_spec.rb
@@ -12,7 +12,7 @@ describe WellKnown::HostMetaController, type: :controller do
       expect(response.body).to eq <<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Link rel="lrdd" type="application/xrd+xml" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
+  <Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
 </XRD>
 XML
     end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 22eddd2ab..2d1f6cf96 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -108,6 +108,7 @@ RSpec.describe FeedManager do
 
       it 'returns false for status by followee mentioning another account' do
         bob.follow!(alice)
+        jeff.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
         expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
       end

From 3f4cceebd66c0e209239bf5a917bbda8de57d189 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 30 Aug 2020 01:54:30 +0200
Subject: [PATCH 059/200] Fix videos with near-60 fps being rejected (#14684)

Fix #14668
---
 app/models/media_attachment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 3d93ec75b..663bb0896 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -338,7 +338,7 @@ class MediaAttachment < ApplicationRecord
 
     raise Mastodon::StreamValidationError, 'Video has no video stream' if movie.width.nil? || movie.frame_rate.nil?
     raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT
-    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE
+    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.floor}fps videos are not supported" if movie.frame_rate.floor > MAX_VIDEO_FRAME_RATE
   end
 
   def set_meta

From 58c59af573d7cb285317bdb27d745b38cf045378 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Tue, 25 Aug 2020 01:09:46 +0900
Subject: [PATCH 060/200] Fix an error when file_file_size is nil in tootctl
 media remove (#14657)

---
 lib/mastodon/media_cli.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 2a4e3e379..45181f59e 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -31,7 +31,7 @@ module Mastodon
       processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where('created_at < ?', time_ago)) do |media_attachment|
         next if media_attachment.file.blank?
 
-        size = media_attachment.file_file_size + (media_attachment.thumbnail_file_size || 0)
+        size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
 
         unless options[:dry_run]
           media_attachment.file.destroy

From 856cb96a2b4823b62df19f67686921890adfc2f8 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 11:20:17 +0200
Subject: [PATCH 061/200] Fix new audio player features not working on Safari
 (#14465)

Fixes #14462
---
 app/javascript/mastodon/features/audio/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index 1ab1c3117..a4e00ba96 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -269,8 +269,9 @@ class Audio extends React.PureComponent {
   }
 
   _initAudioContext () {
-    const context  = new AudioContext();
-    const source   = context.createMediaElementSource(this.audio);
+    const AudioContext = window.AudioContext || window.webkitAudioContext;
+    const context      = new AudioContext();
+    const source       = context.createMediaElementSource(this.audio);
 
     this.visualizer.setAudioContext(context, source);
     source.connect(context.destination);

From 399c5f09009e05d22e9acd8bb75f3f803b58e365 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 11:21:10 +0200
Subject: [PATCH 062/200] Change content-type to be always computed from file
 data (#14452)

* Change content-type to be always computed from file data

Restore previous behavior, detecting the content-type isn't very
expensive, and some instances may serve files as application/octet-stream
regardless of their true type, making fetching media from them fail, while
it used to work pre-3.2.0.

* Add test
---
 lib/paperclip/response_with_limit_adapter.rb |  2 +-
 spec/lib/activitypub/activity/create_spec.rb | 27 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index 7d897b8d6..8711b1349 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -19,7 +19,7 @@ module Paperclip
       @original_filename = filename_from_content_disposition || filename_from_path || 'data'
       @size = @target.response.content_length
       @tempfile = copy_to_tempfile(@target)
-      @content_type = @target.response.mime_type || ContentTypeDetector.new(@tempfile.path).detect
+      @content_type = ContentTypeDetector.new(@tempfile.path).detect
     end
 
     def copy_to_tempfile(source)
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 2ac4acc12..51e0b8caf 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe ActivityPub::Activity::Create do
 
     stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
     stub_request(:get, 'http://example.com/emoji.png').to_return(body: attachment_fixture('emojo.png'))
+    stub_request(:get, 'http://example.com/emojib.png').to_return(body: attachment_fixture('emojo.png'), headers: { 'Content-Type' => 'application/octet-stream' })
   end
 
   describe '#perform' do
@@ -451,6 +452,32 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'with emojis served with invalid content-type' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum :tinkong:',
+            tag: [
+              {
+                type: 'Emoji',
+                icon: {
+                  url: 'http://example.com/emojib.png',
+                },
+                name: 'tinkong',
+              },
+            ],
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.emojis.map(&:shortcode)).to include('tinkong')
+        end
+      end
+
       context 'with emojis missing name' do
         let(:object_json) do
           {

From 469c4c78a3ce2f7065c7273fd2800f9a39191a21 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 18:47:09 +0200
Subject: [PATCH 063/200] Fix audio player on Safari (#14485)

---
 app/javascript/mastodon/features/audio/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index a4e00ba96..5b8172694 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -115,6 +115,10 @@ class Audio extends React.PureComponent {
   }
 
   togglePlay = () => {
+    if (!this.audioContext) {
+      this._initAudioContext();
+    }
+
     if (this.state.paused) {
       this.setState({ paused: false }, () => this.audio.play());
     } else {
@@ -133,10 +137,6 @@ class Audio extends React.PureComponent {
   handlePlay = () => {
     this.setState({ paused: false });
 
-    if (this.canvas && !this.audioContext) {
-      this._initAudioContext();
-    }
-
     if (this.audioContext && this.audioContext.state === 'suspended') {
       this.audioContext.resume();
     }

From 1995a5cb34337d18ba305c56715194fbaa68786e Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 19:03:10 +0200
Subject: [PATCH 064/200] Fix audio/video player not using CDN_HOST in media
 paths on public pages (#14486)

---
 app/views/statuses/_detailed_status.html.haml | 4 ++--
 app/views/statuses/_simple_status.html.haml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index 85b2ceea4..b3e9c44fc 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -29,11 +29,11 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small), blurhash: video.blurhash, sensitive: status.sensitive?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
+      = react_component :video, src: full_asset_url(video.file.url(:original)), preview: full_asset_url(video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small)), blurhash: video.blurhash, sensitive: status.sensitive?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first
-      = react_component :audio, src: audio.file.url(:original), poster: audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url, backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 670, height: 380, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
+      = react_component :audio, src: full_asset_url(audio.file.url(:original)), poster: full_asset_url(audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url), backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 670, height: 380, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - else
       = react_component :media_gallery, height: 380, sensitive: status.sensitive?, standalone: true, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 67c6c0fd0..363757945 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -35,11 +35,11 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small), blurhash: video.blurhash, sensitive: status.sensitive?, width: 610, height: 343, inline: true, alt: video.description do
+      = react_component :video, src: full_asset_url(video.file.url(:original)), preview: full_asset_url(video.thumbnail.present? ? video.thumbnail.url : video.file.url(:small)), blurhash: video.blurhash, sensitive: status.sensitive?, width: 610, height: 343, inline: true, alt: video.description do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first
-      = react_component :audio, src: audio.file.url(:original), poster: audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url, backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
+      = react_component :audio, src: full_asset_url(audio.file.url(:original)), poster: full_asset_url(audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url), backgroundColor: audio.file.meta.dig('colors', 'background'), foregroundColor: audio.file.meta.dig('colors', 'foreground'), accentColor: audio.file.meta.dig('colors', 'accent'), width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - else
       = react_component :media_gallery, height: 343, sensitive: status.sensitive?, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do

From 3b699f17320de7fc1d1adc40e8edbd8ee58c9d57 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 2 Aug 2020 18:47:44 +0200
Subject: [PATCH 065/200] Fix thumbnail color extraction (#14464)

* Fix contrast calculation for thumbnail color extraction

Luminance calculation was using 0-255 RGB values instead of 0-1 sRGB values,
leading to incorrectly-computed contrast values.

Since we use ColorDiff already, just use its XYZ colorspace conversion code
to get the value.

* Require at least 3:1 contrast for both accent and foreground colors

* Lower required contrast for the accent color
---
 lib/paperclip/color_extractor.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 44fe5ff1d..c8bb771a0 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -5,6 +5,7 @@ require 'mime/types/columnar'
 module Paperclip
   class ColorExtractor < Paperclip::Processor
     MIN_CONTRAST        = 3.0
+    ACCENT_MIN_CONTRAST = 2.0
     FREQUENCY_THRESHOLD = 0.01
 
     def make
@@ -26,8 +27,9 @@ module Paperclip
 
       foreground_palette.each do |color|
         distance = ColorDiff.between(background_color, color)
+        contrast = w3c_contrast(background_color, color)
 
-        if distance > max_distance
+        if distance > max_distance && contrast >= ACCENT_MIN_CONTRAST
           max_distance = distance
           max_distance_color = color
         end
@@ -77,8 +79,8 @@ module Paperclip
     private
 
     def w3c_contrast(color1, color2)
-      luminance1 = (0.2126 * color1.r + 0.7152 * color1.g + 0.0722 * color1.b) + 0.05
-      luminance2 = (0.2126 * color2.r + 0.7152 * color2.g + 0.0722 * color2.b) + 0.05
+      luminance1 = color1.to_xyz.y * 0.01 + 0.05
+      luminance2 = color2.to_xyz.y * 0.01 + 0.05
 
       if luminance1 > luminance2
         luminance1 / luminance2

From 6db143e424b7566519153e6a0c831cd77ceff227 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 8 Aug 2020 17:57:56 +0200
Subject: [PATCH 066/200] Fix crash when failing to load emoji picker (#14525)

Fixes #14523
---
 .../features/compose/components/emoji_picker_dropdown.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 360a7af6a..e8a36a923 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -315,7 +315,7 @@ class EmojiPickerDropdown extends React.PureComponent {
 
         this.setState({ loading: false });
       }).catch(() => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, active: false });
       });
     }
 

From 8b448aecef9495353a1cd18d9e5d95b576cdede2 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 10 Aug 2020 01:51:06 +0200
Subject: [PATCH 067/200] Fix `tootctl media` commands not handling snowflake
 ids for media_attachments (#14536)

---
 lib/mastodon/media_cli.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 45181f59e..54da5b2cd 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -89,7 +89,7 @@ module Mastodon
             path_segments = object.key.split('/')
             path_segments.delete('cache')
 
-            if path_segments.size != 7
+            unless [7, 10].include?(path_segments.size)
               progress.log(pastel.yellow("Unrecognized file found: #{object.key}"))
               next
             end
@@ -133,7 +133,7 @@ module Mastodon
           path_segments = key.split(File::SEPARATOR)
           path_segments.delete('cache')
 
-          if path_segments.size != 7
+          unless [7, 10].include?(path_segments.size)
             progress.log(pastel.yellow("Unrecognized file found: #{key}"))
             next
           end
@@ -258,7 +258,7 @@ module Mastodon
       path_segments = path.split('/')[2..-1]
       path_segments.delete('cache')
 
-      if path_segments.size != 7
+      unless [7, 10].include?(path_segments.size)
         say('Not a media URL', :red)
         exit(1)
       end
@@ -311,7 +311,7 @@ module Mastodon
         segments = object.key.split('/')
         segments.delete('cache')
 
-        next if segments.size != 7
+        next unless [7, 10].include?(segments.size)
 
         model_name = segments.first.classify
         record_id  = segments[2..-2].join.to_i

From aea0161e83ba0d154a3b3824e4d14d31773486b0 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 24 Aug 2020 14:11:47 +0200
Subject: [PATCH 068/200] Add support for inlined objects in activity audience
 (#14514)

* Add support for inlined objects in activity audience

* Add tests
---
 app/lib/activitypub/activity.rb               |  2 +-
 app/lib/activitypub/activity/announce.rb      | 14 +++++++++---
 app/lib/activitypub/activity/create.rb        | 16 +++++++-------
 .../lib/activitypub/activity/announce_spec.rb | 20 +++++++++++++++++
 spec/lib/activitypub/activity/create_spec.rb  | 22 +++++++++++++++++++
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index ab946470b..f0ef4d553 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -172,7 +172,7 @@ class ActivityPub::Activity
   end
 
   def first_mentioned_local_account
-    audience = (as_array(@json['to']) + as_array(@json['cc'])).uniq
+    audience = (as_array(@json['to']) + as_array(@json['cc'])).map { |x| value_or_id(x) }.uniq
     local_usernames = audience.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }
                               .map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
 
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 9e108985a..349e8f77e 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -34,12 +34,20 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
 
   private
 
+  def audience_to
+    as_array(@json['to']).map { |x| value_or_id(x) }
+  end
+
+  def audience_cc
+    as_array(@json['cc']).map { |x| value_or_id(x) }
+  end
+
   def visibility_from_audience
-    if equals_or_includes?(@json['to'], ActivityPub::TagManager::COLLECTIONS[:public])
+    if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :public
-    elsif equals_or_includes?(@json['cc'], ActivityPub::TagManager::COLLECTIONS[:public])
+    elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :unlisted
-    elsif equals_or_includes?(@json['to'], @account.followers_url)
+    elsif audience_to.include?(@account.followers_url)
       :private
     else
       :direct
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 08dd98e94..a60b79d15 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -65,11 +65,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def audience_to
-    @object['to'] || @json['to']
+    as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
   end
 
   def audience_cc
-    @object['cc'] || @json['cc']
+    as_array(@object['cc'] || @json['cc']).map { |x| value_or_id(x) }
   end
 
   def process_status
@@ -122,7 +122,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_audience
-    (as_array(audience_to) + as_array(audience_cc)).uniq.each do |audience|
+    (audience_to + audience_cc).uniq.each do |audience|
       next if audience == ActivityPub::TagManager::COLLECTIONS[:public]
 
       # Unlike with tags, there is no point in resolving accounts we don't already
@@ -352,11 +352,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def visibility_from_audience
-    if equals_or_includes?(audience_to, ActivityPub::TagManager::COLLECTIONS[:public])
+    if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :public
-    elsif equals_or_includes?(audience_cc, ActivityPub::TagManager::COLLECTIONS[:public])
+    elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public])
       :unlisted
-    elsif equals_or_includes?(audience_to, @account.followers_url)
+    elsif audience_to.include?(@account.followers_url)
       :private
     else
       :direct
@@ -365,7 +365,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
   def audience_includes?(account)
     uri = ActivityPub::TagManager.instance.uri_for(account)
-    equals_or_includes?(audience_to, uri) || equals_or_includes?(audience_cc, uri)
+    audience_to.include?(uri) || audience_cc.include?(uri)
   end
 
   def replied_to_status
@@ -477,7 +477,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def addresses_local_accounts?
     return true if @options[:delivered_to_account_id]
 
-    local_usernames = (as_array(audience_to) + as_array(audience_cc)).uniq.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }.map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
+    local_usernames = (audience_to + audience_cc).uniq.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }.map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) }
 
     return false if local_usernames.empty?
 
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index 60fd96a18..b93fcbe66 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -73,6 +73,26 @@ RSpec.describe ActivityPub::Activity::Announce do
           expect(sender.reblogged?(sender.statuses.first)).to be true
         end
       end
+
+      context 'self-boost of a previously unknown status with correct attributedTo, inlined Collection in audience' do
+        let(:object_json) do
+          {
+            id: 'https://example.com/actor#bar',
+            type: 'Note',
+            content: 'Lorem ipsum',
+            attributedTo: 'https://example.com/actor',
+            to: {
+              'type': 'OrderedCollection',
+              'id': 'http://example.com/followers',
+              'first': 'http://example.com/followers?page=true',
+            }
+          }
+        end
+
+        it 'creates a reblog by sender of status' do
+          expect(sender.reblogged?(sender.statuses.first)).to be true
+        end
+      end
     end
 
     context 'when the status belongs to a local user' do
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 51e0b8caf..d2e9fe33c 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -121,6 +121,28 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'private with inlined Collection in audience' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: {
+              'type': 'OrderedCollection',
+              'id': 'http://example.com/followers',
+              'first': 'http://example.com/followers?page=true',
+            }
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'private'
+        end
+      end
+
       context 'limited' do
         let(:recipient) { Fabricate(:account) }
 

From dd3a86eb04d7445e32df44b66ec34332b78b7902 Mon Sep 17 00:00:00 2001
From: Tdxdxoz <tdxdxoz@gmail.com>
Date: Mon, 24 Aug 2020 20:13:44 +0800
Subject: [PATCH 069/200] Fix: also use custom private boost icon for detailed
 status (#14471)

* use custom private boost icon for detail status

* only use className
---
 app/javascript/mastodon/components/status_action_bar.js        | 3 ++-
 .../mastodon/features/status/components/action_bar.js          | 3 ++-
 app/javascript/styles/mastodon/boost.scss                      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 231c517e9..b47855a7e 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -7,6 +7,7 @@ import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me, isStaff } from '../initial_state';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -329,7 +330,7 @@ class StatusActionBar extends ImmutablePureComponent {
     return (
       <div className='status__action-bar'>
         <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
-        <IconButton className='status__action-bar-button' disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
+        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
         {shareButton}
 
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1c5d5ca0c..d0f1c57d0 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -6,6 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import { me, isStaff } from '../../../initial_state';
+import classNames from 'classnames';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -273,7 +274,7 @@ class ActionBar extends React.PureComponent {
     return (
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
+        <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
diff --git a/app/javascript/styles/mastodon/boost.scss b/app/javascript/styles/mastodon/boost.scss
index 3489428f8..0be3533bc 100644
--- a/app/javascript/styles/mastodon/boost.scss
+++ b/app/javascript/styles/mastodon/boost.scss
@@ -6,7 +6,7 @@ button.icon-button i.fa-retweet {
   }
 }
 
-.status-private button.icon-button i.fa-retweet {
+button.icon-button.reblogPrivate i.fa-retweet {
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' height='209' width='22'><path d='M 4.9707031 3.1503906 L 4.9707031 3.1601562 C 4.8707031 3.1901563 4.8 3.2598438 4.75 3.3398438 L 0.80078125 8.2402344 C 0.60078125 8.5402344 0.8292187 9.0190625 1.1992188 9.0390625 L 3.5996094 9.0390625 L 3.5996094 11.720703 C 3.5996094 15.980703 3.0497656 15.339844 7.2597656 15.339844 L 11.869141 15.339844 L 11.869141 14.119141 L 11.869141 13.523438 L 11.869141 12.441406 C 11.869141 12.441406 11.869141 12.439453 11.869141 12.439453 L 7.2695312 12.439453 C 6.8295312 12.439453 6.5507814 12.140703 6.5507812 11.720703 L 6.5507812 9.0195312 L 9.0507812 9.0195312 C 9.4207813 9.0495313 9.6792188 8.54 9.4492188 8.25 L 5.5 3.3496094 C 5.38 3.1796094 5.1607031 3.1003906 4.9707031 3.1503906 z M 17.150391 3.5800781 L 17.130859 3.5898438 C 16.580859 3.5698436 15.810469 3.609375 14.730469 3.609375 L 7.0996094 3.609375 L 9.4199219 6.4609375 L 9.4492188 6.5195312 L 14.699219 6.5195312 C 15.106887 6.5195312 15.397113 6.7872181 15.414062 7.2050781 C 15.738375 7.0991315 16.077769 7.0273437 16.435547 7.0273438 L 16.578125 7.0273438 C 17.24903 7.0273438 17.874081 7.2325787 18.400391 7.578125 L 18.400391 7.2402344 C 18.400391 4.0902344 18.800391 3.6200781 17.150391 3.5800781 z M 16.435547 8.0273438 C 15.143818 8.0273438 14.083984 9.0851838 14.083984 10.376953 L 14.083984 11.607422 L 13.570312 11.607422 C 13.375448 11.607422 13.210603 11.704118 13.119141 11.791016 C 13.027691 11.877916 12.983569 11.958238 12.951172 12.03125 C 12.886382 12.177277 12.867187 12.304789 12.867188 12.441406 L 12.867188 13.523438 L 12.867188 14.119141 L 12.867188 15.677734 L 12.867188 16.509766 L 13.570312 16.509766 L 19.472656 16.509766 L 20.173828 16.509766 L 20.173828 15.677734 L 20.173828 13.523438 L 20.173828 12.441406 C 20.173828 12.304794 20.156597 12.177281 20.091797 12.03125 C 20.059397 11.95824 20.015299 11.877916 19.923828 11.791016 C 19.832368 11.704116 19.667509 11.607422 19.472656 11.607422 L 18.927734 11.607422 L 18.927734 10.376953 C 18.927734 9.0851838 17.867902 8.0273438 16.576172 8.0273438 L 16.435547 8.0273438 z M 16.435547 9.2207031 L 16.576172 9.2207031 C 17.22782 9.2207031 17.734375 9.7251013 17.734375 10.376953 L 17.734375 11.607422 L 15.277344 11.607422 L 15.277344 10.376953 C 15.277344 9.7251013 15.7839 9.2207031 16.435547 9.2207031 z M 12.919922 9.9394531 C 12.559922 9.9594531 12.359141 10.480234 12.619141 10.740234 L 12.751953 10.904297 C 12.862211 10.870135 12.980058 10.842244 13.085938 10.802734 L 13.085938 10.378906 C 13.085938 10.228632 13.111295 10.084741 13.130859 9.9394531 L 12.919922 9.9394531 z M 19.882812 9.9394531 C 19.902378 10.084741 19.927734 10.228632 19.927734 10.378906 L 19.927734 10.791016 C 20.168811 10.875098 20.455966 10.916935 20.613281 11.066406 C 20.691227 11.140457 20.749315 11.223053 20.806641 11.302734 L 21.259766 10.740234 C 21.519766 10.460234 21.260625 9.9094531 20.890625 9.9394531 L 19.882812 9.9394531 z M 16.435547 10.220703 C 16.301234 10.220703 16.277344 10.244432 16.277344 10.378906 L 16.277344 10.607422 L 16.734375 10.607422 L 16.734375 10.378906 C 16.734375 10.244433 16.712442 10.220703 16.578125 10.220703 L 16.435547 10.220703 z ' fill='#{hex-color($action-button-color)}' stroke-width='0'/><path d='M 7.7792969 19.650391 L 7.7792969 19.660156 C 7.5392969 19.680156 7.3398437 19.910156 7.3398438 20.160156 L 7.3398438 22.619141 L 7.2792969 22.619141 C 6.1992969 22.619141 5.4208594 22.589844 4.8808594 22.589844 C 3.2408594 22.589844 3.6308594 23.020234 3.6308594 26.240234 L 3.6308594 30.710938 C 3.6308594 34.970937 3.0692969 34.330078 7.2792969 34.330078 L 8.5 34.330078 L 7.1992188 33.269531 C 7.0992188 33.189531 7.02 33.070703 7 32.970703 C 6.98 32.800703 7.0592186 32.619531 7.1992188 32.519531 L 8.5292969 31.419922 L 7.2792969 31.419922 C 6.8392969 31.419922 6.5605469 31.120703 6.5605469 30.720703 L 6.5605469 26.240234 C 6.5605469 25.800234 6.8392969 25.519531 7.2792969 25.519531 L 7.3398438 25.519531 L 7.3398438 28.019531 C 7.3398438 28.399531 7.8801564 28.650391 8.1601562 28.400391 L 13.060547 24.470703 C 13.310547 24.290703 13.310547 23.869453 13.060547 23.689453 L 8.1601562 19.769531 C 8.0601563 19.669531 7.9192969 19.630391 7.7792969 19.650391 z M 17.119141 22.580078 L 17.119141 22.589844 C 16.579141 22.569844 15.820703 22.609375 14.720703 22.609375 L 13.470703 22.609375 L 14.769531 23.679688 C 14.869531 23.749688 14.950703 23.879766 14.970703 24.009766 C 14.990703 24.169766 14.909531 24.310156 14.769531 24.410156 L 13.439453 25.509766 L 14.720703 25.509766 C 15.129702 25.509766 15.41841 25.778986 15.433594 26.199219 C 15.752266 26.097283 16.084896 26.027344 16.435547 26.027344 L 16.578125 26.027344 C 17.236645 26.027344 17.848901 26.228565 18.369141 26.5625 L 18.369141 26.240234 C 18.369141 23.090234 18.769141 22.620078 17.119141 22.580078 z M 16.435547 27.027344 C 15.143818 27.027344 14.083984 28.085184 14.083984 29.376953 L 14.083984 30.607422 L 13.570312 30.607422 C 13.375452 30.607422 13.210603 30.704118 13.119141 30.791016 C 13.027691 30.877916 12.983569 30.958238 12.951172 31.03125 C 12.886382 31.177277 12.867184 31.304789 12.867188 31.441406 L 12.867188 32.523438 L 12.867188 33.119141 L 12.867188 34.677734 L 12.867188 35.509766 L 13.570312 35.509766 L 19.472656 35.509766 L 20.173828 35.509766 L 20.173828 34.677734 L 20.173828 32.523438 L 20.173828 31.441406 C 20.173828 31.304794 20.156597 31.177281 20.091797 31.03125 C 20.059397 30.95824 20.015299 30.877916 19.923828 30.791016 C 19.832368 30.704116 19.667509 30.607422 19.472656 30.607422 L 18.927734 30.607422 L 18.927734 29.376953 C 18.927734 28.085184 17.867902 27.027344 16.576172 27.027344 L 16.435547 27.027344 z M 16.435547 28.220703 L 16.576172 28.220703 C 17.22782 28.220703 17.734375 28.725101 17.734375 29.376953 L 17.734375 30.607422 L 15.277344 30.607422 L 15.277344 29.376953 C 15.277344 28.725101 15.7839 28.220703 16.435547 28.220703 z M 13.109375 29.150391 L 8.9199219 32.509766 C 8.6599219 32.689766 8.6599219 33.109063 8.9199219 33.289062 L 11.869141 35.648438 L 11.869141 34.677734 L 11.869141 33.119141 L 11.869141 32.523438 L 11.869141 31.441406 C 11.869141 31.217489 11.912641 30.907486 12.037109 30.626953 C 12.093758 30.499284 12.228597 30.257492 12.429688 30.066406 C 12.580253 29.92335 12.859197 29.887344 13.085938 29.802734 L 13.085938 29.378906 C 13.085938 29.300761 13.104 29.227272 13.109375 29.150391 z M 16.435547 29.220703 C 16.301234 29.220703 16.277344 29.244432 16.277344 29.378906 L 16.277344 29.607422 L 16.734375 29.607422 L 16.734375 29.378906 C 16.734375 29.244433 16.712442 29.220703 16.578125 29.220703 L 16.435547 29.220703 z M 12.943359 36.509766 L 13.820312 37.210938 C 14.090314 37.460938 14.639141 37.210078 14.619141 36.830078 L 14.619141 36.509766 L 13.570312 36.509766 L 12.943359 36.509766 z M 10.330078 38.650391 L 10.339844 38.660156 C 10.099844 38.680156 9.9001562 38.910156 9.9101562 39.160156 L 9.9101562 41.630859 L 7.3007812 41.630859 C 6.2207812 41.630859 5.4403906 41.589844 4.9003906 41.589844 C 3.2603906 41.589844 3.6503906 42.020234 3.6503906 45.240234 L 3.6503906 49.710938 C 3.6503906 53.370936 3.4202344 53.409141 5.9902344 53.369141 L 4.6503906 52.269531 C 4.5503906 52.189531 4.4692187 52.070703 4.4492188 51.970703 C 4.4492188 51.800703 4.5203906 51.619531 4.6503906 51.519531 L 6.609375 49.919922 C 6.579375 49.859922 6.5703125 49.790703 6.5703125 49.720703 L 6.5703125 45.240234 C 6.5703125 44.800234 6.8490625 44.519531 7.2890625 44.519531 L 9.9003906 44.519531 L 9.9003906 47.019531 C 9.9003906 47.379531 10.399219 47.620391 10.699219 47.400391 L 15.630859 43.470703 C 15.870859 43.290703 15.870859 42.869453 15.630859 42.689453 L 10.689453 38.769531 C 10.589453 38.689531 10.460078 38.640391 10.330078 38.650391 z M 16.869141 41.585938 C 16.616211 41.581522 16.322969 41.584844 15.980469 41.589844 L 15.970703 41.589844 L 17.310547 42.689453 C 17.410547 42.759453 17.489766 42.889531 17.509766 43.019531 C 17.529766 43.179531 17.479609 43.319922 17.349609 43.419922 L 15.390625 45.019531 C 15.406724 45.075878 15.427133 45.132837 15.4375 45.197266 C 15.754974 45.096169 16.086404 45.027344 16.435547 45.027344 L 16.578125 45.027344 C 17.24129 45.027344 17.858323 45.230088 18.380859 45.568359 L 18.380859 45.25 C 18.380859 42.0475 18.639648 41.616836 16.869141 41.585938 z M 16.435547 46.027344 C 15.143818 46.027344 14.083984 47.085184 14.083984 48.376953 L 14.083984 49.607422 L 13.570312 49.607422 C 13.375448 49.607422 13.210603 49.704118 13.119141 49.791016 C 13.027691 49.877916 12.983569 49.958238 12.951172 50.03125 C 12.886382 50.177277 12.867187 50.304789 12.867188 50.441406 L 12.867188 51.523438 L 12.867188 52.119141 L 12.867188 53.677734 L 12.867188 54.509766 L 13.570312 54.509766 L 19.472656 54.509766 L 20.173828 54.509766 L 20.173828 53.677734 L 20.173828 51.523438 L 20.173828 50.441406 C 20.173828 50.304794 20.156597 50.177281 20.091797 50.03125 C 20.059397 49.95824 20.015299 49.877916 19.923828 49.791016 C 19.832368 49.704116 19.667509 49.607422 19.472656 49.607422 L 18.927734 49.607422 L 18.927734 48.376953 C 18.927734 47.085184 17.867902 46.027344 16.576172 46.027344 L 16.435547 46.027344 z M 16.435547 47.220703 L 16.576172 47.220703 C 17.22782 47.220703 17.734375 47.725101 17.734375 48.376953 L 17.734375 49.607422 L 15.277344 49.607422 L 15.277344 48.376953 C 15.277344 47.725101 15.7839 47.220703 16.435547 47.220703 z M 11.470703 47.490234 C 11.410703 47.510234 11.349063 47.539844 11.289062 47.589844 L 6.3496094 51.519531 C 6.1096094 51.699531 6.1096094 52.120781 6.3496094 52.300781 L 11.289062 56.220703 C 11.569064 56.440703 12.070312 56.199844 12.070312 55.839844 L 12.070312 55.509766 L 11.869141 55.509766 L 11.869141 53.677734 L 11.869141 52.119141 L 11.869141 51.523438 L 11.869141 50.441406 C 11.869141 50.217489 11.912641 49.907486 12.037109 49.626953 C 12.043809 49.611855 12.061451 49.584424 12.070312 49.566406 L 12.070312 47.960938 C 12.070312 47.660938 11.770703 47.430234 11.470703 47.490234 z M 16.435547 48.220703 C 16.301234 48.220703 16.277344 48.244432 16.277344 48.378906 L 16.277344 48.607422 L 16.734375 48.607422 L 16.734375 48.378906 C 16.734375 48.244433 16.712442 48.220703 16.578125 48.220703 L 16.435547 48.220703 z M 13.060547 57.650391 L 13.060547 57.660156 C 12.830547 57.690156 12.660156 57.920156 12.660156 58.160156 L 12.660156 60.630859 L 7.2792969 60.630859 C 6.1992969 60.630859 5.4208594 60.589844 4.8808594 60.589844 C 3.2408594 60.589844 3.6308594 61.020234 3.6308594 64.240234 L 3.6308594 69.109375 L 6.5605469 66.740234 L 6.5605469 64.240234 C 6.5605469 63.800234 6.8392969 63.519531 7.2792969 63.519531 L 12.660156 63.519531 L 12.660156 66.019531 C 12.660156 66.299799 12.960394 66.500006 13.226562 66.474609 C 13.625751 65.076914 14.904956 64.035678 16.421875 64.029297 L 18.380859 62.470703 C 18.620859 62.290703 18.620859 61.869453 18.380859 61.689453 L 13.439453 57.769531 C 13.339453 57.669531 13.200547 57.630391 13.060547 57.650391 z M 18.359375 63.810547 L 17.800781 64.269531 C 18.004793 64.350836 18.198411 64.450249 18.380859 64.568359 L 18.380859 64.25 L 18.380859 63.810547 L 18.359375 63.810547 z M 16.435547 65.027344 C 15.143818 65.027344 14.083984 66.085184 14.083984 67.376953 L 14.083984 68.607422 L 13.570312 68.607422 C 13.375448 68.607422 13.210603 68.704118 13.119141 68.791016 C 13.027691 68.877916 12.983569 68.958238 12.951172 69.03125 C 12.886382 69.177277 12.867187 69.304789 12.867188 69.441406 L 12.867188 70.523438 L 12.867188 71.119141 L 12.867188 72.677734 L 12.867188 73.509766 L 13.570312 73.509766 L 19.472656 73.509766 L 20.173828 73.509766 L 20.173828 72.677734 L 20.173828 70.523438 L 20.173828 69.441406 C 20.173828 69.304794 20.156597 69.177281 20.091797 69.03125 C 20.059397 68.95824 20.015299 68.877916 19.923828 68.791016 C 19.832368 68.704116 19.667509 68.607422 19.472656 68.607422 L 18.927734 68.607422 L 18.927734 67.376953 C 18.927734 66.085184 17.867902 65.027344 16.576172 65.027344 L 16.435547 65.027344 z M 16.435547 66.220703 L 16.576172 66.220703 C 17.22782 66.220703 17.734375 66.725101 17.734375 67.376953 L 17.734375 68.607422 L 15.277344 68.607422 L 15.277344 67.376953 C 15.277344 66.725101 15.7839 66.220703 16.435547 66.220703 z M 8.7207031 66.509766 C 8.6507031 66.529766 8.5895312 66.559375 8.5195312 66.609375 L 3.5996094 70.519531 C 3.3496094 70.699531 3.3496094 71.120781 3.5996094 71.300781 L 8.5292969 75.220703 C 8.8092969 75.440703 9.3105469 75.199844 9.3105469 74.839844 L 9.3105469 72.339844 L 11.869141 72.339844 L 11.869141 71.119141 L 11.869141 70.523438 L 11.869141 69.449219 L 9.3203125 69.449219 L 9.3203125 66.980469 C 9.3203125 66.680469 9.0007031 66.449766 8.7207031 66.509766 z M 16.435547 67.220703 C 16.301234 67.220703 16.277344 67.244432 16.277344 67.378906 L 16.277344 67.607422 L 16.734375 67.607422 L 16.734375 67.378906 C 16.734375 67.244433 16.712442 67.220703 16.578125 67.220703 L 16.435547 67.220703 z M 19.248047 78.800781 C 19.148558 78.831033 19.050295 78.90106 18.970703 78.970703 L 18.070312 79.869141 C 17.630312 79.569141 16.710703 79.619141 14.720703 79.619141 L 7.2792969 79.619141 C 6.1992969 79.619141 5.4208594 79.589844 4.8808594 79.589844 C 3.2408594 79.589844 3.6308594 80.020234 3.6308594 83.240234 L 3.6308594 83.939453 L 6.5605469 84.240234 L 6.5605469 83.240234 C 6.5605469 82.800234 6.8392969 82.519531 7.2792969 82.519531 L 14.720703 82.519531 C 14.920703 82.519531 15.090703 82.600703 15.220703 82.720703 L 13.419922 84.519531 C 13.279464 84.665607 13.281282 84.881022 13.363281 85.054688 C 13.880838 83.867655 15.067337 83.027344 16.435547 83.027344 L 16.578125 83.027344 C 18.290465 83.027344 19.703357 84.345788 19.890625 86.011719 L 19.960938 86.019531 C 20.240938 86.049531 20.520234 85.770234 20.490234 85.490234 L 19.789062 79.240234 C 19.789062 78.973661 19.498025 78.767523 19.25 78.800781 L 19.248047 78.800781 z M 16.435547 84.027344 C 15.143818 84.027344 14.083984 85.085184 14.083984 86.376953 L 14.083984 87.607422 L 13.570312 87.607422 C 13.375448 87.607422 13.210603 87.704118 13.119141 87.791016 C 13.027691 87.877916 12.983569 87.958238 12.951172 88.03125 C 12.886382 88.177277 12.867187 88.304789 12.867188 88.441406 L 12.867188 89.523438 L 12.867188 90.119141 L 12.867188 91.677734 L 12.867188 92.509766 L 13.570312 92.509766 L 19.472656 92.509766 L 20.173828 92.509766 L 20.173828 91.677734 L 20.173828 89.523438 L 20.173828 88.441406 C 20.173828 88.304794 20.156597 88.177281 20.091797 88.03125 C 20.059397 87.95824 20.015299 87.877916 19.923828 87.791016 C 19.832368 87.704116 19.667509 87.607422 19.472656 87.607422 L 18.927734 87.607422 L 18.927734 86.376953 C 18.927734 85.085184 17.867902 84.027344 16.576172 84.027344 L 16.435547 84.027344 z M 2.0507812 84.900391 C 1.8507824 84.970391 1.6907031 85.199453 1.7207031 85.439453 L 2.4199219 91.689453 C 2.4399219 92.049453 3 92.240929 3.25 91.960938 L 4.0507812 91.160156 C 4.0707812 91.160156 4.0898437 91.140156 4.0898438 91.160156 C 4.5498437 91.400156 5.4595313 91.330078 7.2695312 91.330078 L 11.869141 91.330078 L 11.869141 90.119141 L 11.869141 89.523438 L 11.869141 88.441406 C 11.869141 88.437991 11.871073 88.433136 11.871094 88.429688 L 7.2792969 88.429688 C 7.1292969 88.429688 6.9808594 88.400078 6.8808594 88.330078 L 8.8007812 86.400391 C 9.1007822 86.160391 8.8992969 85.600547 8.5292969 85.560547 L 2.25 84.910156 L 2.0507812 84.910156 L 2.0507812 84.900391 z M 16.435547 85.220703 L 16.576172 85.220703 C 17.22782 85.220703 17.734375 85.725101 17.734375 86.376953 L 17.734375 87.607422 L 15.277344 87.607422 L 15.277344 86.376953 C 15.277344 85.725101 15.7839 85.220703 16.435547 85.220703 z M 4.8808594 98.599609 C 3.5508594 98.599609 3.5400781 99.080402 3.5800781 100.90039 L 4.7207031 99.529297 C 4.8007031 99.429297 4.9405469 99.360078 5.0605469 99.330078 C 5.2205469 99.330078 5.4 99.409297 5.5 99.529297 L 7.1601562 101.56055 C 7.2001563 101.56055 7.2292969 101.5293 7.2792969 101.5293 L 14.720703 101.5293 C 15.060703 101.5293 15.289141 101.7293 15.369141 102.0293 L 12.939453 102.0293 C 12.599453 102.0793 12.410625 102.55055 12.640625 102.81055 L 13.470703 103.85742 C 14.029941 102.77899 15.146801 102.02734 16.435547 102.02734 L 16.578125 102.02734 C 18.158418 102.02734 19.491598 103.14879 19.835938 104.63086 L 21.279297 102.82031 C 21.499297 102.55031 21.260156 102.06078 20.910156 102.05078 L 18.400391 102.05078 C 18.420391 98.150792 19.000234 98.650391 14.740234 98.650391 L 7.2792969 98.650391 C 6.1992969 98.650391 5.4208594 98.609375 4.8808594 98.609375 L 4.8808594 98.599609 z M 5.0292969 101.06055 C 4.9292969 101.09055 4.83 101.15977 4.75 101.25977 L 0.81054688 106.16016 C 0.61054688 106.44016 0.8409375 106.92945 1.2109375 106.93945 L 3.5996094 106.93945 C 3.5796094 110.87945 3.1497656 110.33984 7.2597656 110.33984 L 11.869141 110.33984 L 11.869141 109.11914 L 11.869141 108.52344 L 11.869141 107.44141 L 11.869141 107.43945 L 7.2792969 107.43945 C 6.9292969 107.43945 6.7091406 107.23945 6.6191406 106.93945 L 9.0605469 106.93945 C 9.4305469 106.93945 9.6909375 106.44016 9.4609375 106.16016 L 5.5 101.25977 C 5.4 101.10977 5.1992969 101.03055 5.0292969 101.06055 z M 16.435547 103.02734 C 15.143818 103.02734 14.083984 104.08518 14.083984 105.37695 L 14.083984 106.60742 L 13.570312 106.60742 C 13.375448 106.60742 13.210603 106.70409 13.119141 106.79102 C 13.027691 106.87792 12.983569 106.95823 12.951172 107.03125 C 12.886382 107.17727 12.867187 107.30479 12.867188 107.44141 L 12.867188 108.52344 L 12.867188 109.11914 L 12.867188 110.67773 L 12.867188 111.50977 L 13.570312 111.50977 L 19.472656 111.50977 L 20.173828 111.50977 L 20.173828 110.67773 L 20.173828 108.52344 L 20.173828 107.44141 C 20.173828 107.3048 20.156597 107.17728 20.091797 107.03125 C 20.059397 106.95825 20.015299 106.87792 19.923828 106.79102 C 19.832368 106.70412 19.667509 106.60742 19.472656 106.60742 L 18.927734 106.60742 L 18.927734 105.37695 C 18.927734 104.08518 17.867902 103.02734 16.576172 103.02734 L 16.435547 103.02734 z M 16.435547 104.2207 L 16.576172 104.2207 C 17.22782 104.2207 17.734375 104.7251 17.734375 105.37695 L 17.734375 106.60742 L 15.277344 106.60742 L 15.277344 105.37695 C 15.277344 104.7251 15.7839 104.2207 16.435547 104.2207 z M 16.435547 105.2207 C 16.301234 105.2207 16.277344 105.24444 16.277344 105.37891 L 16.277344 105.60742 L 16.734375 105.60742 L 16.734375 105.37891 C 16.734375 105.24441 16.712442 105.2207 16.578125 105.2207 L 16.435547 105.2207 z M 4.8808594 117.58984 L 4.8808594 117.59961 C 3.7208594 117.59961 3.5800781 117.90016 3.5800781 119.16016 L 4.7207031 117.7793 C 4.8007031 117.6793 4.9405469 117.63914 5.0605469 117.61914 C 5.2205469 117.61914 5.4 117.6593 5.5 117.7793 L 7.7207031 120.5293 L 14.720703 120.5293 C 15.123595 120.5293 15.408576 120.79174 15.431641 121.20117 C 15.750992 121.09876 16.08404 121.02734 16.435547 121.02734 L 16.578125 121.02734 C 17.24903 121.02734 17.874081 121.23262 18.400391 121.57812 L 18.400391 121.25 C 18.400391 117.05 19.120234 117.61914 14.740234 117.61914 L 7.2792969 117.61914 C 6.1992969 117.61914 5.4208594 117.58984 4.8808594 117.58984 z M 4.9804688 119.33984 C 4.8804688 119.36984 4.81 119.44 4.75 119.5 L 0.80078125 124.43945 C 0.60078125 124.71945 0.8292182 125.2107 1.1992188 125.2207 L 3.5996094 125.2207 L 3.5996094 125.7207 C 3.5996094 129.9807 3.0497656 129.33984 7.2597656 129.33984 L 11.869141 129.33984 L 11.869141 128.11914 L 11.869141 127.52344 L 11.869141 126.44141 C 11.869141 126.43799 11.871073 126.43314 11.871094 126.42969 L 7.2792969 126.42969 C 6.8392969 126.42969 6.5605469 126.13094 6.5605469 125.71094 L 6.5605469 125.21094 L 9.0605469 125.21094 C 9.4305469 125.23094 9.6909375 124.70969 9.4609375 124.42969 L 5.5 119.5 C 5.3820133 119.35252 5.1682348 119.28513 4.9804688 119.33984 z M 12.839844 121.7793 C 12.539844 121.8793 12.410625 122.32055 12.640625 122.56055 L 13.267578 123.34375 C 13.473522 122.72168 13.852237 122.1828 14.353516 121.7793 L 12.839844 121.7793 z M 18.658203 121.7793 C 19.393958 122.37155 19.878978 123.25738 19.916016 124.25781 L 21.279297 122.56055 C 21.499297 122.28055 21.260156 121.7893 20.910156 121.7793 L 18.658203 121.7793 z M 16.435547 122.02734 C 15.143818 122.02734 14.083984 123.08518 14.083984 124.37695 L 14.083984 125.60742 L 13.570312 125.60742 C 13.375448 125.60742 13.210603 125.70409 13.119141 125.79102 C 13.027691 125.87792 12.983569 125.95823 12.951172 126.03125 C 12.886382 126.17727 12.867187 126.30479 12.867188 126.44141 L 12.867188 127.52344 L 12.867188 128.11914 L 12.867188 129.67773 L 12.867188 130.50977 L 13.570312 130.50977 L 19.472656 130.50977 L 20.173828 130.50977 L 20.173828 129.67773 L 20.173828 127.52344 L 20.173828 126.44141 C 20.173828 126.3048 20.156597 126.17728 20.091797 126.03125 C 20.059397 125.95825 20.015299 125.87792 19.923828 125.79102 C 19.832368 125.70412 19.667509 125.60742 19.472656 125.60742 L 18.927734 125.60742 L 18.927734 124.37695 C 18.927734 123.08518 17.867902 122.02734 16.576172 122.02734 L 16.435547 122.02734 z M 16.435547 123.2207 L 16.576172 123.2207 C 17.22782 123.2207 17.734375 123.7251 17.734375 124.37695 L 17.734375 125.60742 L 15.277344 125.60742 L 15.277344 124.37695 C 15.277344 123.7251 15.7839 123.2207 16.435547 123.2207 z M 16.435547 124.2207 C 16.301234 124.2207 16.277344 124.24444 16.277344 124.37891 L 16.277344 124.60742 L 16.734375 124.60742 L 16.734375 124.37891 C 16.734375 124.24441 16.712442 124.2207 16.578125 124.2207 L 16.435547 124.2207 z M 5.9394531 136.58984 L 5.9394531 136.59961 L 8.3105469 139.5293 L 14.730469 139.5293 C 15.131912 139.5293 15.414551 139.79039 15.439453 140.19727 C 15.756409 140.09653 16.087055 140.02734 16.435547 140.02734 L 16.578125 140.02734 C 17.24903 140.02734 17.874081 140.23261 18.400391 140.57812 L 18.400391 140.25 C 18.400391 136.05 19.120234 136.61914 14.740234 136.61914 L 7.2792969 136.61914 C 6.6792969 136.61914 6.3594531 136.59984 5.9394531 136.58984 z M 4.2207031 136.66016 C 3.8207031 136.74016 3.6791406 136.96016 3.6191406 137.41016 L 4.2207031 136.66992 L 4.2207031 136.66016 z M 5.0605469 137.57031 L 5.0605469 137.58984 C 4.9405469 137.58984 4.8197656 137.66953 4.7597656 137.76953 L 0.81054688 142.66992 C 0.57054688 142.96992 0.8109375 143.50023 1.2109375 143.49023 L 3.5996094 143.49023 L 3.5996094 144.71094 C 3.5996094 148.97094 3.0497656 148.33008 7.2597656 148.33008 L 11.869141 148.33008 L 11.869141 147.11914 L 11.869141 146.52344 L 11.869141 145.44141 C 11.869141 145.43799 11.871073 145.43314 11.871094 145.42969 L 7.2792969 145.42969 C 6.8392969 145.42969 6.5605469 145.13094 6.5605469 144.71094 L 6.5605469 143.49023 L 9.0605469 143.49023 C 9.4605469 143.53023 9.7309375 142.95945 9.4609375 142.68945 L 5.5 137.76953 C 5.4 137.63953 5.2305469 137.57031 5.0605469 137.57031 z M 16.435547 141.02734 C 15.143818 141.02734 14.083984 142.08518 14.083984 143.37695 L 14.083984 144.60742 L 13.570312 144.60742 C 13.375448 144.60742 13.210603 144.70409 13.119141 144.79102 C 13.027691 144.87792 12.983569 144.95823 12.951172 145.03125 C 12.886382 145.17727 12.867187 145.30479 12.867188 145.44141 L 12.867188 146.52344 L 12.867188 147.11914 L 12.867188 148.67773 L 12.867188 149.50977 L 13.570312 149.50977 L 19.472656 149.50977 L 20.173828 149.50977 L 20.173828 148.67773 L 20.173828 146.52344 L 20.173828 145.44141 C 20.173828 145.3048 20.156597 145.17728 20.091797 145.03125 C 20.059397 144.95825 20.015299 144.87792 19.923828 144.79102 C 19.832368 144.70412 19.667509 144.60742 19.472656 144.60742 L 18.927734 144.60742 L 18.927734 143.37695 C 18.927734 142.08518 17.867902 141.02734 16.576172 141.02734 L 16.435547 141.02734 z M 12.849609 141.5 C 12.549609 141.6 12.420391 142.0393 12.650391 142.2793 L 13.136719 142.88672 C 13.213026 142.38119 13.390056 141.90696 13.667969 141.5 L 12.849609 141.5 z M 19.34375 141.5 C 19.710704 142.03735 19.927734 142.68522 19.927734 143.37891 L 19.927734 143.79102 C 19.965561 143.80421 20.005506 143.81448 20.044922 143.82617 L 21.289062 142.2793 C 21.509062 141.9993 21.269922 141.51 20.919922 141.5 L 19.34375 141.5 z M 16.435547 142.2207 L 16.576172 142.2207 C 17.22782 142.2207 17.734375 142.7251 17.734375 143.37695 L 17.734375 144.60742 L 15.277344 144.60742 L 15.277344 143.37695 C 15.277344 142.7251 15.7839 142.2207 16.435547 142.2207 z M 16.435547 143.2207 C 16.301234 143.2207 16.277344 143.24444 16.277344 143.37891 L 16.277344 143.60742 L 16.734375 143.60742 L 16.734375 143.37891 C 16.734375 143.24441 16.712442 143.2207 16.578125 143.2207 L 16.435547 143.2207 z M 17.130859 155.59961 C 16.580859 155.57961 15.810469 155.63086 14.730469 155.63086 L 6.5292969 155.63086 L 8.9101562 158.5293 L 14.730469 158.5293 C 15.131912 158.5293 15.414551 158.79039 15.439453 159.19727 C 15.756409 159.09653 16.087055 159.02734 16.435547 159.02734 L 16.578125 159.02734 C 17.24903 159.02734 17.874081 159.23261 18.400391 159.57812 L 18.400391 159.25977 C 18.400391 156.10977 18.800391 155.63961 17.150391 155.59961 L 17.130859 155.59961 z M 5.0292969 155.86914 L 5.0292969 155.88086 C 4.9292969 155.90086 4.83 155.98055 4.75 156.06055 L 0.81054688 160.96094 C 0.61054688 161.26094 0.8409375 161.73977 1.2109375 161.75977 L 3.5996094 161.75977 L 3.5996094 163.7207 C 3.5996094 167.9807 3.0497656 167.33984 7.2597656 167.33984 L 11.869141 167.33984 L 11.869141 166.11914 L 11.869141 165.52344 L 11.869141 164.44141 L 11.869141 164.43945 L 7.2792969 164.43945 C 6.8392969 164.43945 6.5605469 164.1407 6.5605469 163.7207 L 6.5605469 161.75 L 9.0605469 161.75 C 9.4305469 161.77 9.6909375 161.2507 9.4609375 160.9707 L 5.5 156.07031 C 5.4 155.92031 5.1992969 155.84914 5.0292969 155.86914 z M 16.435547 160.02734 C 15.143818 160.02734 14.083984 161.08518 14.083984 162.37695 L 14.083984 163.60742 L 13.570312 163.60742 C 13.375448 163.60742 13.210603 163.70409 13.119141 163.79102 C 13.027691 163.87792 12.983569 163.95823 12.951172 164.03125 C 12.886382 164.17727 12.867187 164.30479 12.867188 164.44141 L 12.867188 165.52344 L 12.867188 166.11914 L 12.867188 167.67773 L 12.867188 168.50977 L 13.570312 168.50977 L 19.472656 168.50977 L 20.173828 168.50977 L 20.173828 167.67773 L 20.173828 165.52344 L 20.173828 164.44141 C 20.173828 164.3048 20.156597 164.17728 20.091797 164.03125 C 20.059397 163.95825 20.015299 163.87792 19.923828 163.79102 C 19.832368 163.70412 19.667509 163.60742 19.472656 163.60742 L 18.927734 163.60742 L 18.927734 162.37695 C 18.927734 161.08518 17.867902 160.02734 16.576172 160.02734 L 16.435547 160.02734 z M 12.900391 161.2207 C 12.580391 161.2807 12.419141 161.74 12.619141 162 L 13.085938 162.58594 L 13.085938 162.37891 C 13.085938 161.97087 13.170592 161.58376 13.306641 161.2207 L 12.900391 161.2207 z M 16.435547 161.2207 L 16.576172 161.2207 C 17.22782 161.2207 17.734375 161.7251 17.734375 162.37695 L 17.734375 163.60742 L 15.277344 163.60742 L 15.277344 162.37695 C 15.277344 161.7251 15.7839 161.2207 16.435547 161.2207 z M 19.708984 161.23047 C 19.842743 161.59081 19.927734 161.97449 19.927734 162.37891 L 19.927734 162.79102 C 20.119162 162.85779 20.322917 162.91147 20.484375 163 L 21.279297 162.00977 C 21.499297 161.72977 21.260156 161.24047 20.910156 161.23047 L 19.708984 161.23047 z M 16.435547 162.2207 C 16.301234 162.2207 16.277344 162.24444 16.277344 162.37891 L 16.277344 162.60742 L 16.734375 162.60742 L 16.734375 162.37891 C 16.734375 162.24441 16.712442 162.2207 16.578125 162.2207 L 16.435547 162.2207 z M 5.0996094 174.49023 L 5.1308594 174.5 C 4.9808594 174.5 4.83 174.56922 4.75 174.69922 L 0.80078125 179.59961 C 0.56078125 179.86961 0.7992182 180.42039 1.1992188 180.40039 L 3.5996094 180.40039 L 3.5996094 182.7207 C 3.5996094 186.9807 3.0497656 186.33984 7.2597656 186.33984 L 11.869141 186.33984 L 11.869141 185.11914 L 11.869141 184.52344 L 11.869141 183.44141 L 11.869141 183.43945 L 7.25 183.43945 C 6.82 183.43945 6.5507814 183.1407 6.5507812 182.7207 L 6.5507812 180.41992 L 9.0507812 180.41992 C 9.4307824 180.44992 9.7092187 179.87984 9.4492188 179.58984 L 5.4804688 174.68945 C 5.3804688 174.55945 5.2496094 174.49023 5.0996094 174.49023 z M 17.150391 174.58008 L 17.130859 174.59961 C 16.580859 174.57961 15.810469 174.63086 14.730469 174.63086 L 6.8300781 174.63086 L 9.1796875 177.5293 L 14.699219 177.5293 C 15.104107 177.5293 15.391475 177.79407 15.412109 178.20703 C 15.737096 178.1006 16.076913 178.02734 16.435547 178.02734 L 16.578125 178.02734 C 17.24903 178.02734 17.874081 178.2326 18.400391 178.57812 L 18.400391 178.24023 C 18.400391 175.09023 18.800391 174.62008 17.150391 174.58008 z M 16.435547 179.02734 C 15.143818 179.02734 14.083984 180.08518 14.083984 181.37695 L 14.083984 182.60742 L 13.570312 182.60742 C 13.375448 182.60742 13.210603 182.70409 13.119141 182.79102 C 13.027691 182.87792 12.983569 182.95823 12.951172 183.03125 C 12.886382 183.17727 12.867187 183.30479 12.867188 183.44141 L 12.867188 184.52344 L 12.867188 185.11914 L 12.867188 186.67773 L 12.867188 187.50977 L 13.570312 187.50977 L 19.472656 187.50977 L 20.173828 187.50977 L 20.173828 186.67773 L 20.173828 184.52344 L 20.173828 183.44141 C 20.173828 183.3048 20.156597 183.17728 20.091797 183.03125 C 20.059397 182.95825 20.015299 182.87792 19.923828 182.79102 C 19.832368 182.70412 19.667509 182.60742 19.472656 182.60742 L 18.927734 182.60742 L 18.927734 181.37695 C 18.927734 180.08518 17.867902 179.02734 16.576172 179.02734 L 16.435547 179.02734 z M 16.435547 180.2207 L 16.576172 180.2207 C 17.22782 180.2207 17.734375 180.7251 17.734375 181.37695 L 17.734375 182.60742 L 15.277344 182.60742 L 15.277344 181.37695 C 15.277344 180.7251 15.7839 180.2207 16.435547 180.2207 z M 19.816406 180.57031 C 19.882311 180.83091 19.927734 181.09907 19.927734 181.37891 L 19.927734 181.79102 C 20.168811 181.87511 20.455966 181.91694 20.613281 182.06641 C 20.630645 182.0829 20.639883 182.10199 20.65625 182.11914 L 21.259766 181.36914 C 21.479766 181.06914 21.240625 180.59031 20.890625 180.57031 L 19.816406 180.57031 z M 12.820312 180.58984 C 12.520316 180.68984 12.389141 181.11914 12.619141 181.36914 L 12.990234 181.83203 C 13.022029 181.82207 13.055579 181.81406 13.085938 181.80273 L 13.085938 181.37891 C 13.085938 181.10616 13.128698 180.84442 13.191406 180.58984 L 12.820312 180.58984 z M 16.435547 181.2207 C 16.301234 181.2207 16.277344 181.24444 16.277344 181.37891 L 16.277344 181.60742 L 16.734375 181.60742 L 16.734375 181.37891 C 16.734375 181.24441 16.712442 181.2207 16.578125 181.2207 L 16.435547 181.2207 z M 4.9609375 193.15039 L 4.9707031 193.16016 C 4.8707031 193.19016 4.8 193.25984 4.75 193.33984 L 0.81054688 198.24023 C 0.61054688 198.54023 0.8409375 199.01906 1.2109375 199.03906 L 3.5996094 199.03906 L 3.5996094 201.7207 C 3.5996094 205.9807 3.0497656 205.33984 7.2597656 205.33984 L 11.869141 205.33984 L 11.869141 204.11914 L 11.869141 203.52344 L 11.869141 202.44141 C 11.869141 202.44141 11.869141 202.43945 11.869141 202.43945 L 7.2695312 202.43945 C 6.8295312 202.43945 6.5507814 202.1407 6.5507812 201.7207 L 6.5507812 199.01953 L 9.0507812 199.01953 C 9.4207814 199.04953 9.6792188 198.54 9.4492188 198.25 L 5.4902344 193.34961 C 5.3702344 193.17961 5.1509375 193.10039 4.9609375 193.15039 z M 17.150391 193.58008 L 17.130859 193.58984 C 16.580859 193.56984 15.810469 193.61914 14.730469 193.61914 L 7.0996094 193.61914 L 9.4199219 196.46094 L 9.4492188 196.51953 L 14.699219 196.51953 C 15.106887 196.51953 15.397075 196.78718 15.414062 197.20508 C 15.738375 197.09913 16.077769 197.02734 16.435547 197.02734 L 16.578125 197.02734 C 17.24903 197.02734 17.874081 197.23259 18.400391 197.57812 L 18.400391 197.24023 C 18.400391 194.09023 18.800391 193.62008 17.150391 193.58008 z M 16.435547 198.02734 C 15.143818 198.02734 14.083984 199.08518 14.083984 200.37695 L 14.083984 201.60742 L 13.570312 201.60742 C 13.375448 201.60742 13.210603 201.70409 13.119141 201.79102 C 13.027691 201.87792 12.983569 201.95823 12.951172 202.03125 C 12.886382 202.17727 12.867187 202.30479 12.867188 202.44141 L 12.867188 203.52344 L 12.867188 204.11914 L 12.867188 205.67773 L 12.867188 206.50977 L 13.570312 206.50977 L 19.472656 206.50977 L 20.173828 206.50977 L 20.173828 205.67773 L 20.173828 203.52344 L 20.173828 202.44141 C 20.173828 202.3048 20.156597 202.17728 20.091797 202.03125 C 20.059397 201.95825 20.015299 201.87792 19.923828 201.79102 C 19.832368 201.70412 19.667509 201.60742 19.472656 201.60742 L 18.927734 201.60742 L 18.927734 200.37695 C 18.927734 199.08518 17.867902 198.02734 16.576172 198.02734 L 16.435547 198.02734 z M 16.435547 199.2207 L 16.576172 199.2207 C 17.22782 199.2207 17.734375 199.7251 17.734375 200.37695 L 17.734375 201.60742 L 15.277344 201.60742 L 15.277344 200.37695 C 15.277344 199.7251 15.7839 199.2207 16.435547 199.2207 z M 12.919922 199.93945 C 12.559922 199.95945 12.359141 200.48023 12.619141 200.74023 L 12.751953 200.9043 C 12.862211 200.87013 12.980058 200.84224 13.085938 200.80273 L 13.085938 200.37891 C 13.085938 200.22863 13.111295 200.08474 13.130859 199.93945 L 12.919922 199.93945 z M 19.882812 199.93945 C 19.902378 200.08474 19.927734 200.22863 19.927734 200.37891 L 19.927734 200.79102 C 20.168811 200.87511 20.455966 200.91694 20.613281 201.06641 C 20.691227 201.14046 20.749315 201.22305 20.806641 201.30273 L 21.259766 200.74023 C 21.519766 200.46023 21.260625 199.90945 20.890625 199.93945 L 19.882812 199.93945 z M 16.435547 200.2207 C 16.301234 200.2207 16.277344 200.24444 16.277344 200.37891 L 16.277344 200.60742 L 16.734375 200.60742 L 16.734375 200.37891 C 16.734375 200.24441 16.712442 200.2207 16.578125 200.2207 L 16.435547 200.2207 z ' fill='#{hex-color($highlight-text-color)}' stroke-width='0' /></svg>");
 
   &:hover {

From aa98655cf61e732fb3cfe7626347b79189f61b77 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 24 Aug 2020 16:56:21 +0200
Subject: [PATCH 070/200] Fix dereferencing remote statuses not using the
 correct account (#14656)

Follow-up to #14359

In the case of limited toots, the receiver may not be explicitly part of the
audience. If a specific user's inbox URI was specified, it makes sense to
dereference the toot from the corresponding user, instead of trying to find
someone in the explicit audience.
---
 app/lib/activitypub/activity.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index f0ef4d553..a379a7ef4 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -168,6 +168,8 @@ class ActivityPub::Activity
   end
 
   def signed_fetch_account
+    return Account.find(@options[:delivered_to_account_id]) if @options[:delivered_to_account_id].present?
+
     first_mentioned_local_account || first_local_follower
   end
 

From 4ea7193f0a65a28886b954e99733cc42e6b9f572 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 24 Aug 2020 18:21:07 +0200
Subject: [PATCH 071/200] Add support for latest HTTP Signatures spec draft
 (#14556)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for latest HTTP Signatures spec draft

https://www.ietf.org/id/draft-ietf-httpbis-message-signatures-00.html

- add support for the “hs2019” signature algorithm (assumed to be equivalent
  to RSA-SHA256, since we do not have a mechanism to specify the algorithm
  within the key metadata yet)
- add support for (created) and (expires) pseudo-headers and related
  signature parameters, when using the hs2019 signature algorithm
- adjust default “headers” parameter while being backwards-compatible with
  previous implementation
- change the acceptable time window logic from 12 hours surrounding the “date”
  header to accepting signatures created up to 1 hour in the future and
  expiring up to 1 hour in the past (but only allowing expiration dates up to
  12 hours after the creation date)
  This doesn't conform with the current draft, as it doesn't permit accounting
  for clock skew.
  This, however, should be addressed in a next version of the draft:
  https://github.com/httpwg/http-extensions/pull/1235

* Add additional signature requirements

* Rewrite signature params parsing using Parslet

* Make apparent which signature algorithm Mastodon on verification failure

Mastodon uses RSASSA-PKCS1-v1_5, which is not recommended for new applications,
and new implementers may thus unknowingly use RSASSA-PSS.

* Add workaround for PeerTube's invalid signature header

The previous parser allowed incorrect Signature headers, such as
those produced by old versions of the `http-signature` node.js package,
and seemingly used by PeerTube.

This commit adds a workaround for that.

* Fix `signature_key_id` raising an exception

Previously, parsing failures would result in `signature_key_id` being nil,
but the parser changes made that result in an exception.

This commit changes the `signature_key_id` method to return `nil` in case
of parsing failures.

* Move extra HTTP signature helper methods to private methods

* Relax (request-target) requirement to (request-target) || digest

This lets requests from Plume work without lowering security significantly.
---
 .../concerns/signature_verification.rb        | 163 ++++++++++++------
 1 file changed, 108 insertions(+), 55 deletions(-)

diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 10efbf2e0..18f549de9 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -7,6 +7,44 @@ module SignatureVerification
 
   include DomainControlHelper
 
+  EXPIRATION_WINDOW_LIMIT = 12.hours
+  CLOCK_SKEW_MARGIN       = 1.hour
+
+  class SignatureVerificationError < StandardError; end
+
+  class SignatureParamsParser < Parslet::Parser
+    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
+    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
+    # qdtext and quoted_pair are not exactly according to spec but meh
+    rule(:qdtext)        { match('[^\\\\"]') }
+    rule(:quoted_pair)   { str('\\') >> any }
+    rule(:bws)           { match('\s').repeat }
+    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
+    rule(:comma)         { bws >> str(',') >> bws }
+    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
+    rule(:buggy_prefix)  { str('Signature ') }
+    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
+    root(:params)
+  end
+
+  class SignatureParamsTransformer < Parslet::Transform
+    rule(params: subtree(:p)) do
+      (p.is_a?(Array) ? p : [p]).each_with_object({}) { |(key, val), h| h[key] = val }
+    end
+
+    rule(param: { key: simple(:key), value: simple(:val) }) do
+      [key, val]
+    end
+
+    rule(quoted_string: simple(:string)) do
+      string.to_s
+    end
+
+    rule(token: simple(:string)) do
+      string.to_s
+    end
+  end
+
   def require_signature!
     render plain: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
   end
@@ -24,72 +62,40 @@ module SignatureVerification
   end
 
   def signature_key_id
-    raw_signature    = request.headers['Signature']
-    signature_params = {}
-
-    raw_signature.split(',').each do |part|
-      parsed_parts = part.match(/([a-z]+)="([^"]+)"/i)
-      next if parsed_parts.nil? || parsed_parts.size != 3
-      signature_params[parsed_parts[1]] = parsed_parts[2]
-    end
-
     signature_params['keyId']
+  rescue SignatureVerificationError
+    nil
   end
 
   def signed_request_account
     return @signed_request_account if defined?(@signed_request_account)
 
-    unless signed_request?
-      @signature_verification_failure_reason = 'Request not signed'
-      @signed_request_account = nil
-      return
-    end
+    raise SignatureVerificationError, 'Request not signed' unless signed_request?
+    raise SignatureVerificationError, 'Incompatible request signature. keyId and signature are required' if missing_required_signature_parameters?
+    raise SignatureVerificationError, 'Unsupported signature algorithm (only rsa-sha256 and hs2019 are supported)' unless %w(rsa-sha256 hs2019).include?(signature_algorithm)
+    raise SignatureVerificationError, 'Signed request date outside acceptable time window' unless matches_time_window?
 
-    if request.headers['Date'].present? && !matches_time_window?
-      @signature_verification_failure_reason = 'Signed request date outside acceptable time window'
-      @signed_request_account = nil
-      return
-    end
-
-    raw_signature    = request.headers['Signature']
-    signature_params = {}
-
-    raw_signature.split(',').each do |part|
-      parsed_parts = part.match(/([a-z]+)="([^"]+)"/i)
-      next if parsed_parts.nil? || parsed_parts.size != 3
-      signature_params[parsed_parts[1]] = parsed_parts[2]
-    end
-
-    if incompatible_signature?(signature_params)
-      @signature_verification_failure_reason = 'Incompatible request signature'
-      @signed_request_account = nil
-      return
-    end
+    verify_signature_strength!
 
     account = account_from_key_id(signature_params['keyId'])
 
-    if account.nil?
-      @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
-      @signed_request_account = nil
-      return
-    end
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
 
     signature             = Base64.decode64(signature_params['signature'])
-    compare_signed_string = build_signed_string(signature_params['headers'])
+    compare_signed_string = build_signed_string
 
     return account unless verify_signature(account, signature, compare_signed_string).nil?
 
     account = stoplight_wrap_request { account.possibly_stale? ? account.refresh! : account_refresh_key(account) }
 
-    if account.nil?
-      @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
-      @signed_request_account = nil
-      return
-    end
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
 
     return account unless verify_signature(account, signature, compare_signed_string).nil?
 
-    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri}"
+    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)"
+    @signed_request_account = nil
+  rescue SignatureVerificationError => e
+    @signature_verification_failure_reason = e.message
     @signed_request_account = nil
   end
 
@@ -99,6 +105,31 @@ module SignatureVerification
 
   private
 
+  def signature_params
+    @signature_params ||= begin
+      raw_signature = request.headers['Signature']
+      tree          = SignatureParamsParser.new.parse(raw_signature)
+      SignatureParamsTransformer.new.apply(tree)
+    end
+  rescue Parslet::ParseFailed
+    raise SignatureVerificationError, 'Error parsing signature parameters'
+  end
+
+  def signature_algorithm
+    signature_params.fetch('algorithm', 'hs2019')
+  end
+
+  def signed_headers
+    signature_params.fetch('headers', signature_algorithm == 'hs2019' ? '(created)' : 'date').downcase.split(' ')
+  end
+
+  def verify_signature_strength!
+    raise SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(Request::REQUEST_TARGET) || signed_headers.include?('digest')
+    raise SignatureVerificationError, 'Mastodon requires the Host header to be signed' unless signed_headers.include?('host')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest')
+  end
+
   def verify_signature(account, signature, compare_signed_string)
     if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
       @signed_request_account = account
@@ -108,12 +139,20 @@ module SignatureVerification
     nil
   end
 
-  def build_signed_string(signed_headers)
-    signed_headers = 'date' if signed_headers.blank?
-
-    signed_headers.downcase.split(' ').map do |signed_header|
+  def build_signed_string
+    signed_headers.map do |signed_header|
       if signed_header == Request::REQUEST_TARGET
         "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+      elsif signed_header == '(created)'
+        raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'
+        raise SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank?
+
+        "(created): #{signature_params['created']}"
+      elsif signed_header == '(expires)'
+        raise SignatureVerificationError, 'Invalid pseudo-header (expires) for rsa-sha256' unless signature_algorithm == 'hs2019'
+        raise SignatureVerificationError, 'Pseudo-header (expires) used but corresponding argument missing' if signature_params['expires'].blank?
+
+        "(expires): #{signature_params['expires']}"
       elsif signed_header == 'digest'
         "digest: #{body_digest}"
       else
@@ -123,13 +162,28 @@ module SignatureVerification
   end
 
   def matches_time_window?
+    created_time = nil
+    expires_time = nil
+
     begin
-      time_sent = Time.httpdate(request.headers['Date'])
+      if signature_algorithm == 'hs2019' && signature_params['created'].present?
+        created_time = Time.at(signature_params['created'].to_i).utc
+      elsif request.headers['Date'].present?
+        created_time = Time.httpdate(request.headers['Date']).utc
+      end
+
+      expires_time = Time.at(signature_params['expires'].to_i).utc if signature_params['expires'].present?
     rescue ArgumentError
       return false
     end
 
-    (Time.now.utc - time_sent).abs <= 12.hours
+    expires_time ||= created_time + 5.minutes unless created_time.nil?
+    expires_time = [expires_time, created_time + EXPIRATION_WINDOW_LIMIT].min unless created_time.nil?
+
+    return false if created_time.present? && created_time > Time.now.utc + CLOCK_SKEW_MARGIN
+    return false if expires_time.present? && Time.now.utc > expires_time + CLOCK_SKEW_MARGIN
+
+    true
   end
 
   def body_digest
@@ -140,9 +194,8 @@ module SignatureVerification
     name.split(/-/).map(&:capitalize).join('-')
   end
 
-  def incompatible_signature?(signature_params)
-    signature_params['keyId'].blank? ||
-      signature_params['signature'].blank?
+  def missing_required_signature_parameters?
+    signature_params['keyId'].blank? || signature_params['signature'].blank?
   end
 
   def account_from_key_id(key_id)

From a583e540232fe7f3c0902dec0ba97252eb4357cc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 19 Oct 2020 15:58:53 +0200
Subject: [PATCH 072/200] Bump version to 3.2.1

---
 CHANGELOG.md            | 29 +++++++++++++++++++++++++++++
 lib/mastodon/version.rb |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18790e860..6f94ebea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,35 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [3.2.1] - 2020-10-19
+### Added
+
+- Add support for latest HTTP Signatures spec draft ([ThibG](https://github.com/tootsuite/mastodon/pull/14556))
+- Add support for inlined objects in ActivityPub `to`/`cc` ([ThibG](https://github.com/tootsuite/mastodon/pull/14514))
+
+### Changed
+
+- Change actors to not be served at all without authentication in limited federation mode ([ThibG](https://github.com/tootsuite/mastodon/pull/14800))
+  - Previously, a bare version of an actor was served when not authenticated, i.e. username and public key
+  - Because all actor fetch requests are signed using a separate system actor, that is no longer required
+
+### Fixed
+
+- Fix `tootctl media` commands not recognizing very large IDs ([ThibG](https://github.com/tootsuite/mastodon/pull/14536))
+- Fix crash when failing to load emoji picker in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14525))
+- Fix contrast requirements in thumbnail color extraction ([ThibG](https://github.com/tootsuite/mastodon/pull/14464))
+- Fix audio/video player not using `CDN_HOST` on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/14486))
+- Fix private boost icon not being used on public pages ([OmmyZhang](https://github.com/tootsuite/mastodon/pull/14471))
+- Fix audio player on Safari in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/14485), [ThibG](https://github.com/tootsuite/mastodon/pull/14465))
+- Fix dereferencing remote statuses not using the correct account for signature when receiving a targeted inbox delivery ([ThibG](https://github.com/tootsuite/mastodon/pull/14656))
+- Fix nil error in `tootctl media remove` ([noellabo](https://github.com/tootsuite/mastodon/pull/14657))
+- Fix videos with near-60 fps being rejected ([Gargron](https://github.com/tootsuite/mastodon/pull/14684))
+- Fix reported statuses not being included in warning e-mail ([Gargron](https://github.com/tootsuite/mastodon/pull/14778))
+- Fix `Reject` activities of `Follow` objects not correctly destroying a follow relationship ([ThibG](https://github.com/tootsuite/mastodon/pull/14479))
+- Fix inefficiencies in fan-out-on-write service ([Gargron](https://github.com/tootsuite/mastodon/pull/14682), [noellabo](https://github.com/tootsuite/mastodon/pull/14709))
+- Fix timeout errors when trying to webfinger some IPv6 configurations ([Gargron](https://github.com/tootsuite/mastodon/pull/14919))
+- Fix files served as `application/octet-stream` being rejected without attempting mime type detection ([ThibG](https://github.com/tootsuite/mastodon/pull/14452))
+
 ## [3.2.0] - 2020-07-27
 ### Added
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 7aa6cb2c7..344ea996e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def flags

From f8e3fabb93b42125b158f490163168a8be273a33 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Fri, 6 Nov 2020 23:12:47 +0900
Subject: [PATCH 073/200] change font relative path

---
 .../styles/mastodon-material-dark/theme/_mixins.scss   | 10 +++++-----
 .../styles/mastodon-material-light/theme/_mixins.scss  | 10 +++++-----
 .../styles/material-black/theme/_mixins.scss           | 10 +++++-----
 app/javascript/styles/material-dark/theme/_mixins.scss | 10 +++++-----
 .../styles/material-light/theme/_mixins.scss           | 10 +++++-----
 app/javascript/styles/plus/theme/_mixins.scss          | 10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index fc965880f..d506b8148 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -151,35 +151,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }

From 721e689b89983f69ee1d31dd4950e5af1dc55a3c Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 6 Dec 2020 01:31:52 +0900
Subject: [PATCH 074/200] =?UTF-8?q?background-image=E3=81=AE=E5=8F=82?=
 =?UTF-8?q?=E7=85=A7=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=81?=
 =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=9B=9E=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mastodon-material-dark/theme/_mixins.scss   | 17 ++++++++++++-----
 .../theme/base_config.scss                      |  4 ++--
 .../mastodon-material-dark/theme/columns.scss   |  2 +-
 .../mastodon-material-light/theme/_mixins.scss  | 17 ++++++++++++-----
 .../theme/base_config.scss                      |  4 ++--
 .../mastodon-material-light/theme/columns.scss  |  2 +-
 .../styles/material-black/theme/_mixins.scss    | 17 ++++++++++++-----
 .../material-black/theme/base_config.scss       |  4 ++--
 .../styles/material-black/theme/columns.scss    |  2 +-
 .../styles/material-dark/theme/_mixins.scss     | 17 ++++++++++++-----
 .../styles/material-dark/theme/base_config.scss |  4 ++--
 .../styles/material-dark/theme/columns.scss     |  2 +-
 .../styles/material-light/theme/_mixins.scss    | 17 ++++++++++++-----
 .../material-light/theme/base_config.scss       |  4 ++--
 .../styles/material-light/theme/columns.scss    |  2 +-
 app/javascript/styles/plus/theme/_mixins.scss   | 17 ++++++++++++-----
 .../styles/plus/theme/base_config.scss          |  4 ++--
 app/javascript/styles/plus/theme/columns.scss   |  2 +-
 18 files changed, 90 insertions(+), 48 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-light/theme/base_config.scss b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/mastodon-material-light/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-black/theme/base_config.scss b/app/javascript/styles/material-black/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/material-black/theme/base_config.scss
+++ b/app/javascript/styles/material-black/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-dark/theme/base_config.scss b/app/javascript/styles/material-dark/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/material-dark/theme/base_config.scss
+++ b/app/javascript/styles/material-dark/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-light/theme/base_config.scss b/app/javascript/styles/material-light/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/material-light/theme/base_config.scss
+++ b/app/javascript/styles/material-light/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index d506b8148..bdfef2e2f 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -61,6 +61,13 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
 @mixin icon-font-style {
     @if $icon-font-style == filled { font-family: "Material Icons" }
     @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
@@ -151,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/plus/theme/base_config.scss b/app/javascript/styles/plus/theme/base_config.scss
index 13fb4ad75..f36a139ba 100644
--- a/app/javascript/styles/plus/theme/base_config.scss
+++ b/app/javascript/styles/plus/theme/base_config.scss
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../config.scss".
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
 
 
 // Color scheme
@@ -32,7 +32,7 @@ $name-font-size: 15px;  // mastodon default
 
 
 // Background image
-// If you want to use the local image, please put it in /mastodon-material
+// If you want to use the local image, please put it in "../"
 $bg-image: none;
 //$bg-image: "./image.png";
 //$bg-image: "https://example.com/img/image.png";
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index af7776a0c..3f57ea958 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -202,7 +202,7 @@
 }
 
 .columns-area {
-    background-image: url($bg-image);
+    @include bg-image;
     background-size: contain;
 }
 

From 4638de3865cda852b752081b3244419a09269c74 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 6 Dec 2020 12:49:48 +0900
Subject: [PATCH 075/200] =?UTF-8?q?=E7=9B=B8=E5=AF=BE=E3=83=91=E3=82=B9?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../styles/mastodon-material-dark/theme/_mixins.scss   | 10 +++++-----
 .../styles/mastodon-material-light/theme/_mixins.scss  | 10 +++++-----
 .../styles/material-black/theme/_mixins.scss           | 10 +++++-----
 app/javascript/styles/material-dark/theme/_mixins.scss | 10 +++++-----
 .../styles/material-light/theme/_mixins.scss           | 10 +++++-----
 app/javascript/styles/plus/theme/_mixins.scss          | 10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index bdfef2e2f..74f4085ec 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -158,35 +158,35 @@ $shadow-color-3: rgba(0,0,0,.12);
             @font-face {
                 font-family: "Material Icons";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIcons-Regular.ttf") format('truetype');
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
             }
         }
         @if $icon-font-style == outlined {
             @font-face {
                 font-family: "Material Icons Outlined";
                 src: local("Material Icons Outlined"),
-                     url(".../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == round {
             @font-face {
                 font-family: "Material Icons Round";
                 src: local("Material Icons"),
-                     url(".../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == sharp {
             @font-face {
                 font-family: "Material Icons Sharp";
                 src: local("Material Icons Sharp"),
-                     url(".../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
             }
         }
         @if $icon-font-style == two-tone {
             @font-face {
                 font-family: "Material Icons Two Tone";
                 src: local("Material Icons Two Tone"),
-                     url(".../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
             }
         }
     }

From 74217dcb56941d3f58a2a04015b1e8071924e0f3 Mon Sep 17 00:00:00 2001
From: Rintan <>
Date: Wed, 23 Dec 2020 16:34:02 +0900
Subject: [PATCH 076/200] update material theme to the latest

---
 .../styles/mastodon-material-dark.scss        |  7 --
 .../mastodon-material-dark/color/black.scss   | 14 ++-
 .../color/mastodon-dark.scss                  | 10 +-
 .../color/mastodon-light.scss                 | 10 +-
 .../color/plus-classic.scss                   | 10 +-
 .../mastodon-material-dark/color/v1-dark.scss | 16 +++-
 .../color/v1-light.scss                       | 10 +-
 .../mastodon-material-dark/color/v2-dark.scss | 14 ++-
 .../color/v2-light.scss                       | 10 +-
 .../layout/material-v1.scss                   |  6 +-
 .../layout/material-v2.scss                   |  7 +-
 .../mastodon-material-dark/plugins/dense.scss | 17 ++--
 .../mastodon-material-dark/theme/_mixins.scss |  8 +-
 .../mastodon-material-dark/theme/account.scss | 21 ++++-
 .../mastodon-material-dark/theme/button.scss  | 70 +++++++++-----
 .../mastodon-material-dark/theme/columns.scss | 40 +++++---
 .../theme/components.scss                     | 70 +++++++++-----
 .../theme/containers.scss                     | 57 +++++++++++
 .../theme/emoji-picker.scss                   | 12 +--
 .../theme/material-icons.scss                 | 55 +++++++++--
 .../mastodon-material-dark/theme/media.scss   | 16 ++--
 .../mastodon-material-dark/theme/modal.scss   |  1 -
 .../theme/responsive.scss                     | 24 ++++-
 .../theme/statuses.scss                       | 94 +++++++++++++++++--
 .../mastodon-material-dark/theme/theme.scss   |  8 +-
 .../mastodon-material-dark/theme/widgets.scss | 32 +++++++
 .../styles/mastodon-material-light.scss       |  7 --
 .../mastodon-material-light/color/black.scss  | 14 ++-
 .../color/mastodon-dark.scss                  | 10 +-
 .../color/mastodon-light.scss                 | 10 +-
 .../color/plus-classic.scss                   | 10 +-
 .../color/v1-dark.scss                        | 16 +++-
 .../color/v1-light.scss                       | 10 +-
 .../color/v2-dark.scss                        | 14 ++-
 .../color/v2-light.scss                       | 10 +-
 .../layout/material-v1.scss                   |  6 +-
 .../layout/material-v2.scss                   |  7 +-
 .../plugins/dense.scss                        | 17 ++--
 .../theme/_mixins.scss                        |  8 +-
 .../theme/account.scss                        | 21 ++++-
 .../mastodon-material-light/theme/button.scss | 70 +++++++++-----
 .../theme/columns.scss                        | 40 +++++---
 .../theme/components.scss                     | 70 +++++++++-----
 .../theme/containers.scss                     | 57 +++++++++++
 .../theme/emoji-picker.scss                   | 12 +--
 .../theme/material-icons.scss                 | 55 +++++++++--
 .../mastodon-material-light/theme/media.scss  | 16 ++--
 .../mastodon-material-light/theme/modal.scss  |  1 -
 .../theme/responsive.scss                     | 24 ++++-
 .../theme/statuses.scss                       | 94 +++++++++++++++++--
 .../mastodon-material-light/theme/theme.scss  |  8 +-
 .../theme/widgets.scss                        | 32 +++++++
 app/javascript/styles/material-black.scss     |  7 --
 .../styles/material-black/color/black.scss    | 14 ++-
 .../material-black/color/mastodon-dark.scss   | 10 +-
 .../material-black/color/mastodon-light.scss  | 10 +-
 .../material-black/color/plus-classic.scss    | 10 +-
 .../styles/material-black/color/v1-dark.scss  | 16 +++-
 .../styles/material-black/color/v1-light.scss | 10 +-
 .../styles/material-black/color/v2-dark.scss  | 14 ++-
 .../styles/material-black/color/v2-light.scss | 10 +-
 .../material-black/layout/material-v1.scss    |  6 +-
 .../material-black/layout/material-v2.scss    |  7 +-
 .../styles/material-black/plugins/dense.scss  | 17 ++--
 .../styles/material-black/theme/_mixins.scss  |  8 +-
 .../styles/material-black/theme/account.scss  | 21 ++++-
 .../styles/material-black/theme/button.scss   | 70 +++++++++-----
 .../styles/material-black/theme/columns.scss  | 40 +++++---
 .../material-black/theme/components.scss      | 70 +++++++++-----
 .../material-black/theme/containers.scss      | 57 +++++++++++
 .../material-black/theme/emoji-picker.scss    | 12 +--
 .../material-black/theme/material-icons.scss  | 55 +++++++++--
 .../styles/material-black/theme/media.scss    | 16 ++--
 .../styles/material-black/theme/modal.scss    |  1 -
 .../material-black/theme/responsive.scss      | 24 ++++-
 .../styles/material-black/theme/statuses.scss | 94 +++++++++++++++++--
 .../styles/material-black/theme/theme.scss    |  8 +-
 .../styles/material-black/theme/widgets.scss  | 32 +++++++
 app/javascript/styles/material-dark.scss      |  7 --
 .../styles/material-dark/color/black.scss     | 14 ++-
 .../material-dark/color/mastodon-dark.scss    | 10 +-
 .../material-dark/color/mastodon-light.scss   | 10 +-
 .../material-dark/color/plus-classic.scss     | 10 +-
 .../styles/material-dark/color/v1-dark.scss   | 16 +++-
 .../styles/material-dark/color/v1-light.scss  | 10 +-
 .../styles/material-dark/color/v2-dark.scss   | 14 ++-
 .../styles/material-dark/color/v2-light.scss  | 10 +-
 .../material-dark/layout/material-v1.scss     |  6 +-
 .../material-dark/layout/material-v2.scss     |  7 +-
 .../styles/material-dark/plugins/dense.scss   | 17 ++--
 .../styles/material-dark/theme/_mixins.scss   |  8 +-
 .../styles/material-dark/theme/account.scss   | 21 ++++-
 .../styles/material-dark/theme/button.scss    | 70 +++++++++-----
 .../styles/material-dark/theme/columns.scss   | 40 +++++---
 .../material-dark/theme/components.scss       | 70 +++++++++-----
 .../material-dark/theme/containers.scss       | 57 +++++++++++
 .../material-dark/theme/emoji-picker.scss     | 12 +--
 .../material-dark/theme/material-icons.scss   | 55 +++++++++--
 .../styles/material-dark/theme/media.scss     | 16 ++--
 .../styles/material-dark/theme/modal.scss     |  1 -
 .../material-dark/theme/responsive.scss       | 24 ++++-
 .../styles/material-dark/theme/statuses.scss  | 94 +++++++++++++++++--
 .../styles/material-dark/theme/theme.scss     |  8 +-
 .../styles/material-dark/theme/widgets.scss   | 32 +++++++
 app/javascript/styles/material-light.scss     |  7 --
 .../styles/material-light/color/black.scss    | 14 ++-
 .../material-light/color/mastodon-dark.scss   | 10 +-
 .../material-light/color/mastodon-light.scss  | 10 +-
 .../material-light/color/plus-classic.scss    | 10 +-
 .../styles/material-light/color/v1-dark.scss  | 16 +++-
 .../styles/material-light/color/v1-light.scss | 10 +-
 .../styles/material-light/color/v2-dark.scss  | 14 ++-
 .../styles/material-light/color/v2-light.scss | 10 +-
 .../material-light/layout/material-v1.scss    |  6 +-
 .../material-light/layout/material-v2.scss    |  7 +-
 .../styles/material-light/plugins/dense.scss  | 17 ++--
 .../styles/material-light/theme/_mixins.scss  |  8 +-
 .../styles/material-light/theme/account.scss  | 21 ++++-
 .../styles/material-light/theme/button.scss   | 70 +++++++++-----
 .../styles/material-light/theme/columns.scss  | 40 +++++---
 .../material-light/theme/components.scss      | 70 +++++++++-----
 .../material-light/theme/containers.scss      | 57 +++++++++++
 .../material-light/theme/emoji-picker.scss    | 12 +--
 .../material-light/theme/material-icons.scss  | 55 +++++++++--
 .../styles/material-light/theme/media.scss    | 16 ++--
 .../styles/material-light/theme/modal.scss    |  1 -
 .../material-light/theme/responsive.scss      | 24 ++++-
 .../styles/material-light/theme/statuses.scss | 94 +++++++++++++++++--
 .../styles/material-light/theme/theme.scss    |  8 +-
 .../styles/material-light/theme/widgets.scss  | 32 +++++++
 app/javascript/styles/plus.scss               |  7 --
 app/javascript/styles/plus/color/black.scss   | 14 ++-
 .../styles/plus/color/mastodon-dark.scss      | 10 +-
 .../styles/plus/color/mastodon-light.scss     | 10 +-
 .../styles/plus/color/plus-classic.scss       | 10 +-
 app/javascript/styles/plus/color/v1-dark.scss | 16 +++-
 .../styles/plus/color/v1-light.scss           | 10 +-
 app/javascript/styles/plus/color/v2-dark.scss | 14 ++-
 .../styles/plus/color/v2-light.scss           | 10 +-
 .../styles/plus/layout/material-v1.scss       |  6 +-
 .../styles/plus/layout/material-v2.scss       |  7 +-
 app/javascript/styles/plus/plugins/dense.scss | 17 ++--
 app/javascript/styles/plus/theme/_mixins.scss |  8 +-
 app/javascript/styles/plus/theme/account.scss | 21 ++++-
 app/javascript/styles/plus/theme/button.scss  | 70 +++++++++-----
 app/javascript/styles/plus/theme/columns.scss | 40 +++++---
 .../styles/plus/theme/components.scss         | 70 +++++++++-----
 .../styles/plus/theme/containers.scss         | 57 +++++++++++
 .../styles/plus/theme/emoji-picker.scss       | 12 +--
 .../styles/plus/theme/material-icons.scss     | 55 +++++++++--
 app/javascript/styles/plus/theme/media.scss   | 16 ++--
 app/javascript/styles/plus/theme/modal.scss   |  1 -
 .../styles/plus/theme/responsive.scss         | 24 ++++-
 .../styles/plus/theme/statuses.scss           | 94 +++++++++++++++++--
 app/javascript/styles/plus/theme/theme.scss   |  8 +-
 app/javascript/styles/plus/theme/widgets.scss | 32 +++++++
 156 files changed, 3030 insertions(+), 804 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/containers.scss
 create mode 100644 app/javascript/styles/mastodon-material-dark/theme/widgets.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/containers.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/theme/widgets.scss
 create mode 100644 app/javascript/styles/material-black/theme/containers.scss
 create mode 100644 app/javascript/styles/material-black/theme/widgets.scss
 create mode 100644 app/javascript/styles/material-dark/theme/containers.scss
 create mode 100644 app/javascript/styles/material-dark/theme/widgets.scss
 create mode 100644 app/javascript/styles/material-light/theme/containers.scss
 create mode 100644 app/javascript/styles/material-light/theme/widgets.scss
 create mode 100644 app/javascript/styles/plus/theme/containers.scss
 create mode 100644 app/javascript/styles/plus/theme/widgets.scss

diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
index a4645d3f8..889983ed4 100644
--- a/app/javascript/styles/mastodon-material-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'mastodon-material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/black.scss b/app/javascript/styles/mastodon-material-dark/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/mastodon-material-dark/color/black.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/mastodon-material-dark/theme/account.scss b/app/javascript/styles/mastodon-material-dark/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/containers.scss b/app/javascript/styles/mastodon-material-dark/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/theme.scss b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/widgets.scss b/app/javascript/styles/mastodon-material-dark/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
index cda781b7a..5068d6386 100644
--- a/app/javascript/styles/mastodon-material-light.scss
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'mastodon-material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/mastodon-material-light/color/black.scss
+++ b/app/javascript/styles/mastodon-material-light/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/mastodon-material-light/theme/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/mastodon-material-light/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/mastodon-material-light/theme/containers.scss b/app/javascript/styles/mastodon-material-light/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/mastodon-material-light/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/mastodon-material-light/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/mastodon-material-light/theme/responsive.scss b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/mastodon-material-light/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/mastodon-material-light/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/theme.scss b/app/javascript/styles/mastodon-material-light/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/mastodon-material-light/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/widgets.scss b/app/javascript/styles/mastodon-material-light/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black.scss b/app/javascript/styles/material-black.scss
index 345077ab5..19f29bc08 100644
--- a/app/javascript/styles/material-black.scss
+++ b/app/javascript/styles/material-black.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'material-black/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/material-black/color/black.scss
+++ b/app/javascript/styles/material-black/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/material-black/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-black/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/mastodon-light.scss b/app/javascript/styles/material-black/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/material-black/color/mastodon-light.scss
+++ b/app/javascript/styles/material-black/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/plus-classic.scss b/app/javascript/styles/material-black/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/material-black/color/plus-classic.scss
+++ b/app/javascript/styles/material-black/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/material-black/color/v1-dark.scss
+++ b/app/javascript/styles/material-black/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/material-black/color/v1-light.scss
+++ b/app/javascript/styles/material-black/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/v2-dark.scss b/app/javascript/styles/material-black/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/material-black/color/v2-dark.scss
+++ b/app/javascript/styles/material-black/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/material-black/color/v2-light.scss
+++ b/app/javascript/styles/material-black/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-black/layout/material-v1.scss b/app/javascript/styles/material-black/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/material-black/layout/material-v1.scss
+++ b/app/javascript/styles/material-black/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v2.scss b/app/javascript/styles/material-black/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/material-black/layout/material-v2.scss
+++ b/app/javascript/styles/material-black/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/dense.scss b/app/javascript/styles/material-black/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/material-black/plugins/dense.scss
+++ b/app/javascript/styles/material-black/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/material-black/theme/account.scss b/app/javascript/styles/material-black/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/material-black/theme/account.scss
+++ b/app/javascript/styles/material-black/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/material-black/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/material-black/theme/components.scss b/app/javascript/styles/material-black/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/material-black/theme/components.scss
+++ b/app/javascript/styles/material-black/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/material-black/theme/containers.scss b/app/javascript/styles/material-black/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/material-black/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/emoji-picker.scss b/app/javascript/styles/material-black/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/material-black/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-black/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-black/theme/material-icons.scss b/app/javascript/styles/material-black/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/material-black/theme/material-icons.scss
+++ b/app/javascript/styles/material-black/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/media.scss b/app/javascript/styles/material-black/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/material-black/theme/media.scss
+++ b/app/javascript/styles/material-black/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/material-black/theme/modal.scss b/app/javascript/styles/material-black/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/material-black/theme/modal.scss
+++ b/app/javascript/styles/material-black/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/material-black/theme/responsive.scss b/app/javascript/styles/material-black/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/material-black/theme/responsive.scss
+++ b/app/javascript/styles/material-black/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/statuses.scss b/app/javascript/styles/material-black/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/material-black/theme/statuses.scss
+++ b/app/javascript/styles/material-black/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/theme.scss b/app/javascript/styles/material-black/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/material-black/theme/theme.scss
+++ b/app/javascript/styles/material-black/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/widgets.scss b/app/javascript/styles/material-black/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/material-black/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark.scss b/app/javascript/styles/material-dark.scss
index ee4230ba9..8cfd6c6be 100644
--- a/app/javascript/styles/material-dark.scss
+++ b/app/javascript/styles/material-dark.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/material-dark/color/black.scss
+++ b/app/javascript/styles/material-dark/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-dark/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-dark/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/material-dark/color/v1-light.scss
+++ b/app/javascript/styles/material-dark/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-dark/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/material-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-dark/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-dark/layout/material-v1.scss b/app/javascript/styles/material-dark/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/material-dark/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v2.scss b/app/javascript/styles/material-dark/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-dark/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/dense.scss b/app/javascript/styles/material-dark/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/material-dark/plugins/dense.scss
+++ b/app/javascript/styles/material-dark/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/material-dark/theme/account.scss b/app/javascript/styles/material-dark/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/material-dark/theme/account.scss
+++ b/app/javascript/styles/material-dark/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ b/app/javascript/styles/material-dark/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/material-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/material-dark/theme/components.scss
+++ b/app/javascript/styles/material-dark/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/material-dark/theme/containers.scss b/app/javascript/styles/material-dark/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/material-dark/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/emoji-picker.scss b/app/javascript/styles/material-dark/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-dark/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/material-dark/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/media.scss b/app/javascript/styles/material-dark/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/material-dark/theme/media.scss
+++ b/app/javascript/styles/material-dark/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/material-dark/theme/modal.scss b/app/javascript/styles/material-dark/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/material-dark/theme/modal.scss
+++ b/app/javascript/styles/material-dark/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/material-dark/theme/responsive.scss b/app/javascript/styles/material-dark/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/material-dark/theme/responsive.scss
+++ b/app/javascript/styles/material-dark/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/statuses.scss b/app/javascript/styles/material-dark/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/material-dark/theme/statuses.scss
+++ b/app/javascript/styles/material-dark/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/theme.scss b/app/javascript/styles/material-dark/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/material-dark/theme/theme.scss
+++ b/app/javascript/styles/material-dark/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/widgets.scss b/app/javascript/styles/material-dark/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/material-dark/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light.scss b/app/javascript/styles/material-light.scss
index 228057b12..9818f14f5 100644
--- a/app/javascript/styles/material-light.scss
+++ b/app/javascript/styles/material-light.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/material-light/color/black.scss
+++ b/app/javascript/styles/material-light/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-light/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/material-light/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/material-light/color/plus-classic.scss
+++ b/app/javascript/styles/material-light/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/material-light/color/v1-dark.scss
+++ b/app/javascript/styles/material-light/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/material-light/color/v1-light.scss
+++ b/app/javascript/styles/material-light/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/material-light/color/v2-dark.scss
+++ b/app/javascript/styles/material-light/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/material-light/color/v2-light.scss
+++ b/app/javascript/styles/material-light/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/material-light/layout/material-v1.scss b/app/javascript/styles/material-light/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/material-light/layout/material-v1.scss
+++ b/app/javascript/styles/material-light/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v2.scss b/app/javascript/styles/material-light/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/material-light/layout/material-v2.scss
+++ b/app/javascript/styles/material-light/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/dense.scss b/app/javascript/styles/material-light/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/material-light/plugins/dense.scss
+++ b/app/javascript/styles/material-light/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/material-light/theme/account.scss b/app/javascript/styles/material-light/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/material-light/theme/account.scss
+++ b/app/javascript/styles/material-light/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/material-light/theme/button.scss
+++ b/app/javascript/styles/material-light/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/material-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/material-light/theme/components.scss
+++ b/app/javascript/styles/material-light/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/material-light/theme/containers.scss b/app/javascript/styles/material-light/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/material-light/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/emoji-picker.scss b/app/javascript/styles/material-light/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-light/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/material-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/material-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-light/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/media.scss b/app/javascript/styles/material-light/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/material-light/theme/media.scss
+++ b/app/javascript/styles/material-light/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/material-light/theme/modal.scss b/app/javascript/styles/material-light/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/material-light/theme/modal.scss
+++ b/app/javascript/styles/material-light/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/material-light/theme/responsive.scss b/app/javascript/styles/material-light/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/material-light/theme/responsive.scss
+++ b/app/javascript/styles/material-light/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/statuses.scss b/app/javascript/styles/material-light/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/material-light/theme/statuses.scss
+++ b/app/javascript/styles/material-light/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/theme.scss b/app/javascript/styles/material-light/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/material-light/theme/theme.scss
+++ b/app/javascript/styles/material-light/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/widgets.scss b/app/javascript/styles/material-light/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/material-light/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus.scss b/app/javascript/styles/plus.scss
index 45fa7f979..9cbccaa5f 100644
--- a/app/javascript/styles/plus.scss
+++ b/app/javascript/styles/plus.scss
@@ -1,9 +1,2 @@
-/*
-* Mastodon Material 0.2.0
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-
 @import 'application';
 @import 'plus/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
index 6aa7ebfdb..b4b29f827 100644
--- a/app/javascript/styles/plus/color/black.scss
+++ b/app/javascript/styles/plus/color/black.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #121212;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
index 4ed9a7e07..c765e861c 100644
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #393f4f;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#42485a, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
index d4d84a626..6c2fef5a6 100644
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -40,11 +40,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
index eba9c0f18..ef5900e57 100644
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
index d925f3d65..caa0d1b51 100644
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
-$contained-chip-hover-color: lighten(tranparentize(#2e2e2e, 0.3), 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: #ffffff;
 $top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
@@ -67,7 +69,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
index 906b8e459..f7a1e66ff 100644
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
index 94c381ee7..5fef3a753 100644
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -41,11 +41,13 @@ $verified-bg-color: darken($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: lighten($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #1e1e1e;
 $outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: lighten($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#2e2e2e, 0.2);
@@ -56,10 +58,10 @@ $badge-color: $primary-color;
 
 // Icon color
 $icon-color: #e2e2e3;
-$icon-hover-color: lighten($icon-color, 30%);
+$icon-hover-color: #ffffff;
 $icon-bg-hover-color: transparentize(#ffffff, 0.8);
 $icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: lighten($icon-color, 16%);
+$disabled-icon-color: darken($icon-color, 16%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
 $top-bar-icon-active-color: $primary-color;
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
index 9317004e9..cc2efe2f8 100644
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -41,11 +41,13 @@ $verified-bg-color: lighten($verified-color, 20%);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
 $contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: darken($contained-chip-color, 12%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
 $outlined-chip-color: #ffffff;
 $outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: darken($outlined-chip-color, 12%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
 
 // Relationship tag color
 $relationship-tag-color: transparentize(#e0e0e0, 0.2);
@@ -68,7 +70,11 @@ $media-icon-color: transparentize(#ffffff, 0.4);
 $media-icon-hover-color: transparentize(#ffffff, 0.2);
 $media-icon-bg-color: transparentize(#000000, 0.5);
 $media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
 $control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 // Button color
 $icon-button-color: $icon-color;
diff --git a/app/javascript/styles/plus/layout/material-v1.scss b/app/javascript/styles/plus/layout/material-v1.scss
index 926c3325a..d3a2f4847 100644
--- a/app/javascript/styles/plus/layout/material-v1.scss
+++ b/app/javascript/styles/plus/layout/material-v1.scss
@@ -48,4 +48,8 @@ $outlined-chip: false;  // Material v1 styled contained chip
 
 
 // Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
index f79f91005..7c6b0c968 100644
--- a/app/javascript/styles/plus/layout/material-v2.scss
+++ b/app/javascript/styles/plus/layout/material-v2.scss
@@ -56,4 +56,9 @@ $outlined-chip: true;  // Material v2 styled outlined chip
 
 // Button shadow
 $button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
\ No newline at end of file
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
index b3ba40812..5e3d505eb 100644
--- a/app/javascript/styles/plus/plugins/dense.scss
+++ b/app/javascript/styles/plus/plugins/dense.scss
@@ -5,20 +5,21 @@
 
 
 .drawer {
-    &__tab { margin: 8px auto 8px }
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
 }
 
 .column { margin: 10px 5px }
 
 .column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
     &__buttons { height: 48px }
 
-    &__button {
-        margin: 8px;
-        padding: 10px 8px;
-
-        .fa { vertical-align: text-top }
-    }
+    &__button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
@@ -38,7 +39,7 @@
 }
 
 .status {
-    padding: 8px 8px 8px 66px;
+    padding: 8px 8px 4px 66px;
 
     &__expand { width: 66px }
 
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index 74f4085ec..3980fbc9b 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -45,7 +45,7 @@ $shadow-color-3: rgba(0,0,0,.12);
     @if $outlined-chip {
         .reactions-bar__item {
             background: $outlined-chip-color !important;
-            border: 1px solid $border-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
         
             &.active { background-color: $outlined-chip-selected-color !important }
         
@@ -61,6 +61,12 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
 // check background-image value
 @mixin bg-image {
     @if $bg-image == none {        
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
index b6d517e12..0765930e6 100644
--- a/app/javascript/styles/plus/theme/account.scss
+++ b/app/javascript/styles/plus/theme/account.scss
@@ -6,6 +6,7 @@
 
 .account {
     border-bottom: 1px solid $border-color;
+    padding: 16px;
 
     .account__display-name,
     .account__display-name strong { color: $primary-text-color }
@@ -27,6 +28,11 @@
         }
     }
 
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
     &__header {
         &__bar {
             background: $card-bg-color;
@@ -51,9 +57,11 @@
 
             &__buttons {
                 .icon-button {
+                    @include icon-button;
                     border: none;
                     border-radius: 50%;
-                    padding: 0;
+                    padding: 8px;
+                    margin-left: 8px;
                 }
             }
         }
@@ -157,6 +165,17 @@
             &:hover { background: $text-tab-indicator-bg-hover-color }
         }
     }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
 }
 
 .account-role {
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
index 9c10a3894..6ec2ddd88 100644
--- a/app/javascript/styles/plus/theme/button.scss
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -21,16 +21,23 @@
     &.inverted {
         color: $icon-button-color;
 
+        &.active { color: $icon-button-active-color }
+
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
+
+        &:focus { background-color: transparent }
     }
 
     &.overlayed {
+        @include icon-button;
         border-radius: 50%;
         background: $media-icon-bg-color;
         color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
     
         &:hover {
             background: $media-icon-bg-color;
@@ -76,38 +83,53 @@ label.icon-button {
     }
 }
 
-.button,
-.button:active,
-.button:focus {
+.button {
     background-color: $contained-button-color;
     border-radius: $button-radius;
-}
 
-.button:hover {
-    @include shadow-2dp;
-    background-color: $contained-button-hover-color;
-}
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
 
-.button.logo-button {
-    background: $contained-button-color;
-    margin: 2px;
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
 
-    &:hover { background: $contained-button-hover-color }
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
 
-    .button--destructive:hover { background: $contained-button-hover-color }
-}
+    &.button--block { margin: 8px 0 }
 
-.button.button--block { margin: 8px 0 }
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
 
-.button.confirmation-modal__cancel-button {
-    box-shadow: none;
-    background-color: transparent;
-    margin: 0 8px;
-    color: $text-button-color;
-
-    &:hover { background: $text-button-hover-color }
-
-    &:focus { background: $text-button-focus-color }
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
 }
 
 .spoiler-button__overlay__label {
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index 3f57ea958..dd47e9029 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -21,9 +21,10 @@
 .column-header {
     background: $top-bar-color;
     border-radius: $bar-radius;
+    height: 56px;
 
     > button {
-        padding: 16px 0 16px 16px;
+        padding: 16px;
         color: $top-bar-text-color;
     }
 
@@ -45,12 +46,13 @@
     &__buttons { height: 56px }
 
     &__button {
+        @include icon-button;
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        padding: 8px;
+        margin: 10px;
         border-radius: 50%;
-        font-size: 20px;
+        box-sizing: content-box;
 
         &.active {
             color: $top-bar-icon-active-color;
@@ -136,6 +138,7 @@
     color: $section-text-color;
     background: $bg-color;
     padding: 12px 16px;
+    margin-top: 8px;
     border-top: 1px solid $border-color;
 }
 
@@ -192,6 +195,8 @@
     padding: 16px;
 
     span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
 }
 
 .column-inline-form {
@@ -296,6 +301,7 @@
     &__wrapper {
         background: $bg-color;
         height: auto !important;
+        padding-bottom: 8px;
         border-bottom: 1px solid $border-color;
     }
 
@@ -321,6 +327,7 @@
         h4 {
             color: $section-text-color;
             padding: 12px 16px;
+            margin-top: 8px;
             border-top: 1px solid $border-color;
             border-bottom: none;
         }
@@ -384,15 +391,18 @@
 
     &__pagination {
         color: $ui-text-color;
-        padding: 8px 16px;
-        bottom: 8px;
+        padding: 16px;
+        bottom: 0;
 
         .icon-button {
-            font-size: 20px !important;
-            width: 20px !important;
-            height: 20px !important;
-            margin: 0 8px;
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
         }
+
+        span { vertical-align: super }
     }
 }
 
@@ -401,6 +411,9 @@
 @include outlined-chip;
 
 .reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
     .emoji-button {
         color: $icon-button-color;
         font-size: 20px;
@@ -417,7 +430,10 @@
 
         &.active {
             background-color: $contained-chip-selected-color;
-            .reactions-bar__item__count { color: $ui-text-color }
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
         }
 
         &__emoji {
@@ -428,7 +444,7 @@
 
         &__count {
             font-size: 16px;
-            margin: 0 8px;
+            margin: 0 12px 0 8px;
             color: $secondary-text-color;
         }
 
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
index 46483923e..85c59e9ae 100644
--- a/app/javascript/styles/plus/theme/components.scss
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -121,7 +121,7 @@
         background-color: $card-bg-color;
         padding: 16px;
 
-        .fa { margin-right: 8px }
+        .fa { margin-right: 16px }
     }
 
     &__section {
@@ -148,6 +148,11 @@
         width: 36px !important;
         height: 36px !important;
         padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
     }
 }
 
@@ -156,6 +161,8 @@
     margin: 8px 0;
 }
 
+.flex-spacer { margin: 8px 0 }
+
 .dropdown-menu {
     @include shadow-8dp;
     background: $menu-bg-color;
@@ -233,6 +240,7 @@
             padding: 16px;
             border: 1px solid $border-color;
             border-radius: $card-radius;
+            box-shadow: none;
 
             a { color: $link-text-color }
         }
@@ -263,8 +271,7 @@
             padding: 8px;
 
             .icon-button {
-                width: 20px !important;
-                height: 20px !important;
+                @include icon-button;
                 padding: 8px;
             }
 
@@ -291,14 +298,12 @@
 
             .button.button-secondary {
                 box-shadow: none;
-                color: $outlined-button-color;
-                border-color: $outlined-button-color;
+                color: $text-button-color;
 
-                &:hover { background-color: $outlined-button-hover-color }
+                &:hover { background-color: $text-button-hover-color }
 
-                &:active { background-color: $outlined-button-active-color }
-
-                &:focus { background-color: $outlined-button-color }
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
             }
 
             .poll__footer { border-top: none }
@@ -312,17 +317,32 @@
 
 
 .poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
     &__input {
-        border: 2px solid $control-border-color;
+        border: none;
         width: 20px;
         height: 20px;
         flex: 0 0 20px;
-        margin: 8px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
 
-        &.checkbox { border-radius: 2px }
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &:focus,
-        &:hover { border: 2px solid $control-border-color }
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
     }
 
     &__text input[type=text] {
@@ -334,12 +354,16 @@
         &:focus { border-color: $border-active-color }
     }
 
-    &__option input[type=text] {
-        color: $primary-text-color;
-        background: $text-field-bg-color;
-        border: none;
-        border-radius: 2px;
-        padding: 8px 16px;
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
     }
 
     &__chart {
@@ -444,7 +468,11 @@
         &-avatar { margin-right: 8px }
     }
 
-    &__content { color: $primary-text-color }
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
 }
 
 .attachment-list {
diff --git a/app/javascript/styles/plus/theme/containers.scss b/app/javascript/styles/plus/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/plus/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/emoji-picker.scss b/app/javascript/styles/plus/theme/emoji-picker.scss
index 1b42121be..8aacc7e80 100644
--- a/app/javascript/styles/plus/theme/emoji-picker.scss
+++ b/app/javascript/styles/plus/theme/emoji-picker.scss
@@ -69,13 +69,13 @@
         background: $menu-bg-color;
     }
 
-    &-category-label span {
-        padding: 4px 6px;
-        background: $menu-bg-color;
-    }
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
 
-    &-emoji:hover::before {
-        background-color: $icon-bg-hover-color;
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
     }
 
     &-no-results { color: $secondary-text-color }
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
index f27de96e8..b416d3a02 100644
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -75,7 +75,8 @@
     &.fa-check,
     &.fa-quote-right,
     &.fa-upload,
-    &.fa-comments {
+    &.fa-comments,
+    &.fa-angle-right {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -143,6 +144,7 @@
     &.fa-quote-right::before { content: "format_quote" }
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
 }
 
 // bookmark icon
@@ -170,17 +172,20 @@
 .status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
 
 // boost icon
-button.icon-button i.fa-retweet,
-button.icon-button i.fa-retweet:hover {
-    height: 18px;
-    width: 18px;
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="36" width="18"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button i.fa-retweet:hover {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
 button.icon-button.disabled i.fa-retweet:hover {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
 // dropdown icon
@@ -199,7 +204,24 @@ button.icon-button.disabled i.fa-retweet:hover {
 .fa.fa-bell.column-header__icon.fa-fw,
 .fa.fa-home.column-header__icon.fa-fw,
 .fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw { vertical-align: text-bottom }
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
 
 // uploaded media icons align
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
@@ -208,4 +230,19 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
\ No newline at end of file
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
index 0b8b92acf..f231eb835 100644
--- a/app/javascript/styles/plus/theme/media.scss
+++ b/app/javascript/styles/plus/theme/media.scss
@@ -12,23 +12,25 @@
 }
 
 .media-modal__close {
-    align-content: center;
-
     &.icon-button {
         background: transparent;
         color: $media-icon-color;
-        text-align: center !important;
         font-size: 24px !important;
-        width: 48px !important;
-        height: 48px !important;
-        border: 12px;
+        width: 24px !important;
+        height: 24px !important;
+        padding: 8px;
+        box-sizing: content-box;
+        line-height: normal !important;
 
         &:hover {
             background: $media-icon-bg-hover-color;
             color: $media-icon-hover-color;
         }
 
-        .fa-fw { width: 24px }
+        .fa-fw {
+            width: 24px;
+            height: 24px;
+        }
     }
 }
 
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
index 209678c84..e9a9176ea 100644
--- a/app/javascript/styles/plus/theme/modal.scss
+++ b/app/javascript/styles/plus/theme/modal.scss
@@ -10,7 +10,6 @@
     background: $card-bg-color;
     color: $ui-text-color;
     border-radius: $dialog-radius;
-    width: 300px;
 
     &__container {
         text-align: left;
diff --git a/app/javascript/styles/plus/theme/responsive.scss b/app/javascript/styles/plus/theme/responsive.scss
index d0e1a6635..8618f7ed7 100644
--- a/app/javascript/styles/plus/theme/responsive.scss
+++ b/app/javascript/styles/plus/theme/responsive.scss
@@ -39,6 +39,10 @@
     background: $floating-action-button-color;
     color: $floating-action-button-icon-color;
     font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
 
     &:hover { background: $floating-action-button-hover-color }
 
@@ -60,6 +64,11 @@
     }
 }
 
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
 // middle size screen
 @media screen and (min-width: 415px) {
     .tabs-bar {
@@ -72,17 +81,22 @@
         }
     }
 
-    .columns-area__panels__main {
-        @include shadow-1dp;
-        padding: 0;
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
     }
 }
 
+//single column mode
 @media screen and (min-width: 631px) {
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
-            border-bottom-color: $tab-bg-color;
+            border-bottom-color: transparent;
         }
 
         &:active,
@@ -90,5 +104,7 @@
             background: $tab-indicator-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
index d095c2292..e6e5c4021 100644
--- a/app/javascript/styles/plus/theme/statuses.scss
+++ b/app/javascript/styles/plus/theme/statuses.scss
@@ -6,7 +6,7 @@
 
 
 .status {
-    padding: 12px 12px 12px 70px;
+    padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
 
     &__expand { width: 70px }
@@ -40,6 +40,8 @@
             &.unhandled-link { color: $link-text-color }
         }
 
+        p { margin-bottom: 16px }
+
         .status__content__spoiler-link {
             background: transparent;
 
@@ -69,9 +71,47 @@
     }
 
     &__action-bar {
-        &__counter__label {
-            font-size: 14px;
-            color: $info-text-color;
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 6px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
         }
     }
 
@@ -154,6 +194,9 @@ a.status-card {
     &:hover { background-color: $card-bg-color }
 }
 
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
 // Detailed status in mobile
 .status.light {
     .status {
@@ -170,6 +213,8 @@ a.status-card {
     background: $card-bg-color;
     padding: 16px;
 
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
     &__display-name {
         color: $secondary-text-color;
 
@@ -185,11 +230,28 @@ a.status-card {
         background: $card-bg-color;
         border-top: none;
         border-bottom: 1px solid $border-color;
-        padding: 12px 0;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
     }
 
     &__button {
-        .icon-button { font-size: 20px !important }
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
     }
 }
 
@@ -197,4 +259,22 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
-}
\ No newline at end of file
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/theme.scss b/app/javascript/styles/plus/theme/theme.scss
index f92276549..0980ed92a 100644
--- a/app/javascript/styles/plus/theme/theme.scss
+++ b/app/javascript/styles/plus/theme/theme.scss
@@ -1,4 +1,10 @@
+/*
+* Mastodon Material 0.2.0
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
 @charset "UTF-8";
 
 
-@import 'account', 'basics', 'button', 'columns', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables';
\ No newline at end of file
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/widgets.scss b/app/javascript/styles/plus/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/plus/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file

From 06354acfa07f08549be65d21048e1255f03bb24e Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Sun, 27 Dec 2020 18:46:26 +0900
Subject: [PATCH 077/200] Update version.rb

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 1e298b807..bd0915775 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      0
     end
 
     def flags

From 41499aac4747cbfa62d7e446c8a29eeef2a44078 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 27 Dec 2020 23:34:09 +0900
Subject: [PATCH 078/200] update for Mastodon v3.3.0

---
 .../mastodon-material-dark/color/black.scss   |  1 +
 .../color/mastodon-dark.scss                  |  1 +
 .../color/mastodon-light.scss                 |  1 +
 .../color/plus-classic.scss                   |  1 +
 .../mastodon-material-dark/color/v1-dark.scss |  1 +
 .../color/v1-light.scss                       |  1 +
 .../mastodon-material-dark/color/v2-dark.scss |  1 +
 .../color/v2-light.scss                       |  1 +
 .../mastodon-material-dark/plugins/dense.scss | 14 +++++
 .../mastodon-material-dark/plugins/plus.scss  |  4 ++
 .../mastodon-material-dark/theme/basics.scss  |  3 +-
 .../mastodon-material-dark/theme/button.scss  |  5 ++
 .../mastodon-material-dark/theme/columns.scss |  8 ++-
 .../theme/components.scss                     | 10 +++-
 .../theme/emoji-picker.scss                   |  1 +
 .../theme/material-icons.scss                 | 17 ++++--
 .../mastodon-material-dark/theme/media.scss   | 59 +++++++++++--------
 .../theme/statuses.scss                       | 14 ++++-
 .../mastodon-material-dark/theme/theme.scss   |  2 +-
 .../mastodon-material-light/color/black.scss  |  1 +
 .../color/mastodon-dark.scss                  |  1 +
 .../color/mastodon-light.scss                 |  1 +
 .../color/plus-classic.scss                   |  1 +
 .../color/v1-dark.scss                        |  1 +
 .../color/v1-light.scss                       |  1 +
 .../color/v2-dark.scss                        |  1 +
 .../color/v2-light.scss                       |  1 +
 .../plugins/dense.scss                        | 14 +++++
 .../mastodon-material-light/plugins/plus.scss |  4 ++
 .../mastodon-material-light/theme/basics.scss |  3 +-
 .../mastodon-material-light/theme/button.scss |  5 ++
 .../theme/columns.scss                        |  8 ++-
 .../theme/components.scss                     | 10 +++-
 .../theme/emoji-picker.scss                   |  1 +
 .../theme/material-icons.scss                 | 17 ++++--
 .../mastodon-material-light/theme/media.scss  | 59 +++++++++++--------
 .../theme/statuses.scss                       | 14 ++++-
 .../mastodon-material-light/theme/theme.scss  |  2 +-
 .../styles/material-black/color/black.scss    |  1 +
 .../material-black/color/mastodon-dark.scss   |  1 +
 .../material-black/color/mastodon-light.scss  |  1 +
 .../material-black/color/plus-classic.scss    |  1 +
 .../styles/material-black/color/v1-dark.scss  |  1 +
 .../styles/material-black/color/v1-light.scss |  1 +
 .../styles/material-black/color/v2-dark.scss  |  1 +
 .../styles/material-black/color/v2-light.scss |  1 +
 .../styles/material-black/plugins/dense.scss  | 14 +++++
 .../styles/material-black/plugins/plus.scss   |  4 ++
 .../styles/material-black/theme/basics.scss   |  3 +-
 .../styles/material-black/theme/button.scss   |  5 ++
 .../styles/material-black/theme/columns.scss  |  8 ++-
 .../material-black/theme/components.scss      | 10 +++-
 .../material-black/theme/emoji-picker.scss    |  1 +
 .../material-black/theme/material-icons.scss  | 17 ++++--
 .../styles/material-black/theme/media.scss    | 59 +++++++++++--------
 .../styles/material-black/theme/statuses.scss | 14 ++++-
 .../styles/material-black/theme/theme.scss    |  2 +-
 .../styles/material-dark/color/black.scss     |  1 +
 .../material-dark/color/mastodon-dark.scss    |  1 +
 .../material-dark/color/mastodon-light.scss   |  1 +
 .../material-dark/color/plus-classic.scss     |  1 +
 .../styles/material-dark/color/v1-dark.scss   |  1 +
 .../styles/material-dark/color/v1-light.scss  |  1 +
 .../styles/material-dark/color/v2-dark.scss   |  1 +
 .../styles/material-dark/color/v2-light.scss  |  1 +
 .../styles/material-dark/plugins/dense.scss   | 14 +++++
 .../styles/material-dark/plugins/plus.scss    |  4 ++
 .../styles/material-dark/theme/basics.scss    |  3 +-
 .../styles/material-dark/theme/button.scss    |  5 ++
 .../styles/material-dark/theme/columns.scss   |  8 ++-
 .../material-dark/theme/components.scss       | 10 +++-
 .../material-dark/theme/emoji-picker.scss     |  1 +
 .../material-dark/theme/material-icons.scss   | 17 ++++--
 .../styles/material-dark/theme/media.scss     | 59 +++++++++++--------
 .../styles/material-dark/theme/statuses.scss  | 14 ++++-
 .../styles/material-dark/theme/theme.scss     |  2 +-
 .../styles/material-light/color/black.scss    |  1 +
 .../material-light/color/mastodon-dark.scss   |  1 +
 .../material-light/color/mastodon-light.scss  |  1 +
 .../material-light/color/plus-classic.scss    |  1 +
 .../styles/material-light/color/v1-dark.scss  |  1 +
 .../styles/material-light/color/v1-light.scss |  1 +
 .../styles/material-light/color/v2-dark.scss  |  1 +
 .../styles/material-light/color/v2-light.scss |  1 +
 .../styles/material-light/plugins/dense.scss  | 14 +++++
 .../styles/material-light/plugins/plus.scss   |  4 ++
 .../styles/material-light/theme/basics.scss   |  3 +-
 .../styles/material-light/theme/button.scss   |  5 ++
 .../styles/material-light/theme/columns.scss  |  8 ++-
 .../material-light/theme/components.scss      | 10 +++-
 .../material-light/theme/emoji-picker.scss    |  1 +
 .../material-light/theme/material-icons.scss  | 17 ++++--
 .../styles/material-light/theme/media.scss    | 59 +++++++++++--------
 .../styles/material-light/theme/statuses.scss | 14 ++++-
 .../styles/material-light/theme/theme.scss    |  2 +-
 app/javascript/styles/plus/color/black.scss   |  1 +
 .../styles/plus/color/mastodon-dark.scss      |  1 +
 .../styles/plus/color/mastodon-light.scss     |  1 +
 .../styles/plus/color/plus-classic.scss       |  1 +
 app/javascript/styles/plus/color/v1-dark.scss |  1 +
 .../styles/plus/color/v1-light.scss           |  1 +
 app/javascript/styles/plus/color/v2-dark.scss |  1 +
 .../styles/plus/color/v2-light.scss           |  1 +
 app/javascript/styles/plus/plugins/dense.scss | 14 +++++
 app/javascript/styles/plus/plugins/plus.scss  |  4 ++
 app/javascript/styles/plus/theme/basics.scss  |  3 +-
 app/javascript/styles/plus/theme/button.scss  |  5 ++
 app/javascript/styles/plus/theme/columns.scss |  8 ++-
 .../styles/plus/theme/components.scss         | 10 +++-
 .../styles/plus/theme/emoji-picker.scss       |  1 +
 .../styles/plus/theme/material-icons.scss     | 17 ++++--
 app/javascript/styles/plus/theme/media.scss   | 59 +++++++++++--------
 .../styles/plus/theme/statuses.scss           | 14 ++++-
 app/javascript/styles/plus/theme/theme.scss   |  2 +-
 114 files changed, 678 insertions(+), 192 deletions(-)

diff --git a/app/javascript/styles/mastodon-material-dark/color/black.scss b/app/javascript/styles/mastodon-material-dark/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/mastodon-material-dark/color/black.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/mastodon-material-dark/theme/basics.scss b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/mastodon-material-dark/theme/theme.scss b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/mastodon-material-light/color/black.scss
+++ b/app/javascript/styles/mastodon-material-light/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/mastodon-material-light/plugins/plus.scss b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/mastodon-material-light/theme/basics.scss b/app/javascript/styles/mastodon-material-light/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/mastodon-material-light/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/mastodon-material-light/theme/media.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/mastodon-material-light/theme/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/mastodon-material-light/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/mastodon-material-light/theme/theme.scss b/app/javascript/styles/mastodon-material-light/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/mastodon-material-light/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/material-black/color/black.scss
+++ b/app/javascript/styles/material-black/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/material-black/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/material-black/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-black/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/material-black/color/mastodon-light.scss b/app/javascript/styles/material-black/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/material-black/color/mastodon-light.scss
+++ b/app/javascript/styles/material-black/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-black/color/plus-classic.scss b/app/javascript/styles/material-black/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/material-black/color/plus-classic.scss
+++ b/app/javascript/styles/material-black/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-black/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/material-black/color/v1-dark.scss
+++ b/app/javascript/styles/material-black/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-black/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/material-black/color/v1-light.scss
+++ b/app/javascript/styles/material-black/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-black/color/v2-dark.scss b/app/javascript/styles/material-black/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/material-black/color/v2-dark.scss
+++ b/app/javascript/styles/material-black/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-black/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/material-black/color/v2-light.scss
+++ b/app/javascript/styles/material-black/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-black/plugins/dense.scss b/app/javascript/styles/material-black/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/material-black/plugins/dense.scss
+++ b/app/javascript/styles/material-black/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-black/plugins/plus.scss b/app/javascript/styles/material-black/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/material-black/plugins/plus.scss
+++ b/app/javascript/styles/material-black/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/material-black/theme/basics.scss b/app/javascript/styles/material-black/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/material-black/theme/basics.scss
+++ b/app/javascript/styles/material-black/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/material-black/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/components.scss b/app/javascript/styles/material-black/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/material-black/theme/components.scss
+++ b/app/javascript/styles/material-black/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/material-black/theme/emoji-picker.scss b/app/javascript/styles/material-black/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/material-black/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-black/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/material-black/theme/material-icons.scss b/app/javascript/styles/material-black/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/material-black/theme/material-icons.scss
+++ b/app/javascript/styles/material-black/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/media.scss b/app/javascript/styles/material-black/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/material-black/theme/media.scss
+++ b/app/javascript/styles/material-black/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/material-black/theme/statuses.scss b/app/javascript/styles/material-black/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/material-black/theme/statuses.scss
+++ b/app/javascript/styles/material-black/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/material-black/theme/theme.scss b/app/javascript/styles/material-black/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/material-black/theme/theme.scss
+++ b/app/javascript/styles/material-black/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/material-dark/color/black.scss
+++ b/app/javascript/styles/material-dark/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/material-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/material-dark/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-dark/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-dark/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-dark/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-dark/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/material-dark/color/v1-light.scss
+++ b/app/javascript/styles/material-dark/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-dark/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/material-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-dark/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-dark/plugins/dense.scss b/app/javascript/styles/material-dark/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/material-dark/plugins/dense.scss
+++ b/app/javascript/styles/material-dark/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-dark/plugins/plus.scss b/app/javascript/styles/material-dark/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/material-dark/plugins/plus.scss
+++ b/app/javascript/styles/material-dark/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/material-dark/theme/basics.scss b/app/javascript/styles/material-dark/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/material-dark/theme/basics.scss
+++ b/app/javascript/styles/material-dark/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ b/app/javascript/styles/material-dark/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/material-dark/theme/components.scss
+++ b/app/javascript/styles/material-dark/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/material-dark/theme/emoji-picker.scss b/app/javascript/styles/material-dark/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/material-dark/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-dark/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/material-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/material-dark/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/media.scss b/app/javascript/styles/material-dark/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/material-dark/theme/media.scss
+++ b/app/javascript/styles/material-dark/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/material-dark/theme/statuses.scss b/app/javascript/styles/material-dark/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/material-dark/theme/statuses.scss
+++ b/app/javascript/styles/material-dark/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/material-dark/theme/theme.scss b/app/javascript/styles/material-dark/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/material-dark/theme/theme.scss
+++ b/app/javascript/styles/material-dark/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/material-light/color/black.scss
+++ b/app/javascript/styles/material-light/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/material-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-light/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/material-light/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/material-light/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-light/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/material-light/color/plus-classic.scss
+++ b/app/javascript/styles/material-light/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-light/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/material-light/color/v1-dark.scss
+++ b/app/javascript/styles/material-light/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/material-light/color/v1-light.scss
+++ b/app/javascript/styles/material-light/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/material-light/color/v2-dark.scss
+++ b/app/javascript/styles/material-light/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/material-light/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/material-light/color/v2-light.scss
+++ b/app/javascript/styles/material-light/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/material-light/plugins/dense.scss b/app/javascript/styles/material-light/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/material-light/plugins/dense.scss
+++ b/app/javascript/styles/material-light/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/material-light/plugins/plus.scss b/app/javascript/styles/material-light/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/material-light/plugins/plus.scss
+++ b/app/javascript/styles/material-light/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/material-light/theme/basics.scss b/app/javascript/styles/material-light/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/material-light/theme/basics.scss
+++ b/app/javascript/styles/material-light/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/material-light/theme/button.scss
+++ b/app/javascript/styles/material-light/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/material-light/theme/components.scss
+++ b/app/javascript/styles/material-light/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/material-light/theme/emoji-picker.scss b/app/javascript/styles/material-light/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/material-light/theme/emoji-picker.scss
+++ b/app/javascript/styles/material-light/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/material-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/material-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-light/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/media.scss b/app/javascript/styles/material-light/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/material-light/theme/media.scss
+++ b/app/javascript/styles/material-light/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/material-light/theme/statuses.scss b/app/javascript/styles/material-light/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/material-light/theme/statuses.scss
+++ b/app/javascript/styles/material-light/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/material-light/theme/theme.scss b/app/javascript/styles/material-light/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/material-light/theme/theme.scss
+++ b/app/javascript/styles/material-light/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
index b4b29f827..520330822 100644
--- a/app/javascript/styles/plus/color/black.scss
+++ b/app/javascript/styles/plus/color/black.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #1e1e1e;
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
index c765e861c..a098ed86f 100644
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #42485a;
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
index 6c2fef5a6..18daaf44c 100644
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -37,6 +37,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
index ef5900e57..11e682c37 100644
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
index caa0d1b51..7be381ac8 100644
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
index f7a1e66ff..9fe2a1b7e 100644
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
index 5fef3a753..9fc57f153 100644
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: lighten($list-bg-color, 10%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #2e2e2e;
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
index cc2efe2f8..e960d60a8 100644
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -38,6 +38,7 @@ $list-bg-active-color: darken($list-bg-color, 10%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
 $verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
 
 // Chip color
 $contained-chip-color: #e0e0e0;
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
index 5e3d505eb..a6d861c1a 100644
--- a/app/javascript/styles/plus/plugins/dense.scss
+++ b/app/javascript/styles/plus/plugins/dense.scss
@@ -51,6 +51,20 @@
     }
 
     &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
 }
 
 .detailed-status {
diff --git a/app/javascript/styles/plus/plugins/plus.scss b/app/javascript/styles/plus/plugins/plus.scss
index 86a5f3e1e..e356e937b 100644
--- a/app/javascript/styles/plus/plugins/plus.scss
+++ b/app/javascript/styles/plus/plugins/plus.scss
@@ -12,6 +12,10 @@
     .fa { vertical-align: bottom }
 }
 
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
 // favorite icon
 .star-icon.active,
 .star-icon.icon-button.active.activate,
diff --git a/app/javascript/styles/plus/theme/basics.scss b/app/javascript/styles/plus/theme/basics.scss
index 32ba6dc8c..bb8f68bf0 100644
--- a/app/javascript/styles/plus/theme/basics.scss
+++ b/app/javascript/styles/plus/theme/basics.scss
@@ -4,7 +4,8 @@
 @import '../custom_color', '../custom_layout';
 
 
-body { background: $bg-color }
+body,
+body.embed { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
index 6ec2ddd88..d432bfa1d 100644
--- a/app/javascript/styles/plus/theme/button.scss
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -45,6 +45,11 @@
         }
     }
 
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index dd47e9029..6128321f1 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -223,6 +223,7 @@
     color: $secondary-text-color;
     background: $card-bg-color;
     font-size: 16px;
+    contain: initial;  // padding fix
 }
 
 .conversation {
@@ -502,4 +503,9 @@
     opacity: 1;
 }
 
-.attachment-list__list a { color: $secondary-text-color }
\ No newline at end of file
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
index 85c59e9ae..215d9d94d 100644
--- a/app/javascript/styles/plus/theme/components.scss
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -4,7 +4,13 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
-.modal-root { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
 
 .drawer {
     &__header {
@@ -364,6 +370,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 34px }
     }
 
     &__chart {
diff --git a/app/javascript/styles/plus/theme/emoji-picker.scss b/app/javascript/styles/plus/theme/emoji-picker.scss
index 8aacc7e80..91663fb93 100644
--- a/app/javascript/styles/plus/theme/emoji-picker.scss
+++ b/app/javascript/styles/plus/theme/emoji-picker.scss
@@ -60,6 +60,7 @@
             &:focus {
                 @include shadow-2dp;
                 background: $search-bar-focus-color;
+                color: $search-bar-text-color;
             }
         }
     }
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
index b416d3a02..c20a3da9c 100644
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -48,6 +48,7 @@
     &.fa-bookmark,
     &.fa-ellipsis-h,
     &.fa-bell,
+    &.fa-bell-o,
     &.fa-eraser,
     &.fa-users,
     &.fa-file-text,
@@ -76,7 +77,8 @@
     &.fa-quote-right,
     &.fa-upload,
     &.fa-comments,
-    &.fa-angle-right {
+    &.fa-angle-right,
+    &.fa-thumb-tack {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -116,6 +118,7 @@
     &.fa-bookmark::before { content: "bookmark" }
     &.fa-ellipsis-h::before { content: "more_horiz" }
     &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
     &.fa-eraser::before { content: "clear_all" }
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
@@ -145,6 +148,7 @@
     &.fa-upload::before { content: "file_upload" }
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
 }
 
 // bookmark icon
@@ -179,12 +183,16 @@ button.icon-button i.fa-retweet {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
-button.icon-button i.fa-retweet:hover {
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover {
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
 }
 
@@ -242,7 +250,8 @@ button.icon-button.disabled i.fa-retweet:hover {
 }
 
 // status scope
-.status__visibility-icon .fa {
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
index f231eb835..b8ac12414 100644
--- a/app/javascript/styles/plus/theme/media.scss
+++ b/app/javascript/styles/plus/theme/media.scss
@@ -11,29 +11,6 @@
     &__item { border-radius: $media-radius }
 }
 
-.media-modal__close {
-    &.icon-button {
-        background: transparent;
-        color: $media-icon-color;
-        font-size: 24px !important;
-        width: 24px !important;
-        height: 24px !important;
-        padding: 8px;
-        box-sizing: content-box;
-        line-height: normal !important;
-
-        &:hover {
-            background: $media-icon-bg-hover-color;
-            color: $media-icon-hover-color;
-        }
-
-        .fa-fw {
-            width: 24px;
-            height: 24px;
-        }
-    }
-}
-
 .media-modal {
     &__nav {
         background: $media-icon-bg-color;
@@ -53,11 +30,47 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
     &__meta {
         bottom: 24px;
 
         a { color: $media-icon-color }
     }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
 }
 
 .video-player {
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
index e6e5c4021..7e4374014 100644
--- a/app/javascript/styles/plus/theme/statuses.scss
+++ b/app/javascript/styles/plus/theme/statuses.scss
@@ -84,12 +84,19 @@
     }
 
     &__action-bar-button {
-        margin-right: 6px;
+        margin-right: 4px;
 
         &.icon-button {
             @include icon-button;
             padding: 8px;
             box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
         }
     }
 
@@ -253,6 +260,11 @@ a.status-card {
             box-sizing: content-box;
         }
     }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
 }
 
 // search user trends
diff --git a/app/javascript/styles/plus/theme/theme.scss b/app/javascript/styles/plus/theme/theme.scss
index 0980ed92a..367893682 100644
--- a/app/javascript/styles/plus/theme/theme.scss
+++ b/app/javascript/styles/plus/theme/theme.scss
@@ -1,5 +1,5 @@
 /*
-* Mastodon Material 0.2.0
+* Mastodon Material 0.2.1
 * Author: Rintan, Genbu Project
 * Copyright (C) 2020 Rintan, Genbu Project
 */

From b9fb0bc241c90ac2668be40721d2fa390d2893ec Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:12:00 +0900
Subject: [PATCH 079/200] add y-zu theme fix some bugs

---
 .../mastodon-material-dark/color/black.scss   |   3 +-
 .../color/mastodon-dark.scss                  |   3 +-
 .../color/mastodon-light.scss                 |   3 +-
 .../color/plus-classic.scss                   |   3 +-
 .../mastodon-material-dark/color/v1-dark.scss |   3 +-
 .../color/v1-light.scss                       |   3 +-
 .../mastodon-material-dark/color/v2-dark.scss |   3 +-
 .../color/v2-light.scss                       |   3 +-
 .../layout/material-v1.scss                   |   7 +-
 .../layout/material-v2.scss                   |   8 +-
 .../styles/mastodon-material-dark/loader.scss |   1 +
 .../plugins/astarte.scss                      |  26 +
 .../mastodon-material-dark/plugins/dense.scss |   9 +-
 .../mastodon-material-dark/theme/_mixins.scss |  29 +
 .../mastodon-material-dark/theme/account.scss |   2 +-
 .../mastodon-material-dark/theme/button.scss  |   1 +
 .../mastodon-material-dark/theme/columns.scss |   2 +-
 .../theme/components.scss                     |  20 +-
 .../theme/material-icons.scss                 |   3 +
 .../mastodon-material-dark/theme/modal.scss   |   1 +
 .../mastodon-material-light/color/black.scss  |   3 +-
 .../color/mastodon-dark.scss                  |   3 +-
 .../color/mastodon-light.scss                 |   3 +-
 .../color/plus-classic.scss                   |   3 +-
 .../color/v1-dark.scss                        |   3 +-
 .../color/v1-light.scss                       |   3 +-
 .../color/v2-dark.scss                        |   3 +-
 .../color/v2-light.scss                       |   3 +-
 .../layout/material-v1.scss                   |   7 +-
 .../layout/material-v2.scss                   |   8 +-
 .../mastodon-material-light/loader.scss       |   1 +
 .../plugins/astarte.scss                      |  26 +
 .../plugins/dense.scss                        |   9 +-
 .../theme/_mixins.scss                        |  29 +
 .../theme/account.scss                        |   2 +-
 .../mastodon-material-light/theme/button.scss |   1 +
 .../theme/columns.scss                        |   2 +-
 .../theme/components.scss                     |  20 +-
 .../theme/material-icons.scss                 |   3 +
 .../mastodon-material-light/theme/modal.scss  |   1 +
 .../styles/material-black/color/black.scss    |   3 +-
 .../material-black/color/mastodon-dark.scss   |   3 +-
 .../material-black/color/mastodon-light.scss  |   3 +-
 .../material-black/color/plus-classic.scss    |   3 +-
 .../styles/material-black/color/v1-dark.scss  |   3 +-
 .../styles/material-black/color/v1-light.scss |   3 +-
 .../styles/material-black/color/v2-dark.scss  |   3 +-
 .../styles/material-black/color/v2-light.scss |   3 +-
 .../material-black/layout/material-v1.scss    |   7 +-
 .../material-black/layout/material-v2.scss    |   8 +-
 .../styles/material-black/loader.scss         |   1 +
 .../material-black/plugins/astarte.scss       |  26 +
 .../styles/material-black/plugins/dense.scss  |   9 +-
 .../styles/material-black/theme/_mixins.scss  |  29 +
 .../styles/material-black/theme/account.scss  |   2 +-
 .../styles/material-black/theme/button.scss   |   1 +
 .../styles/material-black/theme/columns.scss  |   2 +-
 .../material-black/theme/components.scss      |  20 +-
 .../material-black/theme/material-icons.scss  |   3 +
 .../styles/material-black/theme/modal.scss    |   1 +
 .../styles/material-dark/color/black.scss     |   3 +-
 .../material-dark/color/mastodon-dark.scss    |   3 +-
 .../material-dark/color/mastodon-light.scss   |   3 +-
 .../material-dark/color/plus-classic.scss     |   3 +-
 .../styles/material-dark/color/v1-dark.scss   |   3 +-
 .../styles/material-dark/color/v1-light.scss  |   3 +-
 .../styles/material-dark/color/v2-dark.scss   |   3 +-
 .../styles/material-dark/color/v2-light.scss  |   3 +-
 .../material-dark/layout/material-v1.scss     |   7 +-
 .../material-dark/layout/material-v2.scss     |   8 +-
 .../styles/material-dark/loader.scss          |   1 +
 .../styles/material-dark/plugins/astarte.scss |  26 +
 .../styles/material-dark/plugins/dense.scss   |   9 +-
 .../styles/material-dark/theme/_mixins.scss   |  29 +
 .../styles/material-dark/theme/account.scss   |   2 +-
 .../styles/material-dark/theme/button.scss    |   1 +
 .../styles/material-dark/theme/columns.scss   |   2 +-
 .../material-dark/theme/components.scss       |  20 +-
 .../material-dark/theme/material-icons.scss   |   3 +
 .../styles/material-dark/theme/modal.scss     |   1 +
 .../styles/material-light/color/black.scss    |   3 +-
 .../material-light/color/mastodon-dark.scss   |   3 +-
 .../material-light/color/mastodon-light.scss  |   3 +-
 .../material-light/color/plus-classic.scss    |   3 +-
 .../styles/material-light/color/v1-dark.scss  |   3 +-
 .../styles/material-light/color/v1-light.scss |   3 +-
 .../styles/material-light/color/v2-dark.scss  |   3 +-
 .../styles/material-light/color/v2-light.scss |   3 +-
 .../material-light/layout/material-v1.scss    |   7 +-
 .../material-light/layout/material-v2.scss    |   8 +-
 .../styles/material-light/loader.scss         |   1 +
 .../material-light/plugins/astarte.scss       |  26 +
 .../styles/material-light/plugins/dense.scss  |   9 +-
 .../styles/material-light/theme/_mixins.scss  |  29 +
 .../styles/material-light/theme/account.scss  |   2 +-
 .../styles/material-light/theme/button.scss   |   1 +
 .../styles/material-light/theme/columns.scss  |   2 +-
 .../material-light/theme/components.scss      |  20 +-
 .../material-light/theme/material-icons.scss  |   3 +
 .../styles/material-light/theme/modal.scss    |   1 +
 app/javascript/styles/plus/color/black.scss   |   3 +-
 .../styles/plus/color/mastodon-dark.scss      |   3 +-
 .../styles/plus/color/mastodon-light.scss     |   3 +-
 .../styles/plus/color/plus-classic.scss       |   3 +-
 app/javascript/styles/plus/color/v1-dark.scss |   3 +-
 .../styles/plus/color/v1-light.scss           |   3 +-
 app/javascript/styles/plus/color/v2-dark.scss |   3 +-
 .../styles/plus/color/v2-light.scss           |   3 +-
 .../styles/plus/layout/material-v1.scss       |   7 +-
 .../styles/plus/layout/material-v2.scss       |   8 +-
 app/javascript/styles/plus/loader.scss        |   1 +
 .../styles/plus/plugins/astarte.scss          |  26 +
 app/javascript/styles/plus/plugins/dense.scss |   9 +-
 app/javascript/styles/plus/theme/_mixins.scss |  29 +
 app/javascript/styles/plus/theme/account.scss |   2 +-
 app/javascript/styles/plus/theme/button.scss  |   1 +
 app/javascript/styles/plus/theme/columns.scss |   2 +-
 .../styles/plus/theme/components.scss         |  20 +-
 .../styles/plus/theme/material-icons.scss     |   3 +
 app/javascript/styles/plus/theme/modal.scss   |   1 +
 app/javascript/styles/y-zu-dark.scss          |   2 +
 .../styles/y-zu-dark/color/black.scss         | 146 ++++
 .../styles/y-zu-dark/color/mastodon-dark.scss | 146 ++++
 .../y-zu-dark/color/mastodon-light.scss       | 145 ++++
 .../styles/y-zu-dark/color/plus-classic.scss  | 145 ++++
 .../styles/y-zu-dark/color/v1-dark.scss       | 145 ++++
 .../styles/y-zu-dark/color/v1-light.scss      | 146 ++++
 .../styles/y-zu-dark/color/v2-dark.scss       | 146 ++++
 .../styles/y-zu-dark/color/v2-light.scss      | 146 ++++
 .../styles/y-zu-dark/custom_color.scss        |   4 +
 .../styles/y-zu-dark/custom_config.scss       |   6 +
 .../styles/y-zu-dark/custom_layout.scss       |   8 +
 .../styles/y-zu-dark/icon_config.scss         |  28 +
 .../styles/y-zu-dark/layout/material-v1.scss  |  60 ++
 .../styles/y-zu-dark/layout/material-v2.scss  |  70 ++
 app/javascript/styles/y-zu-dark/loader.scss   |   8 +
 .../styles/y-zu-dark/plugins/astarte.scss     |  26 +
 .../styles/y-zu-dark/plugins/cards.scss       |  38 +
 .../styles/y-zu-dark/plugins/dense.scss       |  87 +++
 .../styles/y-zu-dark/plugins/plus.scss        |  36 +
 .../styles/y-zu-dark/theme/_functions.scss    |   8 +
 .../styles/y-zu-dark/theme/_mixins.scss       | 228 ++++++
 .../styles/y-zu-dark/theme/account.scss       | 196 ++++++
 .../styles/y-zu-dark/theme/base_config.scss   |  46 ++
 .../styles/y-zu-dark/theme/basics.scss        |  27 +
 .../styles/y-zu-dark/theme/button.scss        | 145 ++++
 .../styles/y-zu-dark/theme/columns.scss       | 511 ++++++++++++++
 .../styles/y-zu-dark/theme/components.scss    | 647 ++++++++++++++++++
 .../styles/y-zu-dark/theme/containers.scss    |  57 ++
 .../styles/y-zu-dark/theme/control.scss       |  71 ++
 .../styles/y-zu-dark/theme/emoji-picker.scss  |  83 +++
 .../styles/y-zu-dark/theme/icons.scss         |  26 +
 .../y-zu-dark/theme/material-icons.scss       | 260 +++++++
 .../styles/y-zu-dark/theme/media.scss         | 126 ++++
 .../styles/y-zu-dark/theme/modal.scss         | 104 +++
 .../styles/y-zu-dark/theme/responsive.scss    | 110 +++
 .../styles/y-zu-dark/theme/statuses.scss      | 292 ++++++++
 .../styles/y-zu-dark/theme/theme.scss         |  10 +
 .../styles/y-zu-dark/theme/variables.scss     |   7 +
 .../styles/y-zu-dark/theme/widgets.scss       |  32 +
 app/javascript/styles/y-zu-light.scss         |   2 +
 .../styles/y-zu-light/color/black.scss        | 146 ++++
 .../y-zu-light/color/mastodon-dark.scss       | 146 ++++
 .../y-zu-light/color/mastodon-light.scss      | 145 ++++
 .../styles/y-zu-light/color/plus-classic.scss | 145 ++++
 .../styles/y-zu-light/color/v1-dark.scss      | 145 ++++
 .../styles/y-zu-light/color/v1-light.scss     | 146 ++++
 .../styles/y-zu-light/color/v2-dark.scss      | 146 ++++
 .../styles/y-zu-light/color/v2-light.scss     | 146 ++++
 .../styles/y-zu-light/custom_color.scss       |   5 +
 .../styles/y-zu-light/custom_config.scss      |   6 +
 .../styles/y-zu-light/custom_layout.scss      |   8 +
 .../styles/y-zu-light/icon_config.scss        |  28 +
 .../styles/y-zu-light/layout/material-v1.scss |  60 ++
 .../styles/y-zu-light/layout/material-v2.scss |  70 ++
 app/javascript/styles/y-zu-light/loader.scss  |   8 +
 .../styles/y-zu-light/plugins/astarte.scss    |  26 +
 .../styles/y-zu-light/plugins/cards.scss      |  38 +
 .../styles/y-zu-light/plugins/dense.scss      |  87 +++
 .../styles/y-zu-light/plugins/plus.scss       |  36 +
 .../styles/y-zu-light/theme/_functions.scss   |   8 +
 .../styles/y-zu-light/theme/_mixins.scss      | 228 ++++++
 .../styles/y-zu-light/theme/account.scss      | 196 ++++++
 .../styles/y-zu-light/theme/base_config.scss  |  46 ++
 .../styles/y-zu-light/theme/basics.scss       |  27 +
 .../styles/y-zu-light/theme/button.scss       | 145 ++++
 .../styles/y-zu-light/theme/columns.scss      | 511 ++++++++++++++
 .../styles/y-zu-light/theme/components.scss   | 647 ++++++++++++++++++
 .../styles/y-zu-light/theme/containers.scss   |  57 ++
 .../styles/y-zu-light/theme/control.scss      |  71 ++
 .../styles/y-zu-light/theme/emoji-picker.scss |  83 +++
 .../styles/y-zu-light/theme/icons.scss        |  26 +
 .../y-zu-light/theme/material-icons.scss      | 260 +++++++
 .../styles/y-zu-light/theme/media.scss        | 126 ++++
 .../styles/y-zu-light/theme/modal.scss        | 104 +++
 .../styles/y-zu-light/theme/responsive.scss   | 110 +++
 .../styles/y-zu-light/theme/statuses.scss     | 292 ++++++++
 .../styles/y-zu-light/theme/theme.scss        |  10 +
 .../styles/y-zu-light/theme/variables.scss    |   7 +
 .../styles/y-zu-light/theme/widgets.scss      |  32 +
 config/locales/en.yml                         |   2 +
 config/locales/ja.yml                         |   2 +
 config/themes.yml                             |   2 +
 203 files changed, 9745 insertions(+), 108 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material-dark/plugins/astarte.scss
 create mode 100644 app/javascript/styles/mastodon-material-light/plugins/astarte.scss
 create mode 100644 app/javascript/styles/material-black/plugins/astarte.scss
 create mode 100644 app/javascript/styles/material-dark/plugins/astarte.scss
 create mode 100644 app/javascript/styles/material-light/plugins/astarte.scss
 create mode 100644 app/javascript/styles/plus/plugins/astarte.scss
 create mode 100644 app/javascript/styles/y-zu-dark.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/black.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/plus-classic.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/v1-dark.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/v1-light.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/v2-dark.scss
 create mode 100644 app/javascript/styles/y-zu-dark/color/v2-light.scss
 create mode 100644 app/javascript/styles/y-zu-dark/custom_color.scss
 create mode 100644 app/javascript/styles/y-zu-dark/custom_config.scss
 create mode 100644 app/javascript/styles/y-zu-dark/custom_layout.scss
 create mode 100644 app/javascript/styles/y-zu-dark/icon_config.scss
 create mode 100644 app/javascript/styles/y-zu-dark/layout/material-v1.scss
 create mode 100644 app/javascript/styles/y-zu-dark/layout/material-v2.scss
 create mode 100644 app/javascript/styles/y-zu-dark/loader.scss
 create mode 100644 app/javascript/styles/y-zu-dark/plugins/astarte.scss
 create mode 100644 app/javascript/styles/y-zu-dark/plugins/cards.scss
 create mode 100644 app/javascript/styles/y-zu-dark/plugins/dense.scss
 create mode 100644 app/javascript/styles/y-zu-dark/plugins/plus.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/_functions.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/_mixins.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/account.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/base_config.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/basics.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/button.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/columns.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/components.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/containers.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/control.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/icons.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/material-icons.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/media.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/modal.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/responsive.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/statuses.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/theme.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/variables.scss
 create mode 100644 app/javascript/styles/y-zu-dark/theme/widgets.scss
 create mode 100644 app/javascript/styles/y-zu-light.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/black.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/mastodon-dark.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/mastodon-light.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/plus-classic.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/v1-dark.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/v1-light.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/v2-dark.scss
 create mode 100644 app/javascript/styles/y-zu-light/color/v2-light.scss
 create mode 100644 app/javascript/styles/y-zu-light/custom_color.scss
 create mode 100644 app/javascript/styles/y-zu-light/custom_config.scss
 create mode 100644 app/javascript/styles/y-zu-light/custom_layout.scss
 create mode 100644 app/javascript/styles/y-zu-light/icon_config.scss
 create mode 100644 app/javascript/styles/y-zu-light/layout/material-v1.scss
 create mode 100644 app/javascript/styles/y-zu-light/layout/material-v2.scss
 create mode 100644 app/javascript/styles/y-zu-light/loader.scss
 create mode 100644 app/javascript/styles/y-zu-light/plugins/astarte.scss
 create mode 100644 app/javascript/styles/y-zu-light/plugins/cards.scss
 create mode 100644 app/javascript/styles/y-zu-light/plugins/dense.scss
 create mode 100644 app/javascript/styles/y-zu-light/plugins/plus.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/_functions.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/_mixins.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/account.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/base_config.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/basics.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/button.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/columns.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/components.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/containers.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/control.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/emoji-picker.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/icons.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/material-icons.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/media.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/modal.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/responsive.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/statuses.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/theme.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/variables.scss
 create mode 100644 app/javascript/styles/y-zu-light/theme/widgets.scss

diff --git a/app/javascript/styles/mastodon-material-dark/color/black.scss b/app/javascript/styles/mastodon-material-dark/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/mastodon-material-dark/color/black.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/loader.scss b/app/javascript/styles/mastodon-material-dark/loader.scss
index e962aa921..1ddf9883f 100644
--- a/app/javascript/styles/mastodon-material-dark/loader.scss
+++ b/app/javascript/styles/mastodon-material-dark/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 //@import 'plugins/cards';
 //@import 'plugins/dense';
 //@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/astarte.scss b/app/javascript/styles/mastodon-material-dark/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-dark/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/account.scss b/app/javascript/styles/mastodon-material-dark/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/mastodon-material-light/color/black.scss
+++ b/app/javascript/styles/mastodon-material-light/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/loader.scss b/app/javascript/styles/mastodon-material-light/loader.scss
index e962aa921..1ddf9883f 100644
--- a/app/javascript/styles/mastodon-material-light/loader.scss
+++ b/app/javascript/styles/mastodon-material-light/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 //@import 'plugins/cards';
 //@import 'plugins/dense';
 //@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/astarte.scss b/app/javascript/styles/mastodon-material-light/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/mastodon-material-light/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/mastodon-material-light/theme/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/mastodon-material-light/theme/account.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material-light/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/mastodon-material-light/theme/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/mastodon-material-light/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material-light/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/material-black/color/black.scss
+++ b/app/javascript/styles/material-black/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/material-black/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-black/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/material-black/color/mastodon-light.scss b/app/javascript/styles/material-black/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/material-black/color/mastodon-light.scss
+++ b/app/javascript/styles/material-black/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/material-black/color/plus-classic.scss b/app/javascript/styles/material-black/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/material-black/color/plus-classic.scss
+++ b/app/javascript/styles/material-black/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/material-black/color/v1-dark.scss
+++ b/app/javascript/styles/material-black/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/material-black/color/v1-light.scss
+++ b/app/javascript/styles/material-black/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/color/v2-dark.scss b/app/javascript/styles/material-black/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/material-black/color/v2-dark.scss
+++ b/app/javascript/styles/material-black/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/material-black/color/v2-light.scss
+++ b/app/javascript/styles/material-black/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-black/layout/material-v1.scss b/app/javascript/styles/material-black/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/material-black/layout/material-v1.scss
+++ b/app/javascript/styles/material-black/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v2.scss b/app/javascript/styles/material-black/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/material-black/layout/material-v2.scss
+++ b/app/javascript/styles/material-black/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/loader.scss b/app/javascript/styles/material-black/loader.scss
index e962aa921..1ddf9883f 100644
--- a/app/javascript/styles/material-black/loader.scss
+++ b/app/javascript/styles/material-black/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 //@import 'plugins/cards';
 //@import 'plugins/dense';
 //@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/astarte.scss b/app/javascript/styles/material-black/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/material-black/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/dense.scss b/app/javascript/styles/material-black/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/material-black/plugins/dense.scss
+++ b/app/javascript/styles/material-black/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ b/app/javascript/styles/material-black/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/material-black/theme/account.scss b/app/javascript/styles/material-black/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/material-black/theme/account.scss
+++ b/app/javascript/styles/material-black/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/material-black/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/material-black/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ b/app/javascript/styles/material-black/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/material-black/theme/components.scss b/app/javascript/styles/material-black/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/material-black/theme/components.scss
+++ b/app/javascript/styles/material-black/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/material-icons.scss b/app/javascript/styles/material-black/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/material-black/theme/material-icons.scss
+++ b/app/javascript/styles/material-black/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/material-black/theme/modal.scss b/app/javascript/styles/material-black/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/material-black/theme/modal.scss
+++ b/app/javascript/styles/material-black/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/material-dark/color/black.scss
+++ b/app/javascript/styles/material-dark/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/material-dark/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/material-dark/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/material-dark/color/mastodon-light.scss
+++ b/app/javascript/styles/material-dark/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/material-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/material-dark/color/plus-classic.scss
+++ b/app/javascript/styles/material-dark/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/material-dark/color/v1-dark.scss
+++ b/app/javascript/styles/material-dark/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/material-dark/color/v1-light.scss
+++ b/app/javascript/styles/material-dark/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/material-dark/color/v2-dark.scss
+++ b/app/javascript/styles/material-dark/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/material-dark/color/v2-light.scss
+++ b/app/javascript/styles/material-dark/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-dark/layout/material-v1.scss b/app/javascript/styles/material-dark/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/material-dark/layout/material-v1.scss
+++ b/app/javascript/styles/material-dark/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v2.scss b/app/javascript/styles/material-dark/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/material-dark/layout/material-v2.scss
+++ b/app/javascript/styles/material-dark/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/loader.scss b/app/javascript/styles/material-dark/loader.scss
index e962aa921..1ddf9883f 100644
--- a/app/javascript/styles/material-dark/loader.scss
+++ b/app/javascript/styles/material-dark/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 //@import 'plugins/cards';
 //@import 'plugins/dense';
 //@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/astarte.scss b/app/javascript/styles/material-dark/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/material-dark/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/dense.scss b/app/javascript/styles/material-dark/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/material-dark/plugins/dense.scss
+++ b/app/javascript/styles/material-dark/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/material-dark/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/material-dark/theme/account.scss b/app/javascript/styles/material-dark/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/material-dark/theme/account.scss
+++ b/app/javascript/styles/material-dark/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ b/app/javascript/styles/material-dark/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ b/app/javascript/styles/material-dark/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/material-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/material-dark/theme/components.scss
+++ b/app/javascript/styles/material-dark/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/material-dark/theme/material-icons.scss
+++ b/app/javascript/styles/material-dark/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/material-dark/theme/modal.scss b/app/javascript/styles/material-dark/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/material-dark/theme/modal.scss
+++ b/app/javascript/styles/material-dark/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/material-light/color/black.scss
+++ b/app/javascript/styles/material-light/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/material-light/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/material-light/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/material-light/color/mastodon-light.scss
+++ b/app/javascript/styles/material-light/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/material-light/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/material-light/color/plus-classic.scss
+++ b/app/javascript/styles/material-light/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/material-light/color/v1-dark.scss
+++ b/app/javascript/styles/material-light/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/material-light/color/v1-light.scss
+++ b/app/javascript/styles/material-light/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/material-light/color/v2-dark.scss
+++ b/app/javascript/styles/material-light/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/material-light/color/v2-light.scss
+++ b/app/javascript/styles/material-light/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/material-light/layout/material-v1.scss b/app/javascript/styles/material-light/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/material-light/layout/material-v1.scss
+++ b/app/javascript/styles/material-light/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v2.scss b/app/javascript/styles/material-light/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/material-light/layout/material-v2.scss
+++ b/app/javascript/styles/material-light/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/loader.scss b/app/javascript/styles/material-light/loader.scss
index e962aa921..1ddf9883f 100644
--- a/app/javascript/styles/material-light/loader.scss
+++ b/app/javascript/styles/material-light/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 //@import 'plugins/cards';
 //@import 'plugins/dense';
 //@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/astarte.scss b/app/javascript/styles/material-light/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/material-light/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/dense.scss b/app/javascript/styles/material-light/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/material-light/plugins/dense.scss
+++ b/app/javascript/styles/material-light/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ b/app/javascript/styles/material-light/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/material-light/theme/account.scss b/app/javascript/styles/material-light/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/material-light/theme/account.scss
+++ b/app/javascript/styles/material-light/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/material-light/theme/button.scss
+++ b/app/javascript/styles/material-light/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ b/app/javascript/styles/material-light/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/material-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/material-light/theme/components.scss
+++ b/app/javascript/styles/material-light/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/material-light/theme/material-icons.scss
+++ b/app/javascript/styles/material-light/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/material-light/theme/modal.scss b/app/javascript/styles/material-light/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/material-light/theme/modal.scss
+++ b/app/javascript/styles/material-light/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
index 520330822..693caa813 100644
--- a/app/javascript/styles/plus/color/black.scss
+++ b/app/javascript/styles/plus/color/black.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #1e1e1e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
index a098ed86f..b2e6bf27a 100644
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ b/app/javascript/styles/plus/color/mastodon-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($primary-color, 18%);
 
 // Border color
 $border-color: #393f4f;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 16%);
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
index 18daaf44c..7e94b8de7 100644
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ b/app/javascript/styles/plus/color/mastodon-light.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($primary-color, 26%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: #ccd7e0;
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
index 11e682c37..d94bbe90f 100644
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ b/app/javascript/styles/plus/color/plus-classic.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
index 7be381ac8..d31fbf04f 100644
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ b/app/javascript/styles/plus/color/v1-dark.scss
@@ -102,7 +102,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
index 9fe2a1b7e..2888e81b4 100644
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ b/app/javascript/styles/plus/color/v1-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
index 9fc57f153..025b238f5 100644
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ b/app/javascript/styles/plus/color/v2-dark.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #2e2e2e;
-$border-active-color: lighten($border-color, 30%);
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: lighten($bg-color, 20%);
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
index e960d60a8..fd9469961 100644
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ b/app/javascript/styles/plus/color/v2-light.scss
@@ -103,7 +103,8 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
 $border-color: #dadce0;
-$border-active-color: darken($border-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
 
 // Scroll bar color
 $scroll-bar-thumb-color: darken($bg-color, 20%);
diff --git a/app/javascript/styles/plus/layout/material-v1.scss b/app/javascript/styles/plus/layout/material-v1.scss
index d3a2f4847..23c9a0616 100644
--- a/app/javascript/styles/plus/layout/material-v1.scss
+++ b/app/javascript/styles/plus/layout/material-v1.scss
@@ -52,4 +52,9 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 
 
 // Floating Action Button size
-$fab-size: 56px;
\ No newline at end of file
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
index 7c6b0c968..5700a99c8 100644
--- a/app/javascript/styles/plus/layout/material-v2.scss
+++ b/app/javascript/styles/plus/layout/material-v2.scss
@@ -61,4 +61,10 @@ $button-shadow: false;  // Material v2 styled colored button without shadow
 
 // Floating Action Button size
 $fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
\ No newline at end of file
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/loader.scss b/app/javascript/styles/plus/loader.scss
index 80df5cab0..804d14f3e 100644
--- a/app/javascript/styles/plus/loader.scss
+++ b/app/javascript/styles/plus/loader.scss
@@ -2,6 +2,7 @@
 @import 'theme/material-icons';
 
 // Plugins
+@import 'plugins/astarte';
 @import 'plugins/cards';
 @import 'plugins/dense';
 @import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/astarte.scss b/app/javascript/styles/plus/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/plus/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
index a6d861c1a..413336d04 100644
--- a/app/javascript/styles/plus/plugins/dense.scss
+++ b/app/javascript/styles/plus/plugins/dense.scss
@@ -35,7 +35,14 @@
 }
 
 .compose-form {
-    .compose-form__publish { padding-top: 8px }
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
 }
 
 .status {
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
index 3980fbc9b..fcd556f2b 100644
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ b/app/javascript/styles/plus/theme/_mixins.scss
@@ -61,6 +61,35 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
 @mixin icon-button {
     width: 20px !important;
     height: 20px !important;
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
index 0765930e6..551b4f4a8 100644
--- a/app/javascript/styles/plus/theme/account.scss
+++ b/app/javascript/styles/plus/theme/account.scss
@@ -18,7 +18,7 @@
 
         &-overlay {
             &-base {
-                border-radius: 50%;
+                border-radius: $avater-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
index d432bfa1d..5f909d843 100644
--- a/app/javascript/styles/plus/theme/button.scss
+++ b/app/javascript/styles/plus/theme/button.scss
@@ -4,6 +4,7 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
 @include button-shadow;
 
 .icon-button {
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
index 6128321f1..77a5c777a 100644
--- a/app/javascript/styles/plus/theme/columns.scss
+++ b/app/javascript/styles/plus/theme/columns.scss
@@ -379,7 +379,7 @@
 
 .announcements {
     background: $card-bg-color;
-    padding: 0;
+    padding: 0 8px;
 
     &__container { color: $primary-text-color }
 
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
index 215d9d94d..aa64aabc5 100644
--- a/app/javascript/styles/plus/theme/components.scss
+++ b/app/javascript/styles/plus/theme/components.scss
@@ -4,6 +4,9 @@
 @import '../custom_color', '../custom_layout';
 @import 'mixins';
 
+
+@include text-area-border;
+
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
@@ -200,7 +203,7 @@
         &__textarea {
             background: $text-field-bg-color;
             color: $ui-text-color;
-            border-radius: $card-radius;
+            padding: 8px 42px 8px 16px;
     
             &::placeholder { color: $tips-text-color }
         }
@@ -227,13 +230,18 @@
     }
 
     .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 8px }
+        &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
             color: $ui-text-color;
             background: $card-bg-color;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -299,7 +307,7 @@
                 background-color: $bg-color;
                 border: 0;
 
-                &:focus { border-color: $border-active-color }
+                &:focus { border-color: $border-hover-color }
             }
 
             .button.button-secondary {
@@ -357,7 +365,7 @@
         border: 1px solid $border-color;
         padding: 8px 12px;
     
-        &:focus { border-color: $border-active-color }
+        &:focus { border-color: $border-hover-color }
     }
 
     &__option {
@@ -634,4 +642,6 @@
         border-radius: 0;
         background: $progress-indicator-color;
     }
-}
\ No newline at end of file
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
index c20a3da9c..dd01ce3d6 100644
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ b/app/javascript/styles/plus/theme/material-icons.scss
@@ -243,6 +243,9 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // read more icon
 .status__content__read-more-button .fa { vertical-align: bottom }
 
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
index e9a9176ea..93e5b24c1 100644
--- a/app/javascript/styles/plus/theme/modal.scss
+++ b/app/javascript/styles/plus/theme/modal.scss
@@ -42,6 +42,7 @@
 }
 
 .actions-modal {
+    @include shadow-24dp;
     background: $card-bg-color;
     border-radius: $card-radius;
 
diff --git a/app/javascript/styles/y-zu-dark.scss b/app/javascript/styles/y-zu-dark.scss
new file mode 100644
index 000000000..90bfe0053
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'y-zu-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/black.scss b/app/javascript/styles/y-zu-dark/color/black.scss
new file mode 100644
index 000000000..693caa813
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/black.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss b/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
new file mode 100644
index 000000000..b2e6bf27a
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/mastodon-light.scss b/app/javascript/styles/y-zu-dark/color/mastodon-light.scss
new file mode 100644
index 000000000..7e94b8de7
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/mastodon-light.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/plus-classic.scss b/app/javascript/styles/y-zu-dark/color/plus-classic.scss
new file mode 100644
index 000000000..d94bbe90f
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/plus-classic.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v1-dark.scss b/app/javascript/styles/y-zu-dark/color/v1-dark.scss
new file mode 100644
index 000000000..d31fbf04f
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/v1-dark.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($bg-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v1-light.scss b/app/javascript/styles/y-zu-dark/color/v1-light.scss
new file mode 100644
index 000000000..2888e81b4
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/v1-light.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v2-dark.scss b/app/javascript/styles/y-zu-dark/color/v2-dark.scss
new file mode 100644
index 000000000..025b238f5
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/v2-dark.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v2-light.scss b/app/javascript/styles/y-zu-dark/color/v2-light.scss
new file mode 100644
index 000000000..fd9469961
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/color/v2-light.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $primary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
+
+// App bar color
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_color.scss b/app/javascript/styles/y-zu-dark/custom_color.scss
new file mode 100644
index 000000000..b4ac46881
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/custom_color.scss
@@ -0,0 +1,4 @@
+@charset "UTF-8";
+
+
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_config.scss b/app/javascript/styles/y-zu-dark/custom_config.scss
new file mode 100644
index 000000000..e974e139c
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/custom_config.scss
@@ -0,0 +1,6 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+
+@import "color/v2-dark.scss";
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_layout.scss b/app/javascript/styles/y-zu-dark/custom_layout.scss
new file mode 100644
index 000000000..fb9dbbe00
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/custom_layout.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+
+
+// Add your customization below
+
+$avater-radius: 2px;
+
+$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/icon_config.scss b/app/javascript/styles/y-zu-dark/icon_config.scss
new file mode 100644
index 000000000..99046e176
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/icon_config.scss
@@ -0,0 +1,28 @@
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
+
+
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/layout/material-v1.scss b/app/javascript/styles/y-zu-dark/layout/material-v1.scss
new file mode 100644
index 000000000..23c9a0616
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/layout/material-v1.scss
@@ -0,0 +1,60 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Media radius settings
+$media-radius: 0;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
+// Button shadow
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/layout/material-v2.scss b/app/javascript/styles/y-zu-dark/layout/material-v2.scss
new file mode 100644
index 000000000..5700a99c8
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/layout/material-v2.scss
@@ -0,0 +1,70 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
+
+
+// Button shadow
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/loader.scss b/app/javascript/styles/y-zu-dark/loader.scss
new file mode 100644
index 000000000..f51dde3e4
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/loader.scss
@@ -0,0 +1,8 @@
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+@import 'plugins/astarte';
+//@import 'plugins/cards';
+@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/astarte.scss b/app/javascript/styles/y-zu-dark/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/cards.scss b/app/javascript/styles/y-zu-dark/plugins/cards.scss
new file mode 100644
index 000000000..d9b3906a5
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/plugins/cards.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+
+    > .scrollable { background: $bg-color }
+}
+
+.status {
+    border-bottom: 0;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/dense.scss b/app/javascript/styles/y-zu-dark/plugins/dense.scss
new file mode 100644
index 000000000..413336d04
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/plugins/dense.scss
@@ -0,0 +1,87 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
+    &__buttons { height: 48px }
+
+    &__button { margin: 6px }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
+}
+
+.status {
+    padding: 8px 8px 4px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.reply-indicator { padding: 8px }
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/plus.scss b/app/javascript/styles/y-zu-dark/plugins/plus.scss
new file mode 100644
index 000000000..e356e937b
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/plugins/plus.scss
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/_functions.scss b/app/javascript/styles/y-zu-dark/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/_mixins.scss b/app/javascript/styles/y-zu-dark/theme/_mixins.scss
new file mode 100644
index 000000000..fcd556f2b
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/_mixins.scss
@@ -0,0 +1,228 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/account.scss b/app/javascript/styles/y-zu-dark/theme/account.scss
new file mode 100644
index 000000000..551b4f4a8
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/account.scss
@@ -0,0 +1,196 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+    padding: 16px;
+
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: $avater-radius;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
+    &__header {
+        &__bar {
+            background: $card-bg-color;
+            padding: 8px;
+            border-bottom: none;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    @include icon-button;
+                    border: none;
+                    border-radius: 50%;
+                    padding: 8px;
+                    margin-left: 8px;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-bg-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-bg-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
+        &__content { color: $secondary-text-color }
+    }
+
+    &__section-headline {
+        background: $text-tab-bg-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-bg-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-bg-hover-color }
+        }
+    }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/base_config.scss b/app/javascript/styles/y-zu-dark/theme/base_config.scss
new file mode 100644
index 000000000..f36a139ba
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/base_config.scss
@@ -0,0 +1,46 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+$search-bar-hover: false;
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in "../"
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/basics.scss b/app/javascript/styles/y-zu-dark/theme/basics.scss
new file mode 100644
index 000000000..bb8f68bf0
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/basics.scss
@@ -0,0 +1,27 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+body,
+body.embed { background: $bg-color }
+
+.focusable:focus { background: transparent }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/button.scss b/app/javascript/styles/y-zu-dark/theme/button.scss
new file mode 100644
index 000000000..5f909d843
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/button.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+@include button-shadow;
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &.active { color: $icon-button-active-color }
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-bg-hover-color;
+        }
+
+        &:focus { background-color: transparent }
+    }
+
+    &.overlayed {
+        @include icon-button;
+        border-radius: 50%;
+        background: $media-icon-bg-color;
+        color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
+    
+        &:hover {
+            background: $media-icon-bg-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
+    &:hover {
+        @include material-transition;
+        color: $icon-button-hover-color;
+        background-color: $icon-bg-hover-color;
+    }
+
+    &:focus { background-color: transparent }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
+
+    &:hover {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
+
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
+
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
+
+    &.button--block { margin: 8px 0 }
+
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
+
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-bg-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/columns.scss b/app/javascript/styles/y-zu-dark/theme/columns.scss
new file mode 100644
index 000000000..77a5c777a
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/columns.scss
@@ -0,0 +1,511 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+    height: 56px;
+
+    > button {
+        padding: 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $top-bar-unread-icon-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        @include icon-button;
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: 10px;
+        border-radius: 50%;
+        box-sizing: content-box;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-bg-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-bg-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+        opacity: $bar-transparency;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-bg-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-bg-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $bg-color;
+    padding: 12px 16px;
+    margin-top: 8px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $bg-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-bg-hover-color }
+
+    &:active,
+    &:focus { background: $list-bg-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-bg-active-color;
+
+            &:hover { background: $menu-bg-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-bg-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.columns-area {
+    @include bg-image;
+    background-size: contain;
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $text-field-bg-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-bg-color;
+    font-size: 16px;
+    contain: initial;  // padding fix
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-bg-inactive-color;
+
+    &--unread {
+        background: $list-bg-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-bg-hover-color }
+}
+
+.getting-started {
+    background: $bg-color;
+    color: $ui-text-color;
+    opacity: $column-transparency;
+
+    &__wrapper {
+        background: $bg-color;
+        height: auto !important;
+        padding-bottom: 8px;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $bg-color;
+        margin-bottom: 0;
+        opacity: $column-transparency;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            margin-top: 8px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-bg-color;
+    padding: 0 8px;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+
+    &__pagination {
+        color: $ui-text-color;
+        padding: 16px;
+        bottom: 0;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
+        }
+
+        span { vertical-align: super }
+    }
+}
+
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
+@include outlined-chip;
+
+.reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 12px 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-bg-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+        opacity: $bar-transparency;
+    
+        button {
+            background: $tab-bg-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-bg-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $relationship-tag-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/components.scss b/app/javascript/styles/y-zu-dark/theme/components.scss
new file mode 100644
index 000000000..aa64aabc5
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/components.scss
@@ -0,0 +1,647 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+@include text-area-border;
+
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+        opacity: $bar-transparency;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-bg-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-bg-color;
+        opacity: $column-transparency;
+
+        &.darker {
+            background: $card-bg-color;
+            position: inherit;
+        }
+
+        &__mastodon { background: $card-bg-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &:hover { @include search-bar-hover }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 16px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-bg-color;
+        padding: 16px;
+
+        .fa { margin-right: 16px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.flex-spacer { margin: 8px 0 }
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-bg-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-bg-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-bg-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $text-field-bg-color;
+            color: $ui-text-color;
+            padding: 8px 42px 8px 16px;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-bg-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-bg-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-bg-active-color }
+            }
+        }
+    }
+
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 16px }
+
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+    
+            &::placeholder { color: $tips-text-color }
+        }
+    }
+
+    .compose-form {
+        &__warning {
+            color: $secondary-text-color;
+            background: $card-bg-color;
+            padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
+            box-shadow: none;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-bg-color;
+            color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
+        }
+
+        &__buttons-wrapper {
+            background: $card-bg-color;
+            color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                @include icon-button;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 16px 12px 16px 0 }
+
+            select {
+                color: $ui-text-color;
+                background-color: $bg-color;
+                border: 0;
+
+                &:focus { border-color: $border-hover-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $text-button-color;
+
+                &:hover { background-color: $text-button-hover-color }
+
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
+            }
+
+            .poll__footer { border-top: none }
+        }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
+
+
+.poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
+    &__input {
+        border: none;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
+
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
+
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $text-field-bg-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-hover-color }
+    }
+
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
+
+        &__text { line-height: 34px }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+    
+        &.leading { background: $progress-indicator-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-bg-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-bg-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-bg-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-bg-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    box-shadow: none;
+    border: 1px solid $border-color;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-bg-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $bg-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-bg-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-bg-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-bg-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/containers.scss b/app/javascript/styles/y-zu-dark/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/control.scss b/app/javascript/styles/y-zu-dark/theme/control.scss
new file mode 100644
index 000000000..a205a4cb7
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/control.scss
@@ -0,0 +1,71 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss b/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
new file mode 100644
index 000000000..91663fb93
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
@@ -0,0 +1,83 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $menu-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-bg-color;
+        }
+    }
+
+    &-anchor {
+        color: $text-tab-indicator-color;
+        padding: 10px 4px;
+
+        &-bar { background-color: $icon-tab-indicator-active-color }
+
+        &-selected { color: $icon-tab-indicator-hover-color }
+
+        &:hover { color: $icon-tab-indicator-hover-color }
+    }
+
+    &-search {
+        background: $menu-bg-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+                color: $search-bar-text-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-bg-color;
+    }
+
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
+
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/icons.scss b/app/javascript/styles/y-zu-dark/theme/icons.scss
new file mode 100644
index 000000000..987767544
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/icons.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+.fa.fa-lock { text-transform: none }
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/material-icons.scss b/app/javascript/styles/y-zu-dark/theme/material-icons.scss
new file mode 100644
index 000000000..dd01ce3d6
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/material-icons.scss
@@ -0,0 +1,260 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
+@import 'functions';
+@import 'mixins';
+
+
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-bell-o,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check,
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments,
+    &.fa-angle-right,
+    &.fa-thumb-tack {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: $reply-icon }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "person_remove" }
+    &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
+// boost icon
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
+    transition: none;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/media.scss b/app/javascript/styles/y-zu-dark/theme/media.scss
new file mode 100644
index 000000000..b8ac12414
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/media.scss
@@ -0,0 +1,126 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.media-gallery {
+    border-radius: $media-radius;
+
+    &__item { border-radius: $media-radius }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-bg-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            @include material-transition;
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            @include material-transition;
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/modal.scss b/app/javascript/styles/y-zu-dark/theme/modal.scss
new file mode 100644
index 000000000..93e5b24c1
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/modal.scss
@@ -0,0 +1,104 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.confirmation-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-bg-color;
+        padding: 8px;
+    }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.actions-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-bg-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-bg-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/responsive.scss b/app/javascript/styles/y-zu-dark/theme/responsive.scss
new file mode 100644
index 000000000..8618f7ed7
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/responsive.scss
@@ -0,0 +1,110 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
+    }
+}
+
+//single column mode
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: transparent;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
+        }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/statuses.scss b/app/javascript/styles/y-zu-dark/theme/statuses.scss
new file mode 100644
index 000000000..7e4374014
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/statuses.scss
@@ -0,0 +1,292 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 4px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: $name-font-size;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: $status-font-size;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        p { margin-bottom: 16px }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 4px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
+        }
+    }
+
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+
+    &__visibility-icon { color: $icon-color }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+    margin-top: 16px;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-bg-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
+}
+
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-bg-color;
+    padding: 16px;
+
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-bg-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
+    }
+
+    &__button {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color }
+    &__account { color: $secondary-text-color }
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/theme.scss b/app/javascript/styles/y-zu-dark/theme/theme.scss
new file mode 100644
index 000000000..367893682
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/theme.scss
@@ -0,0 +1,10 @@
+/*
+* Mastodon Material 0.2.1
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/variables.scss b/app/javascript/styles/y-zu-dark/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/widgets.scss b/app/javascript/styles/y-zu-dark/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/y-zu-dark/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light.scss b/app/javascript/styles/y-zu-light.scss
new file mode 100644
index 000000000..c769a7cef
--- /dev/null
+++ b/app/javascript/styles/y-zu-light.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'y-zu-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/black.scss b/app/javascript/styles/y-zu-light/color/black.scss
new file mode 100644
index 000000000..693caa813
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/black.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #000000;
+$menu-bg-color: #121212;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #121212;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #000000;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #1e1e1e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #121212;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #1e1e1e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #1e1e1e;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #121212;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/mastodon-dark.scss b/app/javascript/styles/y-zu-light/color/mastodon-dark.scss
new file mode 100644
index 000000000..b2e6bf27a
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/mastodon-dark.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9baec8;
+$ui-text-color: #fff;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #606984;
+$tips-text-color: #6d7889;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4ea2df;
+$menu-text-color: #282c37;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #191b22;
+$menu-bg-color: #d9e1e8;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #313543;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #282c37;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #42485a;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #393f4f;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#42485a, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #9baec8;
+$icon-hover-color: lighten($icon-color, 30%);
+$icon-bg-hover-color: lighten($bg-color, 14%);
+$icon-bg-active-color: lighten($bg-color, 18%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #fff;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.7);
+$text-button-focus-color: transparentize($text-button-color, 0.6);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($primary-color, 18%);
+
+// Border color
+$border-color: #393f4f;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 16%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
+
+// App bar color
+$top-bar-color: #313543;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: #d9e1e8;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: #1f232b;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/mastodon-light.scss b/app/javascript/styles/y-zu-light/color/mastodon-light.scss
new file mode 100644
index 000000000..7e94b8de7
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/mastodon-light.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #2b90d9;
+$secondary-color: #2b90d9;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #217aba;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #eff3f5;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($bg-color, 6%);
+$menu-bg-active-color: darken($bg-color, 10%);
+$menu-bg-active-hover-color: darken($bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #282c37;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: darken($bg-color, 4%);
+$icon-bg-active-color: darken($bg-color, 8%);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $icon-hover-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: lighten($text-button-color, 36%);
+$text-button-focus-color: lighten($text-button-color, 30%);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($primary-color, 26%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: #ccd7e0;
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #ffffff;
+$search-bar-color: #d9e1e8;
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: #282c37;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: #e6ebf0;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $tab-indicator-color;
+$text-tab-indicator-active-color: $tab-indicator-active-color;
+$text-tab-bg-color: $tab-bg-color;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/plus-classic.scss b/app/javascript/styles/y-zu-light/color/plus-classic.scss
new file mode 100644
index 000000000..d94bbe90f
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/plus-classic.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $secondary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #db4437;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v1-dark.scss b/app/javascript/styles/y-zu-light/color/v1-dark.scss
new file mode 100644
index 000000000..d31fbf04f
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/v1-dark.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #303030;
+$menu-bg-color: #424242;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #424242;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #424242;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
+$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
+
+// App bar color
+$top-bar-color: #1565C0;
+$search-bar-color: lighten($bg-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #424242;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v1-light.scss b/app/javascript/styles/y-zu-light/color/v1-light.scss
new file mode 100644
index 000000000..2888e81b4
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/v1-light.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $inverted-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #fafafa;
+$menu-bg-color: #ffffff;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: #ffffff;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: #ffffff;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: #ffffff;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$top-bar-unread-icon-color: darken($primary-color, 30%);
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #2196f3;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $top-bar-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v2-dark.scss b/app/javascript/styles/y-zu-light/color/v2-dark.scss
new file mode 100644
index 000000000..025b238f5
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/v2-dark.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: dark;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #ffffff;
+$secondary-text-color: #9aa0a6;
+$ui-text-color: #e8eaed;
+$inverted-text-color: #000000;
+$section-text-color: $primary-color;
+$info-text-color: #9aa0a6;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $inverted-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #121212;
+$menu-bg-color: #1e1e1e;
+$menu-bg-hover-color: lighten($menu-bg-color, 6%);
+$menu-bg-active-color: lighten($menu-bg-color, 10%);
+$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
+$card-bg-color: #1e1e1e;
+$card-bg-hover-color: lighten($card-bg-color, 6%);
+$list-bg-color: #1e1e1e;
+$list-bg-hover-color: lighten($list-bg-color, 6%);
+$list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-inactive-color: lighten($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: darken($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #2e2e2e;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: lighten($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #1e1e1e;
+$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#2e2e2e, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #e2e2e3;
+$icon-hover-color: #ffffff;
+$icon-bg-hover-color: transparentize(#ffffff, 0.8);
+$icon-bg-active-color: transparentize(#ffffff, 0.7);
+$disabled-icon-color: darken($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #2e2e2e;
+$border-hover-color: lighten($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: lighten($bg-color, 20%);
+$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
+
+// App bar color
+$top-bar-color: #272727;
+$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-focus-color: #ffffff;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #1e1e1e;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v2-light.scss b/app/javascript/styles/y-zu-light/color/v2-light.scss
new file mode 100644
index 000000000..fd9469961
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/color/v2-light.scss
@@ -0,0 +1,146 @@
+@charset "UTF-8";
+
+
+$color-scheme: light;
+
+// Base color
+$primary-color: #4285f4;
+$secondary-color: #db4437;
+$error-color: #B00020;
+$verified-color: #4caf50;
+
+// Text color
+$primary-text-color: #000000;
+$secondary-text-color: #5f6368;
+$ui-text-color: #202124;
+$inverted-text-color: #ffffff;
+$section-text-color: $primary-color;
+$info-text-color: #5e5e5e;
+$tips-text-color: #c0c0c0;
+$disabled-text-color: rgba(0,0,0,.54);
+$link-text-color: #4285f4;
+$menu-text-color: $ui-text-color;
+$top-bar-text-color: $ui-text-color;
+$search-bar-text-color: $primary-text-color;
+$contained-button-text-color: #ffffff;
+
+// Background-color
+$bg-color: #ffffff;
+$menu-bg-color: $bg-color;
+$menu-bg-hover-color: darken($menu-bg-color, 6%);
+$menu-bg-active-color: darken($menu-bg-color, 10%);
+$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
+$card-bg-color: $bg-color;
+$card-bg-hover-color: darken($card-bg-color, 6%);
+$list-bg-color: $bg-color;
+$list-bg-hover-color: darken($list-bg-color, 6%);
+$list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-inactive-color: darken($list-bg-color, 10%);
+$text-field-bg-color: $card-bg-color;
+$verified-bg-color: lighten($verified-color, 20%);
+$unread-bg-color: transparentize($primary-color, 0.8);
+
+// Chip color
+$contained-chip-color: #e0e0e0;
+$chip-selected-text-color: $primary-color;
+$contained-chip-hover-color: darken($contained-chip-color, 6%);
+$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
+$outlined-chip-color: #ffffff;
+$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
+$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
+$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
+
+// Relationship tag color
+$relationship-tag-color: transparentize(#e0e0e0, 0.2);
+
+// Badge color
+$badge-color: $primary-color;
+//$badge-color: $secondary-color;
+
+// Icon color
+$icon-color: #757575;
+$icon-hover-color: darken($icon-color, 30%);
+$icon-bg-hover-color: transparentize(#000000, 0.9);
+$icon-bg-active-color: transparentize(#000000, 0.8);
+$disabled-icon-color: lighten($icon-color, 16%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+$top-bar-unread-icon-color: $secondary-color;
+$media-icon-color: transparentize(#ffffff, 0.4);
+$media-icon-hover-color: transparentize(#ffffff, 0.2);
+$media-icon-bg-color: transparentize(#000000, 0.5);
+$media-icon-bg-hover-color: transparentize(#000000, 0.8);
+
+// Control color
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+// Button color
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: lighten($primary-color, 36%);
+$outlined-button-active-color: lighten($primary-color, 30%);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-color: #ffffff;
+$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
+$floating-action-button-active-color: darken($floating-action-button-color, 10%);
+$floating-action-button-icon-color: $primary-color;
+
+// Toggle color
+$toggle-thumb-color: #ffffff;
+$toggle-track-color: darken($toggle-thumb-color, 18%);
+$toggle-thumb-active-color: #1a73e8;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+// Border color
+$border-color: #dadce0;
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+// Scroll bar color
+$scroll-bar-thumb-color: darken($bg-color, 20%);
+$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
+$scroll-bar-thumb-active-color: darken($bg-color, 38%);
+
+// App bar color
+$top-bar-color: $bg-color;
+$search-bar-color: darken($bg-color, 6%);
+$search-bar-focus-color: $bg-color;
+
+// Tab color
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-bg-color: $top-bar-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$text-tab-indicator-color: $secondary-text-color;
+$text-tab-indicator-active-color: $ui-text-color;
+$text-tab-bg-color: #ffffff;
+$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
+$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+// Media indicator color
+$media-page-indicator-color: #9e9e9e;
+$media-page-indicator-active-color: #e6e6e6;
+
+// Progress indicator color
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+
+// Contents color in read status
+$read-primary-text-color: transparentize($primary-text-color, 0.3);
+$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
+$read-ui-text-color: transparentize($ui-text-color, 0.3);
+$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
+$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_color.scss b/app/javascript/styles/y-zu-light/custom_color.scss
new file mode 100644
index 000000000..7ace77932
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/custom_color.scss
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+
+// Add your customization below
+$bg-color: #fafafa;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_config.scss b/app/javascript/styles/y-zu-light/custom_config.scss
new file mode 100644
index 000000000..84a5a659a
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/custom_config.scss
@@ -0,0 +1,6 @@
+@charset "UTF-8";
+
+
+// Add your settings below
+
+@import "color/v2-light.scss";
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_layout.scss b/app/javascript/styles/y-zu-light/custom_layout.scss
new file mode 100644
index 000000000..fb9dbbe00
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/custom_layout.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+
+
+// Add your customization below
+
+$avater-radius: 2px;
+
+$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/icon_config.scss b/app/javascript/styles/y-zu-light/icon_config.scss
new file mode 100644
index 000000000..99046e176
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/icon_config.scss
@@ -0,0 +1,28 @@
+// Favorite icon settings
+$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
+//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
+//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
+
+$favorite-icon-color: #ffd600;  // Star
+//$favorite-icon-color: #ff4081;  // Heart
+//$favorite-icon-color: #db4437;  // +1
+//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
+
+
+// Reply icon settings
+$reply-icon: "reply";
+//$reply-icon: "comment";  // blooming
+
+
+// Material Design Icon settings
+// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
+//$icon-font-source: google;  // Google Fonts
+//$icon-font-source: github;  // GitHub
+$icon-font-source: self;  // Self-hosting
+
+// Material Icon style settings
+$icon-font-style: filled;
+//$icon-font-style: outlined;
+//$icon-font-style: round;
+//$icon-font-style: sharp;
+//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/layout/material-v1.scss b/app/javascript/styles/y-zu-light/layout/material-v1.scss
new file mode 100644
index 000000000..23c9a0616
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/layout/material-v1.scss
@@ -0,0 +1,60 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 2px;
+
+
+// Search bar radius
+$search-bar-radius: 2px;
+
+
+// Bar radius settings
+$bar-radius: 0;
+
+
+// Button radius settings
+$button-radius: 2px;
+
+
+// Card radius settings
+$card-radius: 2px;
+
+
+// Dialog radius settings
+$dialog-radius: 2px;
+
+
+// Menu radius settings
+$menu-radius: 2px;
+
+
+// Media radius settings
+$media-radius: 0;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 0;
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 2px  // Material v1 square
+
+
+// Chip settings
+$outlined-chip: false;  // Material v1 styled contained chip
+
+
+// Button shadow
+$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/layout/material-v2.scss b/app/javascript/styles/y-zu-light/layout/material-v2.scss
new file mode 100644
index 000000000..5700a99c8
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/layout/material-v2.scss
@@ -0,0 +1,70 @@
+@charset "UTF-8";
+@import '../theme/mixins';
+
+
+// Navigation bar radius
+$nav-bar-radius: 8px;
+//$nav-bar-radius: 28px;  // full radius
+
+
+// Search bar radius
+$search-bar-radius: 8px;
+//$search-bar-radius: 21px;  // full rounded
+
+
+// Bar radius settings
+$bar-radius: 0;
+//$bar-radius: 8px;
+
+
+// Button radius settings
+$button-radius: 8px;
+
+
+// Card radius settings
+$card-radius: 8px;
+
+
+// Dialog radius settings
+$dialog-radius: 8px;
+
+
+// Menu radius settings
+$menu-radius: 8px;
+
+
+// Media radius settings
+$media-radius: 0;
+//$media-radius: 2px;
+
+
+// Navigation drawer item settings
+$nav-drawer-item-radius: 8px;  // corner rounded
+//$nav-drawer-item-radius: 32px;  // full rounded
+//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
+
+
+// Avater cropping settings
+$avater-radius: 50%;  // Rounded cropping
+//$avater-radius: 8px  // Material v2 square
+
+
+// Chip settings
+$outlined-chip: true;  // Material v2 styled outlined chip
+//$outlined-chip: false;  // Material v1 styled contained chip
+
+
+// Button shadow
+$button-shadow: false;  // Material v2 styled colored button without shadow
+//$button-shadow: true;  // Material v1 styled colored button with shadow
+
+
+// Floating Action Button size
+$fab-size: 56px;  // Regular
+//$fab-size: 40px;  // Mini
+
+
+// Text area border
+$text-area-border: false;
+//$text-area-border: underlined;
+//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/loader.scss b/app/javascript/styles/y-zu-light/loader.scss
new file mode 100644
index 000000000..f51dde3e4
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/loader.scss
@@ -0,0 +1,8 @@
+@import 'theme/theme';
+@import 'theme/material-icons';
+
+// Plugins
+@import 'plugins/astarte';
+//@import 'plugins/cards';
+@import 'plugins/dense';
+//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/astarte.scss b/app/javascript/styles/y-zu-light/plugins/astarte.scss
new file mode 100644
index 000000000..8c2e534bb
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/plugins/astarte.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.announcements {
+    li {
+        padding: 8px 16px;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
+    }
+
+    &__icon {
+        margin: 0;
+        right: 16px;
+        height: 20px;
+
+        .icon-button {
+            @include icon-button;
+
+            &:hover { background: transparent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/cards.scss b/app/javascript/styles/y-zu-light/plugins/cards.scss
new file mode 100644
index 000000000..d9b3906a5
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/plugins/cards.scss
@@ -0,0 +1,38 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import '../theme/mixins';
+
+
+.column {
+    box-shadow: none !important;
+    margin: 2px 0 !important;
+    padding: 8px !important;
+
+    > .scrollable { background: $bg-color }
+}
+
+.status {
+    border-bottom: 0;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+
+    &__prepend { padding: 8px 8px 2px 0 }
+}
+
+.account { border-bottom: 0 !important }
+
+.status__wrapper.status__wrapper,
+.notification.notification {
+    @include shadow-1dp;
+    margin: 8px 2px;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+}
+
+.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+
+.notification__filter-bar {
+    @include non-overflow-shadow-4dp;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/dense.scss b/app/javascript/styles/y-zu-light/plugins/dense.scss
new file mode 100644
index 000000000..413336d04
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/plugins/dense.scss
@@ -0,0 +1,87 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.drawer {
+    &__header { height: 48px }
+
+    &__tab { margin: 6px auto 6px }
+}
+
+.column { margin: 10px 5px }
+
+.column-header {
+    height: 48px;
+
+    > button { padding: 12px 16px }
+    
+    &__buttons { height: 48px }
+
+    &__button { margin: 6px }
+}
+
+.column-subheading { padding: 8px 16px }
+
+.column-link { padding: 12px 16px }
+
+.notification__filter-bar button { padding: 12px 0 }
+
+.getting-started__footer {
+    padding: 12px 16px;
+
+    p { margin-bottom: 12px }
+}
+
+.compose-form {
+    .compose-form {
+        &__publish { padding-top: 8px }
+
+        &__buttons-wrapper {
+            .icon-button,
+            .text-icon-button { padding: 4px }
+        }
+    }
+}
+
+.status {
+    padding: 8px 8px 4px 66px;
+
+    &__expand { width: 66px }
+
+    &__info { padding-right: 0 }
+
+    &__avatar {
+        left: 8px;
+        top: 10px;
+    }
+
+    &__content { padding-top: 2px }
+
+    &__action-bar-button {
+        margin: 0 4px;
+
+        &.icon-button { padding: 4px }
+    }
+
+    &__action-bar-dropdown {
+        width: 28px !important;
+        height: 28px !important;
+        margin: 0 4px;
+
+        .icon-button { padding: 4px }
+    }
+}
+
+.detailed-status {
+    padding: 14px;
+
+    &__meta { margin-top: 14px }
+
+    &__action-bar { padding: 10px 0 }
+}
+
+.reply-indicator { padding: 8px }
+
+.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/plus.scss b/app/javascript/styles/y-zu-light/plugins/plus.scss
new file mode 100644
index 000000000..e356e937b
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/plugins/plus.scss
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+@import '../theme/base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.status__action-bar-button {
+    background: #eeeeee;
+    width: 28px !important;
+    height: 28px !important;
+
+    .fa { vertical-align: bottom }
+}
+
+// exception
+.media-modal__overlay .picture-in-picture__footer .icon-button,
+.status__action-bar-button.icon-button--with-counter { background: transparent }
+
+// favorite icon
+.star-icon.active,
+.star-icon.icon-button.active.activate,
+.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
+
+.notification__favourite-icon-wrapper {
+    left: -34px;
+
+    .star-icon {
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        vertical-align: baseline;
+        font-size: 18px;
+
+        &.fa-fw::before { vertical-align: middle }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/_functions.scss b/app/javascript/styles/y-zu-light/theme/_functions.scss
new file mode 100644
index 000000000..0374231ed
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/_functions.scss
@@ -0,0 +1,8 @@
+@charset "UTF-8";
+@use "sass:string";
+
+
+// convert hex color code to svg styled ascii color code
+@function svg-color ($color) {
+    @return '%23' + string.slice(inspect($color), 2, 7);
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/_mixins.scss b/app/javascript/styles/y-zu-light/theme/_mixins.scss
new file mode 100644
index 000000000..fcd556f2b
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/_mixins.scss
@@ -0,0 +1,228 @@
+@charset "UTF-8";
+
+
+$shadow-color-1: rgba(0,0,0,.2);
+$shadow-color-2: rgba(0,0,0,.14);
+$shadow-color-3: rgba(0,0,0,.12);
+
+@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
+@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
+@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
+@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
+@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
+@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
+@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
+@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
+@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
+@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
+@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
+@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
+@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
+@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
+@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
+@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
+@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
+@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
+@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
+@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
+@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
+@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
+@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
+@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
+
+@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
+
+@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+
+@mixin search-bar-hover {
+    @if $search-bar-hover {
+        @include shadow-2dp;
+        background: $search-bar-focus-color;
+    }
+}
+
+@mixin outlined-chip {
+    @if $outlined-chip {
+        .reactions-bar__item {
+            background: $outlined-chip-color !important;
+            border: 1px solid $outlined-chip-selected-border-color !important;
+        
+            &.active { background-color: $outlined-chip-selected-color !important }
+        
+            &:hover { background: $outlined-chip-hover-color !important }
+        }
+    }
+}
+
+@mixin button-shadow {
+    @if $button-shadow {
+        .button,
+        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
+    }
+}
+
+@mixin text-area-border {
+    @if $text-area-border == underlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius $card-radius 0 0;
+            border-bottom: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+        }
+    }
+
+    @if $text-area-border == outlined {
+        .compose-form .autosuggest-textarea__textarea {
+            border-radius: $card-radius;
+            border: 1px solid $border-color;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus {
+                border: 2px solid $border-active-color;
+                padding: 7px 41px 7px 15px;
+            }
+        }
+    }
+}
+
+@mixin icon-button {
+    width: 20px !important;
+    height: 20px !important;
+    font-size: 20px !important;
+}
+
+// check background-image value
+@mixin bg-image {
+    @if $bg-image == none {        
+    } @else { background-image: url($bg-image) }
+}
+
+
+@mixin icon-font-style {
+    @if $icon-font-style == filled { font-family: "Material Icons" }
+    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
+    @if $icon-font-style == round { font-family: "Material Icons Round" }
+    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
+    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
+}
+
+@mixin icon-font {
+    @if $icon-font-source == github {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+
+    @if $icon-font-source == google {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons Round"),
+                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
+            }
+        }
+    }
+
+    @if $icon-font-source == self {
+        @if $icon-font-style == filled {
+            @font-face {
+                font-family: "Material Icons";
+                src: local("Material Icons"),
+                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
+            }
+        }
+        @if $icon-font-style == outlined {
+            @font-face {
+                font-family: "Material Icons Outlined";
+                src: local("Material Icons Outlined"),
+                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == round {
+            @font-face {
+                font-family: "Material Icons Round";
+                src: local("Material Icons"),
+                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == sharp {
+            @font-face {
+                font-family: "Material Icons Sharp";
+                src: local("Material Icons Sharp"),
+                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
+            }
+        }
+        @if $icon-font-style == two-tone {
+            @font-face {
+                font-family: "Material Icons Two Tone";
+                src: local("Material Icons Two Tone"),
+                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/account.scss b/app/javascript/styles/y-zu-light/theme/account.scss
new file mode 100644
index 000000000..551b4f4a8
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/account.scss
@@ -0,0 +1,196 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.account {
+    border-bottom: 1px solid $border-color;
+    padding: 16px;
+
+    .account__display-name,
+    .account__display-name strong { color: $primary-text-color }
+
+    &__avatar {
+        border-radius: $avater-radius;
+        width: 40px;
+        height: 40px;
+
+        &-overlay {
+            &-base {
+                border-radius: $avater-radius;
+                width: 44px;
+                height: 44px;
+                background-size: 44px;
+            }
+
+            &-overlay { border-radius: $avater-radius }
+        }
+    }
+
+    &__avatar-wrapper {
+        margin-left: 0;
+        margin-right: 16px;
+    }
+
+    &__header {
+        &__bar {
+            background: $card-bg-color;
+            padding: 8px;
+            border-bottom: none;
+
+            .avatar .account__avatar { border: none }
+        }
+
+        &__tabs {
+            padding: 8px;
+
+            &__name {
+                padding: 8px;
+
+                h1 {
+                    color: $primary-text-color;
+
+                    small { color: $secondary-text-color }
+                }
+            }
+
+            &__buttons {
+                .icon-button {
+                    @include icon-button;
+                    border: none;
+                    border-radius: 50%;
+                    padding: 8px;
+                    margin-left: 8px;
+                }
+            }
+        }
+
+        &__extra {
+            margin-top: 0;
+
+            &__links {
+                color: $secondary-text-color;
+                padding: 10px 0;
+
+                a {
+                    color: $secondary-text-color;
+                    padding: 4px 12px;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &__bio {
+            margin: 0;
+
+            .account__header {
+                &__content {
+                    color: $primary-text-color;
+                    padding: 8px;
+                }
+
+                &__fields {
+                    border: 1px solid $border-color;
+                    border-radius: 4px;
+
+                    .verified {
+                        border: none;
+                        background: $verified-bg-color;
+
+                        a,
+                        &__mark { color: $primary-text-color }
+                    }
+
+                    dl {
+                        border-bottom: 1px solid $border-color;
+
+                        &:first-child .verified { border-radius: 0 }
+
+                        &:last-child { border-bottom: 0 }
+                    }
+
+                    dt {
+                        color: $primary-text-color;
+                        background: $list-bg-inactive-color;
+                    }
+
+                    dd { color: $primary-text-color }
+                }
+            }
+        }
+
+        &__account-note {
+            padding: 8px 16px;
+            border-bottom: 1px solid $border-color;
+
+            label {
+                color: $ui-text-color;
+                margin-bottom: 8px;
+            }
+
+            textarea {
+                color: $primary-text-color;
+                padding: 8px 16px;
+                border-radius: 0;
+
+                &:focus { background: transparent }
+
+                &::placeholder { color: $tips-text-color }
+            }
+        }
+
+        &__content { color: $secondary-text-color }
+    }
+
+    &__section-headline {
+        background: $text-tab-bg-color;
+        border-bottom: 1px solid $border-color;
+
+        a {
+            padding: 16px 0;
+            color: $text-tab-indicator-color;
+
+            &.active {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 4px solid $text-tab-indicator-active-color;
+
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $text-tab-indicator-bg-focus-color }
+            }
+
+            &:hover { background: $text-tab-indicator-bg-hover-color }
+        }
+    }
+
+    &__relationship {
+        padding: 0;
+        height: auto;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+}
+
+.account-role {
+    padding: 4px 8px;
+    border-radius: 17px;
+    color: $ui-text-color;
+    background-color: $contained-chip-color;
+}
+
+.accounts-table__count {
+    color: $ui-text-color;
+
+    small { color: $secondary-text-color }
+}
+
+.account-gallery {
+    &__item { border-radius: 0 }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/base_config.scss b/app/javascript/styles/y-zu-light/theme/base_config.scss
new file mode 100644
index 000000000..f36a139ba
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/base_config.scss
@@ -0,0 +1,46 @@
+@charset "UTF-8";
+
+
+// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
+
+
+// Color scheme
+@import '../color/v1-light';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'color/v2-light';
+
+
+// Layout profile
+@import '../layout/material-v1';
+// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
+// @import 'layout/material-v2';
+
+
+// Search bar hover settings
+// You can enable/disable search bar floating.
+$search-bar-hover: false;
+
+
+// Status font size in timeline
+$status-font-size: 15px;  // mastodon default
+//$status-font-size: 16px;  // compatible with material design
+
+
+// Name font size in timeline status
+$name-font-size: 15px;  // mastodon default
+//$name-font-size: 16px;  // compatible with material design
+
+
+// Background image
+// If you want to use the local image, please put it in "../"
+$bg-image: none;
+//$bg-image: "./image.png";
+//$bg-image: "https://example.com/img/image.png";
+
+
+// Columns transparency settings
+$bar-transparency: 1.0;  // opacity
+//$bar-transparency: 0.8;  // semi-transparent
+
+$column-transparency: 1.0;  // opacity
+//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/basics.scss b/app/javascript/styles/y-zu-light/theme/basics.scss
new file mode 100644
index 000000000..bb8f68bf0
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/basics.scss
@@ -0,0 +1,27 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+body,
+body.embed { background: $bg-color }
+
+.focusable:focus { background: transparent }
+
+// Chrome & Safari scroll bar
+::-webkit-scrollbar-thumb {
+    background: $scroll-bar-thumb-color;
+
+    &:hover { background: $scroll-bar-thumb-hover-color }
+    &:active { background: $scroll-bar-thumb-active-color }
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background: transparent !important;
+}
+
+// Firefox scroll bar
+html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/button.scss b/app/javascript/styles/y-zu-light/theme/button.scss
new file mode 100644
index 000000000..5f909d843
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/button.scss
@@ -0,0 +1,145 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+@include button-shadow;
+
+.icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+
+    &.active {
+        color: $icon-button-active-color;
+
+        &:hover { color: $icon-button-active-hover-color }
+    }
+
+    &.disabled { color: $disabled-icon-color }
+
+    &.inverted {
+        color: $icon-button-color;
+
+        &.active { color: $icon-button-active-color }
+
+        &:hover {
+            color: $icon-button-hover-color;
+            background-color: $icon-bg-hover-color;
+        }
+
+        &:focus { background-color: transparent }
+    }
+
+    &.overlayed {
+        @include icon-button;
+        border-radius: 50%;
+        background: $media-icon-bg-color;
+        color: $media-icon-color;
+        padding: 4px;
+        line-height: 20px !important;
+    
+        &:hover {
+            background: $media-icon-bg-color;
+            color: $media-icon-hover-color;
+        }
+    }
+
+    &__counter {
+        width: 16px;
+        margin-left: 8px;
+    }
+
+    &:hover {
+        @include material-transition;
+        color: $icon-button-hover-color;
+        background-color: $icon-bg-hover-color;
+    }
+
+    &:focus { background-color: transparent }
+}
+
+// Checkbox with label
+label.icon-button {
+    &.active {
+        color: $ui-text-color;
+        background-color: transparent;
+    }
+
+    &:hover {
+        @include material-transition;
+        background-color: transparent;
+    }
+}
+
+.text-icon-button {
+    color: $icon-button-color;
+    border-radius: 50%;
+    font-size: 14px;
+
+    &.active {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-active-color;
+    }
+
+    &:hover {
+        background-color: $icon-bg-hover-color;
+        color: $icon-button-hover-color;
+    }
+}
+
+.button {
+    background-color: $contained-button-color;
+    border-radius: $button-radius;
+
+    &:active,
+    &:focus {
+        background-color: $contained-button-color;
+        border-radius: $button-radius;
+    }
+
+    &:hover {
+        @include shadow-2dp;
+        background-color: $contained-button-hover-color;
+    }
+
+    &.logo-button {
+        background: $contained-button-color;
+        margin: 2px;
+    
+        &:hover { background: $contained-button-hover-color }
+    
+        .button--destructive:hover { background: $contained-button-hover-color }
+    }
+
+    &.button--block { margin: 8px 0 }
+
+    &.button-secondary {
+        color: $text-button-color;
+        border: none;
+        box-shadow: none;
+    
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+    }
+
+    &.confirmation-modal__cancel-button {
+        box-shadow: none;
+        background-color: transparent;
+        margin: 0 8px;
+        color: $text-button-color;
+    
+        &:hover { background: $text-button-hover-color }
+    
+        &:focus { background: $text-button-focus-color }
+    }
+}
+
+.spoiler-button__overlay__label {
+    background: $media-icon-bg-color;
+    border-radius: $button-radius;
+    color: $media-icon-color;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/columns.scss b/app/javascript/styles/y-zu-light/theme/columns.scss
new file mode 100644
index 000000000..77a5c777a
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/columns.scss
@@ -0,0 +1,511 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.column {
+    @include shadow-1dp;
+    padding: 0;
+    margin: 10px 8px;
+    border-radius: $card-radius;
+
+    &>.scrollable {
+        background: $list-bg-color;
+        opacity: $column-transparency;
+    }
+
+    &:last-child { box-shadow: none }
+}
+
+.column-header {
+    background: $top-bar-color;
+    border-radius: $bar-radius;
+    height: 56px;
+
+    > button {
+        padding: 16px;
+        color: $top-bar-text-color;
+    }
+
+    &>.column-header__back-button { color: $top-bar-icon-color }
+
+    &.active {
+        .column-header__icon {
+            color: $top-bar-unread-icon-color;
+            text-shadow: none;
+        }
+    }
+
+    &__icon {
+        margin-right: 16px;
+        color: $top-bar-icon-color;
+        font-size: 20px;
+    }
+
+    &__buttons { height: 56px }
+
+    &__button {
+        @include icon-button;
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        padding: 8px;
+        margin: 10px;
+        border-radius: 50%;
+        box-sizing: content-box;
+
+        &.active {
+            color: $top-bar-icon-active-color;
+            background: $icon-bg-active-color;
+
+            &:hover {
+                color: $top-bar-icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
+        }
+
+        &:hover {
+            color: $top-bar-icon-hover-color;
+            background: $icon-bg-hover-color;
+        }
+    }
+
+    &__setting-btn {
+        color: $icon-button-color;
+        padding: 8px 0;
+
+        &:hover {
+            color: $icon-button-hover-color;
+            text-decoration: none;
+        }
+
+        .fa { font-size: 20px }
+
+        span { vertical-align: middle }
+    }
+
+    &__setting-arrows {
+        font-size: 16px;
+        border-bottom: 8px;
+
+        .column-header__setting-btn {
+            padding: 8px;
+            border-radius: 50%;
+
+            &:last-child { padding-right: 8px }
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        border-radius: $bar-radius;
+        opacity: $bar-transparency;
+
+        .announcements { border-top: 1px solid $border-color }
+
+        &.active {
+            @include shadow-4dp;
+
+            &::before { background: transparent }
+        }
+    }
+
+    &__collapsible {
+        color: $ui-text-color;
+        background: $card-bg-color;
+        border-top: 1px solid $border-color;
+
+        &-inner {
+            background: $card-bg-color;
+            padding: 16px;
+        }
+
+        &.collapsed { border-top: none }
+    }
+
+    &__back-button {
+        background: $top-bar-color;
+        color: $top-bar-icon-color;
+        margin: 8px 10px;
+        padding: 10px;
+        font-size: 20px;
+
+        span { display: none }
+    }
+}
+
+.column-subheading {
+    color: $section-text-color;
+    background: $bg-color;
+    padding: 12px 16px;
+    margin-top: 8px;
+    border-top: 1px solid $border-color;
+}
+
+.column-link {
+    color: $ui-text-color;
+    background: $bg-color;
+    padding: 16px;
+    border-radius: $nav-drawer-item-radius;
+
+    &:hover { background: $list-bg-hover-color }
+
+    &:active,
+    &:focus { background: $list-bg-active-color }
+
+    &__icon {
+        margin-right: 32px;
+        font-size: 20px;
+    }
+
+    &--transparent {
+        &.active {
+            color: $ui-text-color;
+            background: $menu-bg-active-color;
+
+            &:hover { background: $menu-bg-active-hover-color }
+    
+            .fa { color: $icon-color }
+        }
+
+        &:hover {
+            color: $ui-text-color;
+
+            .fa { color: $icon-color }
+        }
+    }
+
+    .fa { color: $icon-color }
+}
+
+.column-settings {
+    &__section {
+        color: $section-text-color;
+        margin-bottom: 0;
+        margin-top: 8px;
+    }
+
+    &__row .text-btn { margin-bottom: 0 }
+}
+
+.column-back-button {
+    @include shadow-4dp;
+    background: $top-bar-color;
+    color: $top-bar-icon-color;
+    padding: 16px;
+
+    span { visibility: hidden }  // hide "back" string
+
+    &--slim-button { top: -54px }
+}
+
+.column-inline-form {
+    padding: 16px 0 16px 16px;
+    background: $card-bg-color;
+
+    .icon-button { margin: 0 16px }
+}
+
+.columns-area {
+    @include bg-image;
+    background-size: contain;
+}
+
+.setting-text {
+    color: $primary-text-color;
+    background: $text-field-bg-color;
+    border-radius: $bar-radius;
+
+    &::placeholder { color: $tips-text-color }
+}
+
+.empty-column-indicator {
+    color: $secondary-text-color;
+    background: $card-bg-color;
+    font-size: 16px;
+    contain: initial;  // padding fix
+}
+
+.conversation {
+    border-bottom: 1px solid $border-color;
+    padding: 12px;
+    background: $list-bg-inactive-color;
+
+    &--unread {
+        background: $list-bg-color;
+
+        .conversation__content__relative-time { color: $info-text-color }
+    }
+
+    &__unread { background: $primary-color }
+
+    &__avatar { padding: 0 16px 0 0 }
+
+    &__content {
+        padding: 0;
+
+        &__relative-time {
+            font-size: 14px;
+            color: $info-text-color;
+        }
+
+        &__names,
+        &__names a {
+            color: $primary-text-color;
+            font-size: 16px;
+        }
+    }
+}
+
+// read status in notification column
+.muted {
+    .status {
+        &__content {
+            color: $read-primary-text-color;
+    
+            p { color: $read-primary-text-color }
+    
+            a { color: $read-secondary-text-color }
+        }
+
+        &__display-name strong { color: $read-primary-text-color }
+    }
+
+    .poll {
+        color: $read-primary-text-color;
+
+        &__chart {
+            background: $read-poll-bar-color;
+    
+            &.leading { background: $read-poll-bar-leading-color }
+        }
+
+        &__footer,
+        &__link { color: $read-ui-text-color }
+    }
+}
+
+.load-gap { border-bottom: 1px solid $border-color }
+
+.load-more {
+    color: $icon-color;
+    padding: 16px;
+
+    &:hover { background: $menu-bg-hover-color }
+}
+
+.getting-started {
+    background: $bg-color;
+    color: $ui-text-color;
+    opacity: $column-transparency;
+
+    &__wrapper {
+        background: $bg-color;
+        height: auto !important;
+        padding-bottom: 8px;
+        border-bottom: 1px solid $border-color;
+    }
+
+    &__footer {
+        padding: 16px;
+        
+        p {
+            color: $secondary-text-color;
+            font-size: 12px;
+            margin-bottom: 16px;
+        }
+
+        a { color: $ui-text-color }
+
+        p a { color: $link-text-color }
+    }
+
+    &__trends {
+        background: $bg-color;
+        margin-bottom: 0;
+        opacity: $column-transparency;
+
+        h4 {
+            color: $section-text-color;
+            padding: 12px 16px;
+            margin-top: 8px;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+        }
+    }
+}
+
+.trends {
+    &__header {
+        color: $section-text-color;
+        background: transparent;
+        border-bottom: 1px solid $border-color;
+        padding: 16px;
+
+        .fa { margin-right: 8px }
+    }
+
+    &__item {
+        padding: 16px;
+        border-bottom: none;
+    
+        &__name {
+            color: $secondary-text-color;
+            font-size: 12px;
+    
+            a { color: $primary-text-color }
+        }
+    
+        &__current {
+            padding-right: 16px;
+            margin-left: 4px;
+            color: $secondary-text-color;
+        }
+    
+        &__sparkline path {
+            stroke: $primary-color;
+            fill: $primary-color;
+            fill-opacity: 0.5;
+        }
+    }
+}
+
+.setting-toggle {
+    &__label {
+        color: $ui-text-color;
+        margin: 8px 8px 8px 14px;
+    }
+}
+
+.announcements {
+    background: $card-bg-color;
+    padding: 0 8px;
+
+    &__container { color: $primary-text-color }
+
+    &__item {
+        padding: 16px;
+        font-size: 16px;
+
+        &__unread { background: $badge-color }
+    }
+
+    &__pagination {
+        color: $ui-text-color;
+        padding: 16px;
+        bottom: 0;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            margin: 0 4px;
+            line-height: normal !important;
+            box-sizing: content-box;
+        }
+
+        span { vertical-align: super }
+    }
+}
+
+.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
+
+@include outlined-chip;
+
+.reactions-bar {
+    margin-top: 16px;
+    width: calc(100% - 72px);
+
+    .emoji-button {
+        color: $icon-button-color;
+        font-size: 20px;
+
+        &:hover { color: $icon-button-hover-color }
+
+        &:active { color: $icon-button-active-color }
+    }
+
+    &__item {
+        background: $contained-chip-color;
+        border-radius: 17px;
+        margin: 2px 4px;
+
+        &.active {
+            background-color: $contained-chip-selected-color;
+
+            .reactions-bar__item__count { color: $chip-selected-text-color }
+
+            &:hover { background-color: $contained-chip-selected-color }
+        }
+
+        &__emoji {
+            width: 24px;
+            height: 24px;
+            margin: 4px 0 4px 2px;
+        }
+
+        &__count {
+            font-size: 16px;
+            margin: 0 12px 0 8px;
+            color: $secondary-text-color;
+        }
+
+        &:hover { background: $contained-chip-hover-color }
+    }
+}
+
+.notification {
+    &__filter-bar {
+        background: $tab-bg-color;
+        border-bottom: 1px solid $border-color;
+        z-index: 1;
+        opacity: $bar-transparency;
+    
+        button {
+            background: $tab-bg-color;
+            color: $tab-indicator-color;
+            font-size: 16px;
+
+            span { font-size: 14px }
+    
+            &.active {
+                color: $tab-indicator-active-color;
+                border-bottom: 4px solid $tab-indicator-active-color;
+    
+                &::before,
+                &:after { border: none }
+
+                &:focus { background: $tab-indicator-bg-focus-color }
+            }
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+    }
+
+    &__message {
+        color: $secondary-text-color;
+        margin: 0 16px 0 70px;
+        font-size: 16px;
+    }
+
+    &__display-name:hover { color: inherit }
+}
+
+.notification-favourite .status.status-direct {
+    .icon-button.disabled { color: $disabled-icon-color }
+}
+
+.relationship-tag {
+    color: $ui-text-color;
+    background-color: $relationship-tag-color;
+    font-size: 12px;
+    border-radius: 17px;
+    padding: 4px 8px;
+    opacity: 1;
+}
+
+.attachment-list__list a { color: $secondary-text-color }
+
+// unread notification
+.notification.unread:before, .status__wrapper.unread:before { border-left: none }
+
+.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/components.scss b/app/javascript/styles/y-zu-light/theme/components.scss
new file mode 100644
index 000000000..aa64aabc5
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/components.scss
@@ -0,0 +1,647 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+@include text-area-border;
+
+.modal-root {
+    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
+
+    &__overlay { background-color: rgba(0,0,0,.32) !important }
+
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+}
+
+.drawer {
+    &__header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        justify-content: space-around;
+        opacity: $bar-transparency;
+    
+        a { transition: none }
+    
+        a:hover {
+            background: $icon-bg-hover-color;
+            border-radius: 50%;
+        }
+    }
+
+    &__tab {
+        color: $top-bar-icon-color;
+        font-size: 20px;
+        margin: 10px auto 10px;
+        padding: 8px;
+        flex: none;
+        height: 20px;
+        width: 20px;
+        border-bottom: none;
+        text-align: justify;
+    
+        &:hover { color: $top-bar-icon-hover-color }
+    }
+
+    &__pager {
+        @include shadow-1dp;
+        border-radius: $card-radius;
+    }
+
+    &__inner {
+        background: $card-bg-color;
+        opacity: $column-transparency;
+
+        &.darker {
+            background: $card-bg-color;
+            position: inherit;
+        }
+
+        &__mastodon { background: $card-bg-color }
+    }
+}
+
+.search {
+    &__input {
+        background: $search-bar-color;
+        color: $tips-text-color;
+        border-radius: $search-bar-radius;
+        padding: 12px 12px 12px 40px;
+        opacity: $bar-transparency;
+
+        &:focus {
+            @include shadow-2dp;
+            background: $search-bar-focus-color;
+            color: $search-bar-text-color;
+        }
+
+        &:hover { @include search-bar-hover }
+
+        &::placeholder { color: $tips-text-color }
+    }
+
+    &__icon {
+        .fa {
+            color: $icon-color;
+            font-size: 20px;
+            top: 12px;
+            right: unset;
+            left: 12px;
+            height: 6px;
+            transition: none;
+
+            &.active { opacity: 1 }
+
+            &-search {
+                transform: none;
+                opacity: 1;
+            }
+            &-times-circle.active {
+                right: 16px;
+                left: unset;
+                transform: none;
+            }
+        }
+    }
+}
+
+.search-popout {
+    @include shadow-2dp;
+    background: $search-bar-focus-color;
+    border-radius: 0px $bar-radius;
+    border-top: 1px solid $border-color;
+    margin-top: 0;
+    color: $tips-text-color;
+
+    h4 {
+        color: $secondary-text-color;
+    }
+
+    em {
+        color: $search-bar-text-color;
+    }
+}
+
+.search-results {
+    &__header {
+        color: $secondary-text-color;
+        background-color: $card-bg-color;
+        padding: 16px;
+
+        .fa { margin-right: 16px }
+    }
+
+    &__section {
+        h5 {
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            padding: 16px;
+            color: $section-text-color;
+
+            .fa { margin-right: 8px }
+        }
+    }
+}
+
+.navigation-bar {
+    color: $secondary-text-color;
+    padding: 14px;
+
+    strong {
+        color: $ui-text-color;
+    }
+
+    .navigation-bar__actions .compose__action-bar .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+
+        &.active {
+            color: $icon-hover-color;
+            background: $icon-bg-active-color;
+        }
+    }
+}
+
+.navigation-panel hr {
+    border-top: 1px solid $border-color;
+    margin: 8px 0;
+}
+
+.flex-spacer { margin: 8px 0 }
+
+.dropdown-menu {
+    @include shadow-8dp;
+    background: $menu-bg-color;
+    padding: 8px 0;
+    border-radius: $menu-radius;
+
+    &__arrow { visibility: hidden }
+
+    &__item a {
+        font-size: 14px;
+        padding: 8px 16px;
+        background: $menu-bg-color;
+        color: $menu-text-color;
+
+        &:hover, &:active {
+            background: $menu-bg-hover-color;
+            color: $menu-text-color;
+        }
+    }
+
+    &__separator {
+        margin: 8px 0;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.compose-form {
+    .autosuggest-textarea {
+        &__textarea {
+            background: $text-field-bg-color;
+            color: $ui-text-color;
+            padding: 8px 42px 8px 16px;
+    
+            &::placeholder { color: $tips-text-color }
+        }
+
+        &__suggestions {
+            @include shadow-1dp;
+            background: $menu-bg-color;
+            color: $ui-text-color;
+            border-radius: $card-radius;
+            font-size: 16px;
+            padding: 8px 0;
+
+            &__item {
+                padding: 8px;
+                border-radius: 0;
+
+                &:hover { background: $menu-bg-hover-color }
+
+                &.selected,
+                &:focus,
+                &:active { background: $menu-bg-active-color }
+            }
+        }
+    }
+
+    .spoiler-input {
+        &.spoiler-input--visible { margin-bottom: 16px }
+
+        &__input {
+            color: $ui-text-color;
+            background: $card-bg-color;
+            border-bottom: 1px solid $border-color;
+            border-radius: 0;
+
+            &:hover { border-color: $border-hover-color }
+
+            &:active,
+            &:focus { border-bottom: 2px solid $border-active-color }
+    
+            &::placeholder { color: $tips-text-color }
+        }
+    }
+
+    .compose-form {
+        &__warning {
+            color: $secondary-text-color;
+            background: $card-bg-color;
+            padding: 16px;
+            border: 1px solid $border-color;
+            border-radius: $card-radius;
+            box-shadow: none;
+
+            a { color: $link-text-color }
+        }
+
+        &__modifiers {
+            background: $card-bg-color;
+            color: $tips-text-color;
+
+            .compose-form {
+                &__upload-thumbnail { border-radius: 0 }
+
+                &__upload__actions {
+                    @include material-transition;
+
+                    .icon-button {
+                        color: $media-icon-color;
+                        font-size: 16px;
+
+                        &:hover { background-color: transparent }
+                    }
+                }
+            }
+        }
+
+        &__buttons-wrapper {
+            background: $card-bg-color;
+            color: $tips-text-color;
+            padding: 8px;
+
+            .icon-button {
+                @include icon-button;
+                padding: 8px;
+            }
+
+            .text-icon-button {
+                width: 20px !important;
+                height: 20px !important;
+                padding: 8px;
+                line-height: 20px !important;
+            }
+        }
+
+        &__poll-wrapper {
+            border-top: 1px solid $border-color;
+
+            ul { padding: 16px 12px 16px 0 }
+
+            select {
+                color: $ui-text-color;
+                background-color: $bg-color;
+                border: 0;
+
+                &:focus { border-color: $border-hover-color }
+            }
+
+            .button.button-secondary {
+                box-shadow: none;
+                color: $text-button-color;
+
+                &:hover { background-color: $text-button-hover-color }
+
+                &:active,
+                &:focus { background-color: $text-button-focus-color }
+            }
+
+            .poll__footer { border-top: none }
+        }
+
+        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
+    }
+}
+
+.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
+
+
+.poll {
+    .button { margin-right: 8px }
+
+    li { margin-bottom: 0 }
+
+    &__input {
+        border: none;
+        width: 20px;
+        height: 20px;
+        flex: 0 0 20px;
+        padding: 18px;
+        margin: 0 2px;
+        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
+        
+        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
+
+        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
+
+        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+
+        &.checkbox {
+            border-radius: 2px;
+            border: 2px solid $control-border-color;
+            padding: 8px;
+            margin: 8px 10px;
+            background: none;
+        }
+    }
+
+    &__text input[type=text] {
+        color: $ui-text-color;
+        background: $text-field-bg-color;
+        border: 1px solid $border-color;
+        padding: 8px 12px;
+    
+        &:focus { border-color: $border-hover-color }
+    }
+
+    &__option {
+        padding: 16px 0 8px;
+
+        input[type=text] {
+            color: $primary-text-color;
+            background: $text-field-bg-color;
+            border: none;
+            border-radius: 2px;
+            padding: 8px 16px;
+        }
+
+        &__text { line-height: 34px }
+    }
+
+    &__chart {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+    
+        &.leading { background: $progress-indicator-color }
+    }
+
+    &__footer {
+        padding-top: 8px;
+        padding-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    &__link { color: $ui-text-color }
+}
+
+.privacy-dropdown {
+    &.active .privacy-dropdown__value.active {
+        background: $icon-bg-hover-color;
+        border-radius: 50%;
+        box-shadow: none;
+
+        .icon-button { color: $icon-button-active-color }
+    }
+
+    &__dropdown {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $dialog-radius;
+    }
+
+    &__option {
+        color: $icon-color;
+        padding: 8px 16px;
+
+        &__icon {
+            font-size: 20px;
+            margin-right: 12px;
+        }
+
+        &__content {
+            color: $secondary-text-color;
+
+            strong { color: $ui-text-color }
+        }
+
+        &.active {
+            background: $menu-bg-active-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+
+            &:hover {
+                background: $menu-bg-active-color;
+                
+                .privacy-dropdown__option__content {
+                    color: $secondary-text-color;
+
+                    strong { color: $ui-text-color }
+                }
+            }
+        }
+
+        &:hover {
+            background: $menu-bg-hover-color;
+            color: $icon-hover-color;
+
+            .privacy-dropdown__option__content {
+                color: $secondary-text-color;
+
+                strong { color: $ui-text-color }
+            }
+        }
+    }
+}
+
+.character-counter {
+    color: $secondary-text-color;
+}
+
+.reply-indicator {
+    box-shadow: none;
+    border: 1px solid $border-color;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display {
+        &-name {
+            color: $primary-text-color;
+            padding-right: 24px;
+        }
+
+        &-avatar { margin-right: 8px }
+    }
+
+    &__content {
+        color: $primary-text-color;
+
+        p { margin-bottom: 16px }
+    }
+}
+
+.attachment-list {
+    &__list a { color: $secondary-text-color }
+
+    &.compact .fa { color: $icon-color }
+}
+
+.block-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__action-bar {
+        background: $card-bg-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.load-more {
+    color: $ui-text-color;
+
+    &:hover { background: transparent }
+}
+
+.autosuggest-hashtag {
+    &__name { color: $menu-text-color }
+}
+
+.filter-form {
+    background: $bg-color;
+    color: $ui-text-color;
+
+    &__column { padding: 8px 16px }
+}
+
+.directory {
+    &__card {
+        @include shadow-1dp;
+        margin: 8px 4px;
+        border-radius: $card-radius;
+
+        &__img { border-radius: $card-radius $card-radius 0 0 }
+
+        &__bar {
+            background: $card-bg-color;
+            padding: 8px 16px;
+
+            .display-name {
+                margin-left: 16px;
+
+                strong {
+                    font-size: 16px;
+                    color: $primary-text-color;
+                }
+
+                span { color: $secondary-text-color }
+            }
+        }
+
+        &__extra {
+            background: $card-bg-color;
+            border-radius: 0 0 $card-radius $card-radius;
+
+            .account__header__content {
+                padding: 8px 16px;
+                border-bottom: 1px solid $border-color;
+            }
+
+            .accounts-table__count { padding: 16px 0 }
+        }
+    }
+}
+
+.mute-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__container { padding: 24px }
+
+    &__explanation { margin-top: 16px }
+
+    &__action-bar {
+        background: $card-bg-color;
+        padding: 8px;
+        justify-content: flex-end;
+    }
+
+    &__cancel-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background-color: $text-button-hover-color;
+        }
+
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+
+    .setting-toggle {
+        margin-top: 16px;
+        margin-bottom: 16px;
+
+        &__label {
+            color: $ui-text-color;
+            margin: 0 0 0 12px;
+        }
+    }
+}
+
+.upload-progress {
+    color: $ui-text-color;
+    
+    &__backdrop {
+        border-radius: 0;
+        background: $progress-indicator-track-color;
+        margin-top: 6px;
+    }
+
+    &__tracker {
+        border-radius: 0;
+        background: $progress-indicator-color;
+    }
+}
+
+.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/containers.scss b/app/javascript/styles/y-zu-light/theme/containers.scss
new file mode 100644
index 000000000..09af289b0
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/containers.scss
@@ -0,0 +1,57 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand:hover { background: $tab-indicator-bg-hover-color }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/control.scss b/app/javascript/styles/y-zu-light/theme/control.scss
new file mode 100644
index 000000000..a205a4cb7
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/control.scss
@@ -0,0 +1,71 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.react-toggle {
+    width: 36px;
+    height: 16px;
+    border-radius: 15px;
+
+    &-track {
+        background-color: $toggle-track-color;
+        margin: 4px;
+        width: 36px;
+        height: 16px;
+
+        &-check { visibility: hidden }
+        &-x { visibility: hidden }
+    }
+
+    &-thumb {
+        @include shadow-1dp;
+        width: 20px;
+        height: 20px;
+        border: 0;
+        background-color: $toggle-thumb-color;
+    }
+
+    &--checked {
+        .react-toggle{
+            &-track { background-color: $toggle-track-active-color }
+
+            &-thumb {
+                background-color: $toggle-thumb-active-color;
+                left: 22px;
+            }
+        }
+
+        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
+
+    }
+
+    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
+}
+
+.radio-button {
+    padding: 8px 0;
+
+    &__input {
+        border: 2px solid $border-color;
+
+        &.checked {
+            border-color: $icon-button-active-color;
+            background: $icon-button-active-color;
+            padding: 3px;
+            background-clip: content-box;
+        }
+    }
+}
+
+.compose-form__sensitive-button .checkbox {
+    border: 2px solid $border-color;
+    border-radius: 2px;
+
+    &.active {
+        border-color: $primary-color;
+        background: $primary-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/emoji-picker.scss b/app/javascript/styles/y-zu-light/theme/emoji-picker.scss
new file mode 100644
index 000000000..91663fb93
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/emoji-picker.scss
@@ -0,0 +1,83 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+.emoji-picker-dropdown {
+    &__menu {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $menu-radius;
+    }
+
+    &__modifiers__menu {
+        @include shadow-8dp;
+        background: $menu-bg-color;
+        border-radius: $menu-radius;
+
+        button {
+            padding: 8px;
+        }
+    }
+}
+
+.emoji-mart {
+    width: 388px !important;
+    font-size: 14px;
+    color: $menu-text-color;
+
+    &-bar {
+        border: 0 solid $border-color;
+
+        &:first-child {
+            background: $menu-bg-color;
+        }
+    }
+
+    &-anchor {
+        color: $text-tab-indicator-color;
+        padding: 10px 4px;
+
+        &-bar { background-color: $icon-tab-indicator-active-color }
+
+        &-selected { color: $icon-tab-indicator-hover-color }
+
+        &:hover { color: $icon-tab-indicator-hover-color }
+    }
+
+    &-search {
+        background: $menu-bg-color;
+
+        input {
+            outline: none;
+            padding: 8px;
+            background: $search-bar-color;
+            color: $ui-text-color;
+            border: 0;
+            border-radius: $search-bar-radius;
+
+            &:focus {
+                @include shadow-2dp;
+                background: $search-bar-focus-color;
+                color: $search-bar-text-color;
+            }
+        }
+    }
+
+    &-scroll {
+        padding: 0 8px 8px;
+        background: $menu-bg-color;
+    }
+
+    &-category {
+        &-label span {
+            padding: 4px 6px;
+            background: $menu-bg-color;
+        }
+
+        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
+    }
+
+    &-no-results { color: $secondary-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/icons.scss b/app/javascript/styles/y-zu-light/theme/icons.scss
new file mode 100644
index 000000000..987767544
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/icons.scss
@@ -0,0 +1,26 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.fa.fa-users.column-link,
+.fa.fa-globe.column-link,
+.fa.fa-address-book.column-link,
+.fa.fa-bullhorn.column-link,
+.fa.fa-envelope.column-link,
+.fa.fa-bookmark.column-link,
+.fa.fa-star.column-link,
+.fa.fa-list-ul.column-link {
+    &__icon.fa-fw { color: $icon-color }
+}
+
+.fa.fa-lock { text-transform: none }
+
+.icon-with-badge__badge {
+    background: $badge-color;
+    border: none;
+    padding: 2px 6px;
+    border-radius: 12px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/material-icons.scss b/app/javascript/styles/y-zu-light/theme/material-icons.scss
new file mode 100644
index 000000000..dd01ce3d6
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/material-icons.scss
@@ -0,0 +1,260 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config', '../icon_config';
+@import '../custom_color', '../custom_layout';
+@import 'functions';
+@import 'mixins';
+
+
+@include icon-font;
+
+.fa-fw {
+    width: 20px;
+    height: 20px;
+    font-size: 20px;
+}
+
+.fa {
+    &.fa-bars,
+    &.fa-navicon,
+    &.fa-reorder,
+    &.fa-globe,
+    &.fa-cog,
+    &.fa-cogs,
+    &.fa-gears,
+    &.fa-sign-out,
+    &.fa-search,
+    &.fa-times,
+    &.fa-times-circle,
+    &.fa-close,
+    &.fa-remove,
+    &.fa-chevron-down,
+    &.fa-ellipsis-v,
+    &.fa-paperclip,
+    &.fa-tasks,
+    &.fa-plus,
+    &.fa-unlock,
+    &.fa-lock,
+    &.fa-envelope,
+    &.fa-home,
+    &.fa-bullhorn,
+    &.fa-sliders,
+    &.fa-chevron-left,
+    &.fa-chevron-right,
+    &.fa-reply,
+    &.fa-reply-all,
+    &.fa-share-alt,
+    &.fa-star,
+    &.fa-bookmark,
+    &.fa-ellipsis-h,
+    &.fa-bell,
+    &.fa-bell-o,
+    &.fa-eraser,
+    &.fa-users,
+    &.fa-file-text,
+    &.fa-user-plus,
+    &.fa-address-book,
+    &.fa-address-book-o,
+    &.fa-list,
+    &.fa-list-ul,
+    &.fa-eye,
+    &.fa-eye-slash,
+    &.fa-pencil,
+    &.fa-trash,
+    &.fa-play,
+    &.fa-external-link,
+    &.fa-retweet,
+    &.fa-link,
+    &.fa-pause,
+    &.fa-volume-up,
+    &.fa-volume-off,
+    &.fa-expand,
+    &.fa-download,
+    &.fa-arrows-alt,
+    &.fa-compress,
+    &.fa-user-times,
+    &.fa-check,
+    &.fa-quote-right,
+    &.fa-upload,
+    &.fa-comments,
+    &.fa-angle-right,
+    &.fa-thumb-tack {
+        @include icon-font-style;
+        line-height: 1;
+        letter-spacing: normal;
+        text-transform: none;
+        display: inline-block;
+        white-space: nowrap;
+        word-wrap: normal;
+        direction: ltr;
+        font-feature-settings: 'liga';
+        -webkit-font-smoothing: antialiased;
+    }
+}
+
+.fa {
+    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
+    &.fa-globe::before { content: "public" }
+    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
+    &.fa-sign-out::before { content: "exit_to_app" }
+    &.fa-search::before { content: "search" }
+    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
+    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
+    &.fa-paperclip::before { content: "attach_file" }
+    &.fa-tasks::before { content: "poll" }
+    &.fa-plus::before { content: "add" }
+    &.fa-unlock::before { content: "lock_open" }
+    &.fa-lock::before { content: "lock" }
+    &.fa-envelope::before { content: "mail" }
+    &.fa-home::before { content: "home" }
+    &.fa-bullhorn::before { content: "announcement" }
+    &.fa-sliders::before { content: "tune" }
+    &.fa-chevron-left::before { content: "arrow_back" }
+    &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-reply::before { content: $reply-icon }
+    &.fa-reply-all::before { content: "reply_all" }
+    &.fa-share-alt::before { content: "share" }
+    &.fa-star::before { content: $favorite-icon }
+    &.fa-bookmark::before { content: "bookmark" }
+    &.fa-ellipsis-h::before { content: "more_horiz" }
+    &.fa-bell::before { content: "notifications" }
+    &.fa-bell-o::before { content: "notifications" }
+    &.fa-eraser::before { content: "clear_all" }
+    &.fa-users::before { content: "people" }
+    &.fa-file-text::before { content: "web" }
+    &.fa-user-plus::before { content: "person_add" }
+    &.fa-address-book::before { content: "explore" }
+    &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before { content: "list" }
+    &.fa-list-ul::before { content: "list" }
+    &.fa-eye::before { content: "visibility" }
+    &.fa-eye-slash::before { content : "visibility_off" }
+    &.fa-pencil::before { content: "create" }
+    &.fa-trash::before { content: "delete" }
+    &.fa-play::before { content: "play_arrow" }
+    &.fa-external-link::before { content: "open_in_new" }
+    &.fa-retweet::before { content: "repeat" }
+    &.fa-link::before { content: "link" }
+    &.fa-pause::before { content: "pause" }
+    &.fa-volume-up::before { content: "volume_up" }
+    &.fa-volume-off::before { content: "volume_off" }
+    &.fa-expand::before { content: "web_asset" }
+    &.fa-download::before { content: "file_download" }
+    &.fa-arrows-alt::before { content: "fullscreen" }
+    &.fa-compress::before { content: "fullscreen_exit" }
+    &.fa-user-times::before { content: "person_remove" }
+    &.fa-check::before { content: "check" }
+    &.fa-quote-right::before { content: "format_quote" }
+    &.fa-upload::before { content: "file_upload" }
+    &.fa-comments::before { content: "forum" }
+    &.fa-angle-right::before { content: "chevron_right" }
+    &.fa-thumb-tack::before { content: "push_pin" }
+}
+
+// bookmark icon
+.status__action-bar-button.icon-button,
+.bookmark-icon.icon-button {
+    .fa.fa-bookmark::before { content: "bookmark_border" }
+    &.active .fa.fa-bookmark::before { content: "bookmark" }
+}
+
+// favorite icon
+.status__action-bar-button.star-icon.icon-button,
+.star-icon.icon-button {
+    .fa.fa-star::before { content: $favorite-icon-border }
+
+    &.active,
+    &.active.activate {
+        .fa.fa-star::before { content: $favorite-icon }
+    }
+}
+
+// favorite icon color
+.star-icon.active,
+.star-icon.icon-button.active.active,
+.notification__favourite-icon-wrapper .star-icon,
+.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+
+// boost icon
+button.icon-button i.fa-retweet {
+    height: 20px;
+    width: 20px;
+    transition: none;
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+
+button.icon-button i.fa-retweet:hover,
+button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+}
+
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-retweet:hover,
+button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
+}
+
+// dropdown icon
+.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+
+// icon in tab settings
+.text-btn.column-header__setting-btn {
+    .fa {
+        vertical-align: middle;
+
+        &.fa-eraser { margin-right: 8px } // clear notification
+    }
+}
+
+// top bar icons align
+.fa.fa-bell.column-header__icon.fa-fw,
+.fa.fa-home.column-header__icon.fa-fw,
+.fa.fa-users.column-header__icon.fa-fw,
+.fa.fa-globe.column-header__icon.fa-fw,
+.fa.fa-bars.column-header__icon.fa-fw,
+.fa.fa-bookmark.column-header__icon.fa-fw,
+.fa.fa-address-book-o.column-header__icon.fa-fw,
+.fa.fa-envelope.column-header__icon.fa-fw,
+.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
+
+// top bar icons in single column mode
+.tabs-bar__link {
+    .fa.fa-home.fa-fw,
+    .fa.fa-bell.fa-fw,
+    .fa.fa-users.fa-fw,
+    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+}
+
+// getting-started and side bar icons
+.column-link .fa,
+.column-link--transparent .fa { vertical-align: text-bottom }
+
+// uploaded media icons align
+.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
+    font-size: 20px;
+    vertical-align: text-bottom;
+}
+
+// search results icons align
+.search-results__header .fa { vertical-align: text-bottom }
+
+// read more icon
+.status__content__read-more-button .fa { vertical-align: bottom }
+
+// Attachment icon
+.attachment-list__list a .fa { vertical-align: middle }
+
+// status detail icon
+.detailed-status .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
+
+// status scope
+.status__visibility-icon .fa,
+.account__header__tabs__name .fa {
+    font-size: 16px;
+    vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/media.scss b/app/javascript/styles/y-zu-light/theme/media.scss
new file mode 100644
index 000000000..b8ac12414
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/media.scss
@@ -0,0 +1,126 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.media-gallery {
+    border-radius: $media-radius;
+
+    &__item { border-radius: $media-radius }
+}
+
+.media-modal {
+    &__nav {
+        background: $media-icon-bg-color;
+        color: $media-icon-color;
+        height: 48px;
+        width: 48px;
+        margin: auto 16px;
+        padding: 8px;
+        border-radius: 50%;
+    
+        .fa { width: 32px }
+    }
+
+    &__button {
+        background-color: $media-page-indicator-color;
+
+        &--active { background-color: $media-page-indicator-active-color }
+    }
+
+    &__close {
+        &.icon-button {
+            background: transparent;
+            color: $media-icon-color;
+            font-size: 24px !important;
+            width: 24px !important;
+            height: 24px !important;
+            padding: 8px;
+            box-sizing: content-box;
+            line-height: normal !important;
+    
+            &:hover {
+                background: $media-icon-bg-hover-color;
+                color: $media-icon-hover-color;
+            }
+    
+            .fa-fw {
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+
+    &__meta {
+        bottom: 24px;
+
+        a { color: $media-icon-color }
+    }
+
+    &__overlay {
+        .picture-in-picture__footer .icon-button {
+            color: $media-icon-color;
+
+            &:active,
+            &:focus,
+            &:hover {
+                color: $media-icon-hover-color;
+                background-color: transparent;
+            }
+        }
+    }
+}
+
+.video-player {
+    &__controls {
+        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
+        padding: 0 12px;
+    }
+
+    &__seek {
+        &::before {
+            background: rgba(255,255,255,.2);
+            border-radius: 0;
+        }
+
+        &__buffer {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__progress {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            @include material-transition;
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__volume {
+        &::before {
+            background: rgba(255,255,255,.4);
+            border-radius: 0;
+        }
+
+        &__current {
+            background: $primary-color;
+            border-radius: 0;
+        }
+
+        &__handle {
+            @include material-transition;
+            background-color: $primary-color;
+            box-shadow: none;
+        }
+    }
+
+    &__time-current { margin-left: 68px }
+
+    &__buttons button { font-size: 20px }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/modal.scss b/app/javascript/styles/y-zu-light/theme/modal.scss
new file mode 100644
index 000000000..93e5b24c1
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/modal.scss
@@ -0,0 +1,104 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.confirmation-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $dialog-radius;
+
+    &__container {
+        text-align: left;
+        padding: 24px;
+    }
+
+    &__action-bar {
+        justify-content: flex-end;
+        background: $card-bg-color;
+        padding: 8px;
+    }
+
+    &__secondary-button {
+        box-shadow: none !important;
+        color: $text-button-color;
+        background: transparent;
+        margin: 0 8px;
+
+        &:hover {
+            color: $text-button-color;
+            background: $text-button-hover-color;
+        }
+        
+        &:focus,
+        &:active {
+            color: $text-button-color;
+            background-color: $text-button-focus-color;
+        }
+    }
+}
+
+.actions-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    border-radius: $card-radius;
+
+    ul li:not(:empty) a {
+        color: $ui-text-color;
+        font-size: 16px;
+
+        &:hover {
+            background: $card-bg-hover-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .dropdown-menu__separator { border-bottom-color: $border-color }
+
+    .status {
+        background: $card-bg-color;
+        border-bottom-color: $border-color;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
+        &__avatar {
+            left: 12px;
+            top: 12px;
+        }
+    }
+}
+
+.report-modal {
+    @include shadow-24dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+
+    &__target {
+        padding: 24px;
+        text-align: left;
+        font-weight: bold;
+    }
+
+    &__container {
+        border-top: none;
+    }
+
+    &__comment {
+        border-right: none;
+
+        .setting-text-label { color: $ui-text-color }
+    }
+}
+
+.embed-modal .embed-modal__container {
+    padding: 0 24px 24px 24px;
+
+    .hint {
+        margin-bottom: 16px;
+        color: $secondary-text-color;
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/responsive.scss b/app/javascript/styles/y-zu-light/theme/responsive.scss
new file mode 100644
index 000000000..8618f7ed7
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/responsive.scss
@@ -0,0 +1,110 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.tabs-bar {
+    background: $top-bar-color;
+
+    &__link {
+        padding: 16px 16px 12px 16px;
+        color: $top-bar-icon-color;
+        border-bottom: 4px solid transparent;
+
+        &.active {
+            border-bottom: 4px solid $tab-indicator-active-color;
+            color: $tab-indicator-active-color;
+        }
+
+        .fa { font-size: 20px }
+
+        span {
+            margin-left: 8px;
+            vertical-align: text-bottom;
+        }
+    }
+
+    &__wrapper {
+        @include shadow-4dp;
+        background: transparent;
+    }
+}
+
+#tabs-bar__portal { overflow-y: hidden }
+
+.floating-action-button {
+    @include shadow-6dp;
+    background: $floating-action-button-color;
+    color: $floating-action-button-icon-color;
+    font-size: 24px;
+    width: $fab-size;
+    height: $fab-size;
+    bottom: 16px;
+    right: 16px;
+
+    &:hover { background: $floating-action-button-hover-color }
+
+    &:active,
+    &:focus { background: $floating-action-button-active-color }
+}
+
+.columns-area--mobile {
+    .column { margin: 0 !important }
+    .search__input { padding: 16px 46px }
+
+    .search__icon {
+        .fa {
+            top: 16px;
+            left: 16px;
+        }
+
+        .fa-times-circle.active { left: unset }
+    }
+}
+
+// small size screen
+@media screen and (max-width: 415px) {
+    .public-layout { padding-top: 64px }
+}
+
+// middle size screen
+@media screen and (min-width: 415px) {
+    .tabs-bar {
+        margin-bottom: 0;
+
+        &__wrapper {
+            padding-top: 0;
+
+            .tabs-bar { margin-bottom: 0 }
+        }
+    }
+
+    .columns-area__panels {
+        &__main {
+            @include shadow-1dp;
+            padding: 0;
+        }
+
+        &__pane { padding: 0 16px }
+    }
+}
+
+//single column mode
+@media screen and (min-width: 631px) {
+    .tabs-bar__link {
+        &:hover {
+            background: $tab-indicator-bg-hover-color;
+            border-bottom-color: transparent;
+        }
+
+        &:active,
+        &:focus {
+            background: $tab-indicator-bg-focus-color;
+            border-bottom-color: $tab-bg-color;
+        }
+
+        &.active { border-bottom-color: $tab-indicator-active-color }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/statuses.scss b/app/javascript/styles/y-zu-light/theme/statuses.scss
new file mode 100644
index 000000000..7e4374014
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/statuses.scss
@@ -0,0 +1,292 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.status {
+    padding: 12px 12px 4px 70px;
+    border-bottom: 1px solid $border-color;
+
+    &__expand { width: 70px }
+
+    &__info {
+        font-size: $name-font-size;
+        padding-right: 4px;
+    }
+
+    &__relative-time { color: $info-text-color }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__avatar {
+        left: 12px;
+        top: 12px;
+    }
+
+    &__content {
+        font-size: $status-font-size;
+        padding-top: 4px;
+        color: $primary-text-color;
+
+        a {
+            color: $link-text-color;
+
+            &.unhandled-link { color: $link-text-color }
+        }
+
+        p { margin-bottom: 16px }
+
+        .status__content__spoiler-link {
+            background: transparent;
+
+            &:hover { background: $text-button-hover-color }
+
+            &:focus { background: $text-button-focus-color }
+        }
+
+        &__spoiler-link {
+            border: 0;
+            color: $text-button-color;
+        }
+
+        &__read-more-button {
+            font-size: 14px;
+            color: $text-button-color;
+            border-radius: $button-radius;
+            padding: 4px 6px;
+
+            &:hover {
+                background: $text-button-hover-color;
+                text-decoration: none;
+            }
+
+            &:focus { background: $text-button-focus-color }
+        }
+    }
+
+    &__action-bar {
+        margin-top: 4px;
+
+        &__counter {
+            margin-right: 6px;
+
+            &__label {
+                font-size: 14px;
+                color: $info-text-color;
+            }
+        }
+    }
+
+    &__action-bar-button {
+        margin-right: 4px;
+
+        &.icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &--with-counter {
+                margin-right: 4px;
+                width: auto !important;
+
+                &:hover { background: transparent }
+            }
+        }
+    }
+
+    &__action-bar-dropdown {
+        width: 36px !important;
+        height: 36px !important;
+        box-sizing: content-box;
+
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+
+            &:hover {
+                color:$icon-hover-color;
+                background: $icon-bg-hover-color;
+            }
+        }
+    }
+
+    &__prepend {
+        color: $secondary-text-color;
+        margin-left: 64px;
+
+        .status__display-name strong { color: $secondary-text-color }
+    }
+
+    &.status-direct:not(.read) {
+        background: transparent;
+        border-bottom-color: $border-color;
+    }
+
+    &__visibility-icon { color: $icon-color }
+}
+
+.status-card {
+    color: $icon-color;
+    border-color: $border-color;
+    outline: none;
+    margin-top: 16px;
+
+    &__image {
+        background: transparent;
+
+        &>.fa {
+            font-size: 26px;
+        }
+    }
+
+    &__title {
+        color: $primary-text-color;
+        margin-bottom: 6px;
+    }
+
+    &__description { color: $secondary-text-color }
+
+    &__actions {
+        &>div {
+            background: $media-icon-bg-color;
+            border-radius: $button-radius;
+        }
+
+        button,
+        a {
+            color: $media-icon-color;
+            font-size: 20px;
+        }
+
+        a { bottom: auto }
+    }
+
+    &.compact {
+        border-color: $border-color;
+        outline: none;
+        background: transparent;
+        
+        .status-card {
+            &__content { padding: 12px }
+            &__image { flex: 0 0 64px }
+        }
+
+        &:hover { background-color: transparent !important }
+    }
+
+    &.horizontal {
+        border-radius: 0;
+        
+        .status-card {
+            &__image-preview { border-radius: 0 }
+
+            &__image-image { border-radius: 0 }
+        }
+    }
+}
+
+a.status-card {
+    &:hover { background-color: $card-bg-color }
+}
+
+.embed .status,
+.public-layout .status { padding: 16px 16px 16px 80px }
+
+// Detailed status in mobile
+.status.light {
+    .status {
+        &__display-name { color: $primary-text-color }
+        &__relative-time { color: $info-text-color }
+        &__content { color: $primary-text-color }
+    }
+
+    .display-name { color: $secondary-text-color }
+    .display-name strong { color: $primary-text-color }
+}
+
+.detailed-status {
+    background: $card-bg-color;
+    padding: 16px;
+
+    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
+
+    &__display-name {
+        color: $secondary-text-color;
+
+        strong { color: $primary-text-color }
+    }
+
+    &__meta {
+        margin-top: 16px;
+        color: $info-text-color;
+    }
+
+    &__action-bar {
+        background: $card-bg-color;
+        border-top: none;
+        border-bottom: 1px solid $border-color;
+        padding: 8px 0;
+    }
+
+    &__action-bar-dropdown {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+
+            &.active {
+                color: $icon-hover-color;
+                background: $icon-bg-active-color;
+            }
+        }
+    }
+
+    &__button {
+        .icon-button {
+            @include icon-button;
+            padding: 8px;
+            box-sizing: content-box;
+        }
+    }
+
+    .button.logo-button {
+        margin-bottom: 16px;
+        line-height: 36px;
+    }
+}
+
+// search user trends
+.display-name {
+    &__html { color: $primary-text-color }
+    &__account { color: $secondary-text-color }
+}
+
+.activity-stream {
+    @include shadow-1dp;
+    margin-bottom: 16px;
+    border-radius: $card-radius;
+
+    .entry {
+        background: $card-bg-color;
+
+        &:first-child {
+            .detailed-status,
+            .load-more,
+            .status { border-radius: $card-radius $card-radius 0 0 }
+        }
+    }
+}
+
+.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/theme.scss b/app/javascript/styles/y-zu-light/theme/theme.scss
new file mode 100644
index 000000000..367893682
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/theme.scss
@@ -0,0 +1,10 @@
+/*
+* Mastodon Material 0.2.1
+* Author: Rintan, Genbu Project
+* Copyright (C) 2020 Rintan, Genbu Project
+*/
+
+@charset "UTF-8";
+
+
+@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/variables.scss b/app/javascript/styles/y-zu-light/theme/variables.scss
new file mode 100644
index 000000000..0b948881b
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/variables.scss
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+
+
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/widgets.scss b/app/javascript/styles/y-zu-light/theme/widgets.scss
new file mode 100644
index 000000000..4abdfbae9
--- /dev/null
+++ b/app/javascript/styles/y-zu-light/theme/widgets.scss
@@ -0,0 +1,32 @@
+@charset "UTF-8";
+@import 'base_config';
+@import '../custom_config';
+@import '../custom_color', '../custom_layout';
+@import 'mixins';
+
+
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+}
+
+.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ecc3c9e32..f28c0894b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1268,6 +1268,8 @@ en:
     mastodon-material-light: Mastodon Material (Light)
     mastodon-material-auto: Mastodon Material (Auto)
     plus: Plus
+    y-zu-dark: Y-zu (Dark)
+    y-zu-light: Y-zu (Light)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fc5d13698..c74a30910 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1247,6 +1247,8 @@ ja:
     mastodon-material-light: Mastodon Material (ライト)
     mastodon-material-auto: Mastodon Material (自動)
     plus: Plus
+    y-zu-dark: Y-zu (ダーク)
+    y-zu-light: Y-zu (ライト)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index ff3d800aa..df530bd65 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -12,3 +12,5 @@ mastodon-material-dark: styles/mastodon-material-dark.scss
 mastodon-material-light: styles/mastodon-material-light.scss
 mastodon-material-auto: styles/mastodon-material-auto.scss
 plus: styles/plus.scss
+y-zu-dark: styles/y-zu-dark.scss
+y-zu-light: styles/y-zu-light.scss

From 98944a915f749e4c915aac3aac474ada60f39250 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:29:42 +0900
Subject: [PATCH 080/200] update material theme to 0.3.0 beta

---
 .../styles/mastodon-material-dark.scss        |   2 +-
 .../color/mastodon-dark.scss                  | 146 ----
 .../color/mastodon-light.scss                 | 145 ----
 .../color/plus-classic.scss                   | 145 ----
 .../mastodon-material-dark/color/v1-dark.scss | 145 ----
 .../mastodon-material-dark/color/v2-dark.scss | 146 ----
 .../mastodon-material-dark/custom_color.scss  |   4 -
 .../mastodon-material-dark/custom_config.scss |   5 -
 .../mastodon-material-dark/custom_layout.scss |   4 -
 .../layout/material-v1.scss                   |  60 --
 .../layout/material-v2.scss                   |  70 --
 .../styles/mastodon-material-dark/loader.scss |   8 -
 .../mastodon-material-dark/plugins/cards.scss |  38 -
 .../theme/_functions.scss                     |   8 -
 .../theme/base_config.scss                    |  46 --
 .../mastodon-material-dark/theme/basics.scss  |  27 -
 .../mastodon-material-dark/theme/button.scss  | 145 ----
 .../mastodon-material-dark/theme/columns.scss | 511 --------------
 .../theme/components.scss                     | 647 ------------------
 .../theme/containers.scss                     |  57 --
 .../mastodon-material-dark/theme/control.scss |  71 --
 .../theme/emoji-picker.scss                   |  83 ---
 .../theme/material-icons.scss                 | 260 -------
 .../mastodon-material-dark/theme/media.scss   | 126 ----
 .../mastodon-material-dark/theme/modal.scss   | 104 ---
 .../theme/responsive.scss                     | 110 ---
 .../mastodon-material-dark/theme/theme.scss   |  10 -
 .../theme/variables.scss                      |   7 -
 .../mastodon-material-dark/theme/widgets.scss |  32 -
 .../styles/mastodon-material-light.scss       |   2 +-
 .../mastodon-material-light/color/black.scss  | 146 ----
 .../color/mastodon-light.scss                 | 145 ----
 .../color/plus-classic.scss                   | 145 ----
 .../color/v1-light.scss                       | 146 ----
 .../color/v2-dark.scss                        | 146 ----
 .../color/v2-light.scss                       | 146 ----
 .../mastodon-material-light/custom_color.scss |   4 -
 .../custom_config.scss                        |   5 -
 .../custom_layout.scss                        |   4 -
 .../mastodon-material-light/icon_config.scss  |  28 -
 .../layout/material-v2.scss                   |  70 --
 .../mastodon-material-light/loader.scss       |   8 -
 .../plugins/astarte.scss                      |  26 -
 .../plugins/dense.scss                        |  87 ---
 .../mastodon-material-light/plugins/plus.scss |  36 -
 .../theme/_mixins.scss                        | 228 ------
 .../theme/account.scss                        | 196 ------
 .../theme/base_config.scss                    |  46 --
 .../mastodon-material-light/theme/button.scss | 145 ----
 .../theme/components.scss                     | 647 ------------------
 .../theme/containers.scss                     |  57 --
 .../theme/emoji-picker.scss                   |  83 ---
 .../mastodon-material-light/theme/icons.scss  |  26 -
 .../theme/material-icons.scss                 | 260 -------
 .../mastodon-material-light/theme/media.scss  | 126 ----
 .../mastodon-material-light/theme/modal.scss  | 104 ---
 .../theme/responsive.scss                     | 110 ---
 .../theme/statuses.scss                       | 292 --------
 .../mastodon-material-light/theme/theme.scss  |  10 -
 .../theme/variables.scss                      |   7 -
 .../theme/widgets.scss                        |  32 -
 .../color/black.scss                          |   6 +-
 .../color/mastodon-dark.scss                  |   6 +-
 .../color/mastodon-light.scss                 |   6 +-
 .../color/plus-classic.scss                   |   6 +-
 .../color/v1-dark.scss                        |   6 +-
 .../color/v1-light.scss                       |   6 +-
 .../color/v2-dark.scss                        |  10 +-
 .../color/v2-light.scss                       |   6 +-
 .../layout/material-v1.scss                   |  23 +-
 .../layout/material-v2.scss                   |  28 +-
 .../plugins/astarte.scss                      |   7 +-
 .../plugins/cards.scss                        |   7 -
 .../plugins/dense.scss                        |  10 +-
 .../plugins/plus.scss                         |   6 -
 .../mastodon-material-dark/color.scss         |   1 +
 .../mastodon-material-dark/config.scss        |   3 +
 .../mastodon-material-dark/icon_config.scss   |   3 +
 .../mastodon-material-dark/layout.scss        |   1 +
 .../mastodon-material-dark/loader.scss        |  11 +
 .../mastodon-material-dark/plugins.scss       |   4 +
 .../mastodon-material-light/color.scss        |   1 +
 .../mastodon-material-light/config.scss       |   3 +
 .../mastodon-material-light/icon_config.scss  |   3 +
 .../mastodon-material-light/layout.scss       |   1 +
 .../mastodon-material-light/loader.scss       |  11 +
 .../mastodon-material-light/plugins.scss      |   4 +
 .../profiles/material-black/color.scss        |   1 +
 .../profiles/material-black/config.scss       |   3 +
 .../profiles/material-black/icon_config.scss  |   3 +
 .../profiles/material-black/layout.scss       |   1 +
 .../profiles/material-black/loader.scss       |  11 +
 .../profiles/material-black/plugins.scss      |   4 +
 .../profiles/material-dark/color.scss         |   1 +
 .../profiles/material-dark/config.scss        |   3 +
 .../profiles/material-dark/icon_config.scss   |   3 +
 .../profiles/material-dark/layout.scss        |   1 +
 .../profiles/material-dark/loader.scss        |  11 +
 .../profiles/material-dark/plugins.scss       |   4 +
 .../profiles/material-light/color.scss        |   1 +
 .../profiles/material-light/config.scss       |   1 +
 .../profiles/material-light/icon_config.scss  |   3 +
 .../profiles/material-light/layout.scss       |   1 +
 .../profiles/material-light/loader.scss       |  11 +
 .../profiles/material-light/plugins.scss      |   4 +
 .../profiles/plus/color.scss                  |   1 +
 .../profiles/plus/config.scss                 |   3 +
 .../profiles/plus/icon_config.scss            |   9 +
 .../profiles/plus/layout.scss                 |   1 +
 .../profiles/plus/loader.scss                 |  11 +
 .../profiles/plus/plugins.scss                |   4 +
 .../profiles/y-zu-dark/color.scss             |   1 +
 .../profiles/y-zu-dark/config.scss            |   3 +
 .../profiles/y-zu-dark/icon_config.scss       |   3 +
 .../profiles/y-zu-dark/layout.scss}           |   3 -
 .../profiles/y-zu-dark/loader.scss            |  11 +
 .../profiles/y-zu-dark/plugins.scss           |   4 +
 .../profiles/y-zu-light/color.scss            |  32 +
 .../profiles/y-zu-light/config.scss           |   3 +
 .../profiles/y-zu-light/icon_config.scss      |   3 +
 .../profiles/y-zu-light/layout.scss}          |   3 -
 .../profiles/y-zu-light/loader.scss           |  11 +
 .../profiles/y-zu-light/plugins.scss          |   4 +
 .../theme/_functions.scss                     |   3 +-
 .../theme/_mixins.scss                        |  97 ++-
 .../styles/mastodon-material/theme/about.scss |  17 +
 .../theme/account.scss                        |  37 +-
 .../theme/base_config.scss                    |   4 +-
 .../theme/base_icon_config.scss}              |   4 +-
 .../theme/basics.scss                         |   6 -
 .../theme/button.scss                         |  33 +-
 .../theme/columns.scss                        |  58 +-
 .../theme/components.scss                     |  80 +--
 .../mastodon-material/theme/containers.scss   | 161 +++++
 .../theme/control.scss                        |  15 +-
 .../theme/emoji-picker.scss                   |  25 +-
 .../theme/icons.scss                          |   7 -
 .../theme/material-icons.scss                 |  36 +-
 .../theme/media.scss                          |  18 +-
 .../theme/modal.scss                          |   7 -
 .../theme/responsive.scss                     |  19 +-
 .../theme/statuses.scss                       |  21 +-
 .../styles/mastodon-material/theme/theme.scss |   6 +
 .../mastodon-material/theme/variables.scss    |   1 +
 .../mastodon-material/theme/widgets.scss      | 123 ++++
 app/javascript/styles/material-black.scss     |   2 +-
 .../styles/material-black/color/black.scss    | 146 ----
 .../material-black/color/mastodon-dark.scss   | 146 ----
 .../styles/material-black/color/v1-dark.scss  | 145 ----
 .../styles/material-black/color/v1-light.scss | 146 ----
 .../styles/material-black/color/v2-light.scss | 146 ----
 .../styles/material-black/custom_color.scss   |   4 -
 .../styles/material-black/custom_config.scss  |   5 -
 .../styles/material-black/custom_layout.scss  |   4 -
 .../styles/material-black/icon_config.scss    |  28 -
 .../material-black/layout/material-v1.scss    |  60 --
 .../styles/material-black/loader.scss         |   8 -
 .../material-black/plugins/astarte.scss       |  26 -
 .../styles/material-black/plugins/cards.scss  |  38 -
 .../styles/material-black/plugins/dense.scss  |  87 ---
 .../styles/material-black/plugins/plus.scss   |  36 -
 .../material-black/theme/_functions.scss      |   8 -
 .../styles/material-black/theme/_mixins.scss  | 228 ------
 .../styles/material-black/theme/account.scss  | 196 ------
 .../styles/material-black/theme/basics.scss   |  27 -
 .../styles/material-black/theme/columns.scss  | 511 --------------
 .../material-black/theme/containers.scss      |  57 --
 .../styles/material-black/theme/control.scss  |  71 --
 .../styles/material-black/theme/icons.scss    |  26 -
 .../styles/material-black/theme/statuses.scss | 292 --------
 .../styles/material-black/theme/theme.scss    |  10 -
 .../material-black/theme/variables.scss       |   7 -
 .../styles/material-black/theme/widgets.scss  |  32 -
 app/javascript/styles/material-dark.scss      |   2 +-
 .../styles/material-dark/color/black.scss     | 146 ----
 .../material-dark/color/mastodon-dark.scss    | 146 ----
 .../material-dark/color/mastodon-light.scss   | 145 ----
 .../material-dark/color/plus-classic.scss     | 145 ----
 .../styles/material-dark/color/v1-dark.scss   | 145 ----
 .../styles/material-dark/color/v1-light.scss  | 146 ----
 .../styles/material-dark/color/v2-dark.scss   | 146 ----
 .../styles/material-dark/color/v2-light.scss  | 146 ----
 .../styles/material-dark/custom_color.scss    |   4 -
 .../styles/material-dark/custom_config.scss   |   5 -
 .../styles/material-dark/custom_layout.scss   |   4 -
 .../styles/material-dark/icon_config.scss     |  28 -
 .../material-dark/layout/material-v1.scss     |  60 --
 .../material-dark/layout/material-v2.scss     |  70 --
 .../styles/material-dark/loader.scss          |   8 -
 .../styles/material-dark/plugins/astarte.scss |  26 -
 .../styles/material-dark/plugins/cards.scss   |  38 -
 .../styles/material-dark/plugins/dense.scss   |  87 ---
 .../styles/material-dark/plugins/plus.scss    |  36 -
 .../material-dark/theme/_functions.scss       |   8 -
 .../styles/material-dark/theme/_mixins.scss   | 228 ------
 .../styles/material-dark/theme/account.scss   | 196 ------
 .../material-dark/theme/base_config.scss      |  46 --
 .../styles/material-dark/theme/basics.scss    |  27 -
 .../styles/material-dark/theme/button.scss    | 145 ----
 .../styles/material-dark/theme/columns.scss   | 511 --------------
 .../material-dark/theme/components.scss       | 647 ------------------
 .../material-dark/theme/containers.scss       |  57 --
 .../styles/material-dark/theme/control.scss   |  71 --
 .../material-dark/theme/emoji-picker.scss     |  83 ---
 .../styles/material-dark/theme/icons.scss     |  26 -
 .../material-dark/theme/material-icons.scss   | 260 -------
 .../styles/material-dark/theme/media.scss     | 126 ----
 .../styles/material-dark/theme/modal.scss     | 104 ---
 .../material-dark/theme/responsive.scss       | 110 ---
 .../styles/material-dark/theme/statuses.scss  | 292 --------
 .../styles/material-dark/theme/theme.scss     |  10 -
 .../styles/material-dark/theme/variables.scss |   7 -
 .../styles/material-dark/theme/widgets.scss   |  32 -
 app/javascript/styles/material-light.scss     |   2 +-
 .../styles/material-light/color/black.scss    | 146 ----
 .../material-light/color/mastodon-dark.scss   | 146 ----
 .../material-light/color/mastodon-light.scss  | 145 ----
 .../material-light/color/plus-classic.scss    | 145 ----
 .../styles/material-light/color/v1-dark.scss  | 145 ----
 .../styles/material-light/color/v1-light.scss | 146 ----
 .../styles/material-light/color/v2-dark.scss  | 146 ----
 .../styles/material-light/color/v2-light.scss | 146 ----
 .../styles/material-light/custom_color.scss   |   4 -
 .../styles/material-light/custom_config.scss  |   4 -
 .../styles/material-light/custom_layout.scss  |   4 -
 .../styles/material-light/icon_config.scss    |  28 -
 .../material-light/layout/material-v1.scss    |  60 --
 .../material-light/layout/material-v2.scss    |  70 --
 .../styles/material-light/loader.scss         |   8 -
 .../material-light/plugins/astarte.scss       |  26 -
 .../styles/material-light/plugins/cards.scss  |  38 -
 .../styles/material-light/plugins/dense.scss  |  87 ---
 .../styles/material-light/plugins/plus.scss   |  36 -
 .../material-light/theme/_functions.scss      |   8 -
 .../styles/material-light/theme/_mixins.scss  | 228 ------
 .../styles/material-light/theme/account.scss  | 196 ------
 .../material-light/theme/base_config.scss     |  46 --
 .../styles/material-light/theme/basics.scss   |  27 -
 .../styles/material-light/theme/button.scss   | 145 ----
 .../styles/material-light/theme/columns.scss  | 511 --------------
 .../material-light/theme/components.scss      | 647 ------------------
 .../material-light/theme/containers.scss      |  57 --
 .../styles/material-light/theme/control.scss  |  71 --
 .../material-light/theme/emoji-picker.scss    |  83 ---
 .../styles/material-light/theme/icons.scss    |  26 -
 .../material-light/theme/material-icons.scss  | 260 -------
 .../styles/material-light/theme/media.scss    | 126 ----
 .../styles/material-light/theme/modal.scss    | 104 ---
 .../material-light/theme/responsive.scss      | 110 ---
 .../styles/material-light/theme/statuses.scss | 292 --------
 .../styles/material-light/theme/theme.scss    |  10 -
 .../material-light/theme/variables.scss       |   7 -
 .../styles/material-light/theme/widgets.scss  |  32 -
 app/javascript/styles/plus.scss               |   2 +-
 app/javascript/styles/plus/color/black.scss   | 146 ----
 .../styles/plus/color/mastodon-dark.scss      | 146 ----
 .../styles/plus/color/mastodon-light.scss     | 145 ----
 .../styles/plus/color/plus-classic.scss       | 145 ----
 app/javascript/styles/plus/color/v1-dark.scss | 145 ----
 .../styles/plus/color/v1-light.scss           | 146 ----
 app/javascript/styles/plus/color/v2-dark.scss | 146 ----
 .../styles/plus/color/v2-light.scss           | 146 ----
 app/javascript/styles/plus/custom_color.scss  |   4 -
 app/javascript/styles/plus/custom_config.scss |   5 -
 app/javascript/styles/plus/custom_layout.scss |   4 -
 app/javascript/styles/plus/icon_config.scss   |  28 -
 .../styles/plus/layout/material-v1.scss       |  60 --
 .../styles/plus/layout/material-v2.scss       |  70 --
 app/javascript/styles/plus/loader.scss        |   8 -
 .../styles/plus/plugins/astarte.scss          |  26 -
 app/javascript/styles/plus/plugins/cards.scss |  38 -
 app/javascript/styles/plus/plugins/dense.scss |  87 ---
 app/javascript/styles/plus/plugins/plus.scss  |  36 -
 .../styles/plus/theme/_functions.scss         |   8 -
 app/javascript/styles/plus/theme/_mixins.scss | 228 ------
 app/javascript/styles/plus/theme/account.scss | 196 ------
 .../styles/plus/theme/base_config.scss        |  46 --
 app/javascript/styles/plus/theme/basics.scss  |  27 -
 app/javascript/styles/plus/theme/button.scss  | 145 ----
 app/javascript/styles/plus/theme/columns.scss | 511 --------------
 .../styles/plus/theme/components.scss         | 647 ------------------
 .../styles/plus/theme/containers.scss         |  57 --
 app/javascript/styles/plus/theme/control.scss |  71 --
 .../styles/plus/theme/emoji-picker.scss       |  83 ---
 app/javascript/styles/plus/theme/icons.scss   |  26 -
 .../styles/plus/theme/material-icons.scss     | 260 -------
 app/javascript/styles/plus/theme/media.scss   | 126 ----
 app/javascript/styles/plus/theme/modal.scss   | 104 ---
 .../styles/plus/theme/responsive.scss         | 110 ---
 .../styles/plus/theme/statuses.scss           | 292 --------
 app/javascript/styles/plus/theme/theme.scss   |  10 -
 .../styles/plus/theme/variables.scss          |   7 -
 app/javascript/styles/plus/theme/widgets.scss |  32 -
 app/javascript/styles/y-zu-dark.scss          |   2 +-
 .../styles/y-zu-dark/color/black.scss         | 146 ----
 .../styles/y-zu-dark/color/mastodon-dark.scss | 146 ----
 .../y-zu-dark/color/mastodon-light.scss       | 145 ----
 .../styles/y-zu-dark/color/plus-classic.scss  | 145 ----
 .../styles/y-zu-dark/color/v1-dark.scss       | 145 ----
 .../styles/y-zu-dark/color/v1-light.scss      | 146 ----
 .../styles/y-zu-dark/color/v2-dark.scss       | 146 ----
 .../styles/y-zu-dark/color/v2-light.scss      | 146 ----
 .../styles/y-zu-dark/custom_color.scss        |   4 -
 .../styles/y-zu-dark/custom_config.scss       |   6 -
 .../styles/y-zu-dark/icon_config.scss         |  28 -
 .../styles/y-zu-dark/layout/material-v1.scss  |  60 --
 .../styles/y-zu-dark/layout/material-v2.scss  |  70 --
 app/javascript/styles/y-zu-dark/loader.scss   |   8 -
 .../styles/y-zu-dark/plugins/astarte.scss     |  26 -
 .../styles/y-zu-dark/plugins/cards.scss       |  38 -
 .../styles/y-zu-dark/plugins/dense.scss       |  87 ---
 .../styles/y-zu-dark/plugins/plus.scss        |  36 -
 .../styles/y-zu-dark/theme/_functions.scss    |   8 -
 .../styles/y-zu-dark/theme/_mixins.scss       | 228 ------
 .../styles/y-zu-dark/theme/account.scss       | 196 ------
 .../styles/y-zu-dark/theme/base_config.scss   |  46 --
 .../styles/y-zu-dark/theme/basics.scss        |  27 -
 .../styles/y-zu-dark/theme/button.scss        | 145 ----
 .../styles/y-zu-dark/theme/columns.scss       | 511 --------------
 .../styles/y-zu-dark/theme/components.scss    | 647 ------------------
 .../styles/y-zu-dark/theme/containers.scss    |  57 --
 .../styles/y-zu-dark/theme/control.scss       |  71 --
 .../styles/y-zu-dark/theme/emoji-picker.scss  |  83 ---
 .../styles/y-zu-dark/theme/icons.scss         |  26 -
 .../y-zu-dark/theme/material-icons.scss       | 260 -------
 .../styles/y-zu-dark/theme/media.scss         | 126 ----
 .../styles/y-zu-dark/theme/modal.scss         | 104 ---
 .../styles/y-zu-dark/theme/responsive.scss    | 110 ---
 .../styles/y-zu-dark/theme/statuses.scss      | 292 --------
 .../styles/y-zu-dark/theme/theme.scss         |  10 -
 .../styles/y-zu-dark/theme/variables.scss     |   7 -
 .../styles/y-zu-dark/theme/widgets.scss       |  32 -
 app/javascript/styles/y-zu-light.scss         |   2 +-
 .../styles/y-zu-light/color/black.scss        | 146 ----
 .../y-zu-light/color/mastodon-dark.scss       | 146 ----
 .../y-zu-light/color/mastodon-light.scss      | 145 ----
 .../styles/y-zu-light/color/plus-classic.scss | 145 ----
 .../styles/y-zu-light/color/v1-dark.scss      | 145 ----
 .../styles/y-zu-light/color/v1-light.scss     | 146 ----
 .../styles/y-zu-light/color/v2-dark.scss      | 146 ----
 .../styles/y-zu-light/color/v2-light.scss     | 146 ----
 .../styles/y-zu-light/custom_color.scss       |   5 -
 .../styles/y-zu-light/custom_config.scss      |   6 -
 .../styles/y-zu-light/icon_config.scss        |  28 -
 .../styles/y-zu-light/layout/material-v1.scss |  60 --
 .../styles/y-zu-light/layout/material-v2.scss |  70 --
 app/javascript/styles/y-zu-light/loader.scss  |   8 -
 .../styles/y-zu-light/plugins/astarte.scss    |  26 -
 .../styles/y-zu-light/plugins/cards.scss      |  38 -
 .../styles/y-zu-light/plugins/dense.scss      |  87 ---
 .../styles/y-zu-light/plugins/plus.scss       |  36 -
 .../styles/y-zu-light/theme/_functions.scss   |   8 -
 .../styles/y-zu-light/theme/_mixins.scss      | 228 ------
 .../styles/y-zu-light/theme/account.scss      | 196 ------
 .../styles/y-zu-light/theme/base_config.scss  |  46 --
 .../styles/y-zu-light/theme/basics.scss       |  27 -
 .../styles/y-zu-light/theme/button.scss       | 145 ----
 .../styles/y-zu-light/theme/columns.scss      | 511 --------------
 .../styles/y-zu-light/theme/components.scss   | 647 ------------------
 .../styles/y-zu-light/theme/containers.scss   |  57 --
 .../styles/y-zu-light/theme/control.scss      |  71 --
 .../styles/y-zu-light/theme/emoji-picker.scss |  83 ---
 .../styles/y-zu-light/theme/icons.scss        |  26 -
 .../y-zu-light/theme/material-icons.scss      | 260 -------
 .../styles/y-zu-light/theme/media.scss        | 126 ----
 .../styles/y-zu-light/theme/modal.scss        | 104 ---
 .../styles/y-zu-light/theme/responsive.scss   | 110 ---
 .../styles/y-zu-light/theme/statuses.scss     | 292 --------
 .../styles/y-zu-light/theme/theme.scss        |  10 -
 .../styles/y-zu-light/theme/variables.scss    |   7 -
 .../styles/y-zu-light/theme/widgets.scss      |  32 -
 371 files changed, 842 insertions(+), 32048 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/custom_color.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/custom_config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/custom_layout.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/loader.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/plugins/cards.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/_functions.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/base_config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/basics.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/button.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/columns.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/components.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/containers.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/control.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/media.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/modal.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/responsive.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/theme.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/mastodon-material-dark/theme/widgets.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/black.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/v1-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/custom_color.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/custom_config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/custom_layout.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/icon_config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/loader.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/plugins/dense.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/plugins/plus.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/account.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/base_config.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/button.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/components.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/containers.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/media.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/modal.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/responsive.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/statuses.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/theme.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/variables.scss
 delete mode 100644 app/javascript/styles/mastodon-material-light/theme/widgets.scss
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/color/black.scss (96%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/color/mastodon-dark.scss (96%)
 rename app/javascript/styles/{material-black => mastodon-material}/color/mastodon-light.scss (96%)
 rename app/javascript/styles/{material-black => mastodon-material}/color/plus-classic.scss (96%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/color/v1-dark.scss (96%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/color/v1-light.scss (96%)
 rename app/javascript/styles/{material-black => mastodon-material}/color/v2-dark.scss (94%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/color/v2-light.scss (96%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/layout/material-v1.scss (56%)
 rename app/javascript/styles/{material-black => mastodon-material}/layout/material-v2.scss (61%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/plugins/astarte.scss (74%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/plugins/cards.scss (80%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/plugins/dense.scss (88%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/plugins/plus.scss (84%)
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/icon_config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/layout.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
 rename app/javascript/styles/{y-zu-dark/custom_layout.scss => mastodon-material/profiles/y-zu-dark/layout.scss} (53%)
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-dark/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
 rename app/javascript/styles/{y-zu-light/custom_layout.scss => mastodon-material/profiles/y-zu-light/layout.scss} (53%)
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-light/loader.scss
 create mode 100644 app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/theme/_functions.scss (73%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/theme/_mixins.scss (82%)
 create mode 100644 app/javascript/styles/mastodon-material/theme/about.scss
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/theme/account.scss (85%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/base_config.scss (90%)
 rename app/javascript/styles/{mastodon-material-dark/icon_config.scss => mastodon-material/theme/base_icon_config.scss} (88%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/theme/basics.scss (72%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/button.scss (84%)
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/theme/columns.scss (90%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/components.scss (90%)
 create mode 100644 app/javascript/styles/mastodon-material/theme/containers.scss
 rename app/javascript/styles/{mastodon-material-light => mastodon-material}/theme/control.scss (79%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/emoji-picker.scss (80%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/theme/icons.scss (75%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/material-icons.scss (93%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/media.scss (92%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/modal.scss (93%)
 rename app/javascript/styles/{material-black => mastodon-material}/theme/responsive.scss (89%)
 rename app/javascript/styles/{mastodon-material-dark => mastodon-material}/theme/statuses.scss (91%)
 create mode 100644 app/javascript/styles/mastodon-material/theme/theme.scss
 create mode 100644 app/javascript/styles/mastodon-material/theme/variables.scss
 create mode 100644 app/javascript/styles/mastodon-material/theme/widgets.scss
 delete mode 100644 app/javascript/styles/material-black/color/black.scss
 delete mode 100644 app/javascript/styles/material-black/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-black/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-black/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-black/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-black/custom_color.scss
 delete mode 100644 app/javascript/styles/material-black/custom_config.scss
 delete mode 100644 app/javascript/styles/material-black/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-black/icon_config.scss
 delete mode 100644 app/javascript/styles/material-black/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/material-black/loader.scss
 delete mode 100644 app/javascript/styles/material-black/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/material-black/plugins/cards.scss
 delete mode 100644 app/javascript/styles/material-black/plugins/dense.scss
 delete mode 100644 app/javascript/styles/material-black/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-black/theme/_functions.scss
 delete mode 100644 app/javascript/styles/material-black/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/material-black/theme/account.scss
 delete mode 100644 app/javascript/styles/material-black/theme/basics.scss
 delete mode 100644 app/javascript/styles/material-black/theme/columns.scss
 delete mode 100644 app/javascript/styles/material-black/theme/containers.scss
 delete mode 100644 app/javascript/styles/material-black/theme/control.scss
 delete mode 100644 app/javascript/styles/material-black/theme/icons.scss
 delete mode 100644 app/javascript/styles/material-black/theme/statuses.scss
 delete mode 100644 app/javascript/styles/material-black/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-black/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-black/theme/widgets.scss
 delete mode 100644 app/javascript/styles/material-dark/color/black.scss
 delete mode 100644 app/javascript/styles/material-dark/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-dark/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-dark/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/material-dark/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-dark/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-dark/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/material-dark/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-dark/custom_color.scss
 delete mode 100644 app/javascript/styles/material-dark/custom_config.scss
 delete mode 100644 app/javascript/styles/material-dark/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-dark/icon_config.scss
 delete mode 100644 app/javascript/styles/material-dark/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/material-dark/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/material-dark/loader.scss
 delete mode 100644 app/javascript/styles/material-dark/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/material-dark/plugins/cards.scss
 delete mode 100644 app/javascript/styles/material-dark/plugins/dense.scss
 delete mode 100644 app/javascript/styles/material-dark/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/_functions.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/account.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/base_config.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/basics.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/button.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/columns.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/components.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/containers.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/control.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/icons.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/media.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/modal.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/responsive.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/statuses.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-dark/theme/widgets.scss
 delete mode 100644 app/javascript/styles/material-light/color/black.scss
 delete mode 100644 app/javascript/styles/material-light/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/material-light/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/material-light/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/material-light/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/material-light/color/v1-light.scss
 delete mode 100644 app/javascript/styles/material-light/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/material-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/material-light/custom_color.scss
 delete mode 100644 app/javascript/styles/material-light/custom_config.scss
 delete mode 100644 app/javascript/styles/material-light/custom_layout.scss
 delete mode 100644 app/javascript/styles/material-light/icon_config.scss
 delete mode 100644 app/javascript/styles/material-light/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/material-light/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/material-light/loader.scss
 delete mode 100644 app/javascript/styles/material-light/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/material-light/plugins/cards.scss
 delete mode 100644 app/javascript/styles/material-light/plugins/dense.scss
 delete mode 100644 app/javascript/styles/material-light/plugins/plus.scss
 delete mode 100644 app/javascript/styles/material-light/theme/_functions.scss
 delete mode 100644 app/javascript/styles/material-light/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/material-light/theme/account.scss
 delete mode 100644 app/javascript/styles/material-light/theme/base_config.scss
 delete mode 100644 app/javascript/styles/material-light/theme/basics.scss
 delete mode 100644 app/javascript/styles/material-light/theme/button.scss
 delete mode 100644 app/javascript/styles/material-light/theme/columns.scss
 delete mode 100644 app/javascript/styles/material-light/theme/components.scss
 delete mode 100644 app/javascript/styles/material-light/theme/containers.scss
 delete mode 100644 app/javascript/styles/material-light/theme/control.scss
 delete mode 100644 app/javascript/styles/material-light/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/material-light/theme/icons.scss
 delete mode 100644 app/javascript/styles/material-light/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/material-light/theme/media.scss
 delete mode 100644 app/javascript/styles/material-light/theme/modal.scss
 delete mode 100644 app/javascript/styles/material-light/theme/responsive.scss
 delete mode 100644 app/javascript/styles/material-light/theme/statuses.scss
 delete mode 100644 app/javascript/styles/material-light/theme/theme.scss
 delete mode 100644 app/javascript/styles/material-light/theme/variables.scss
 delete mode 100644 app/javascript/styles/material-light/theme/widgets.scss
 delete mode 100644 app/javascript/styles/plus/color/black.scss
 delete mode 100644 app/javascript/styles/plus/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/plus/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/plus/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/plus/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/plus/color/v1-light.scss
 delete mode 100644 app/javascript/styles/plus/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/plus/color/v2-light.scss
 delete mode 100644 app/javascript/styles/plus/custom_color.scss
 delete mode 100644 app/javascript/styles/plus/custom_config.scss
 delete mode 100644 app/javascript/styles/plus/custom_layout.scss
 delete mode 100644 app/javascript/styles/plus/icon_config.scss
 delete mode 100644 app/javascript/styles/plus/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/plus/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/plus/loader.scss
 delete mode 100644 app/javascript/styles/plus/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/plus/plugins/cards.scss
 delete mode 100644 app/javascript/styles/plus/plugins/dense.scss
 delete mode 100644 app/javascript/styles/plus/plugins/plus.scss
 delete mode 100644 app/javascript/styles/plus/theme/_functions.scss
 delete mode 100644 app/javascript/styles/plus/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/plus/theme/account.scss
 delete mode 100644 app/javascript/styles/plus/theme/base_config.scss
 delete mode 100644 app/javascript/styles/plus/theme/basics.scss
 delete mode 100644 app/javascript/styles/plus/theme/button.scss
 delete mode 100644 app/javascript/styles/plus/theme/columns.scss
 delete mode 100644 app/javascript/styles/plus/theme/components.scss
 delete mode 100644 app/javascript/styles/plus/theme/containers.scss
 delete mode 100644 app/javascript/styles/plus/theme/control.scss
 delete mode 100644 app/javascript/styles/plus/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/plus/theme/icons.scss
 delete mode 100644 app/javascript/styles/plus/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/plus/theme/media.scss
 delete mode 100644 app/javascript/styles/plus/theme/modal.scss
 delete mode 100644 app/javascript/styles/plus/theme/responsive.scss
 delete mode 100644 app/javascript/styles/plus/theme/statuses.scss
 delete mode 100644 app/javascript/styles/plus/theme/theme.scss
 delete mode 100644 app/javascript/styles/plus/theme/variables.scss
 delete mode 100644 app/javascript/styles/plus/theme/widgets.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/black.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/v1-light.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/color/v2-light.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/custom_color.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/custom_config.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/icon_config.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/loader.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/plugins/cards.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/plugins/dense.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/plugins/plus.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/_functions.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/account.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/base_config.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/basics.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/button.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/columns.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/components.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/containers.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/control.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/icons.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/media.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/modal.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/responsive.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/statuses.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/theme.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/variables.scss
 delete mode 100644 app/javascript/styles/y-zu-dark/theme/widgets.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/black.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/mastodon-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/mastodon-light.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/plus-classic.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/v1-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/v1-light.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/v2-dark.scss
 delete mode 100644 app/javascript/styles/y-zu-light/color/v2-light.scss
 delete mode 100644 app/javascript/styles/y-zu-light/custom_color.scss
 delete mode 100644 app/javascript/styles/y-zu-light/custom_config.scss
 delete mode 100644 app/javascript/styles/y-zu-light/icon_config.scss
 delete mode 100644 app/javascript/styles/y-zu-light/layout/material-v1.scss
 delete mode 100644 app/javascript/styles/y-zu-light/layout/material-v2.scss
 delete mode 100644 app/javascript/styles/y-zu-light/loader.scss
 delete mode 100644 app/javascript/styles/y-zu-light/plugins/astarte.scss
 delete mode 100644 app/javascript/styles/y-zu-light/plugins/cards.scss
 delete mode 100644 app/javascript/styles/y-zu-light/plugins/dense.scss
 delete mode 100644 app/javascript/styles/y-zu-light/plugins/plus.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/_functions.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/_mixins.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/account.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/base_config.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/basics.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/button.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/columns.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/components.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/containers.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/control.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/emoji-picker.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/icons.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/material-icons.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/media.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/modal.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/responsive.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/statuses.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/theme.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/variables.scss
 delete mode 100644 app/javascript/styles/y-zu-light/theme/widgets.scss

diff --git a/app/javascript/styles/mastodon-material-dark.scss b/app/javascript/styles/mastodon-material-dark.scss
index 889983ed4..84558ad33 100644
--- a/app/javascript/styles/mastodon-material-dark.scss
+++ b/app/javascript/styles/mastodon-material-dark.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'mastodon-material-dark/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/mastodon-material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/mastodon-material-dark/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss b/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/mastodon-material-dark/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/mastodon-material-dark/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss b/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/mastodon-material-dark/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_color.scss b/app/javascript/styles/mastodon-material-dark/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/mastodon-material-dark/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_config.scss b/app/javascript/styles/mastodon-material-dark/custom_config.scss
deleted file mode 100644
index 03e8e0c81..000000000
--- a/app/javascript/styles/mastodon-material-dark/custom_config.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/mastodon-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/custom_layout.scss b/app/javascript/styles/mastodon-material-dark/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/mastodon-material-dark/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss b/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/mastodon-material-dark/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/loader.scss b/app/javascript/styles/mastodon-material-dark/loader.scss
deleted file mode 100644
index 1ddf9883f..000000000
--- a/app/javascript/styles/mastodon-material-dark/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/cards.scss b/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/mastodon-material-dark/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_functions.scss b/app/javascript/styles/mastodon-material-dark/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss b/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/basics.scss b/app/javascript/styles/mastodon-material-dark/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/button.scss b/app/javascript/styles/mastodon-material-dark/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/columns.scss b/app/javascript/styles/mastodon-material-dark/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/components.scss b/app/javascript/styles/mastodon-material-dark/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/containers.scss b/app/javascript/styles/mastodon-material-dark/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/control.scss b/app/javascript/styles/mastodon-material-dark/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss b/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/media.scss b/app/javascript/styles/mastodon-material-dark/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/modal.scss b/app/javascript/styles/mastodon-material-dark/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss b/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/theme.scss b/app/javascript/styles/mastodon-material-dark/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/variables.scss b/app/javascript/styles/mastodon-material-dark/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/widgets.scss b/app/javascript/styles/mastodon-material-dark/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/mastodon-material-dark/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light.scss b/app/javascript/styles/mastodon-material-light.scss
index 5068d6386..9e1ac730e 100644
--- a/app/javascript/styles/mastodon-material-light.scss
+++ b/app/javascript/styles/mastodon-material-light.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'mastodon-material-light/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/mastodon-material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/black.scss b/app/javascript/styles/mastodon-material-light/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/mastodon-material-light/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss b/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss b/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/mastodon-material-light/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-light.scss b/app/javascript/styles/mastodon-material-light/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/mastodon-material-light/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss b/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/mastodon-material-light/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/color/v2-light.scss b/app/javascript/styles/mastodon-material-light/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/mastodon-material-light/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_color.scss b/app/javascript/styles/mastodon-material-light/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/mastodon-material-light/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_config.scss b/app/javascript/styles/mastodon-material-light/custom_config.scss
deleted file mode 100644
index cf51584fc..000000000
--- a/app/javascript/styles/mastodon-material-light/custom_config.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/mastodon-light';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/custom_layout.scss b/app/javascript/styles/mastodon-material-light/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/mastodon-material-light/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/icon_config.scss b/app/javascript/styles/mastodon-material-light/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/mastodon-material-light/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss b/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/mastodon-material-light/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/loader.scss b/app/javascript/styles/mastodon-material-light/loader.scss
deleted file mode 100644
index 1ddf9883f..000000000
--- a/app/javascript/styles/mastodon-material-light/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/astarte.scss b/app/javascript/styles/mastodon-material-light/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/mastodon-material-light/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/dense.scss b/app/javascript/styles/mastodon-material-light/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/mastodon-material-light/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/plugins/plus.scss b/app/javascript/styles/mastodon-material-light/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/mastodon-material-light/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss b/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/account.scss b/app/javascript/styles/mastodon-material-light/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/base_config.scss b/app/javascript/styles/mastodon-material-light/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/button.scss b/app/javascript/styles/mastodon-material-light/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/components.scss b/app/javascript/styles/mastodon-material-light/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/containers.scss b/app/javascript/styles/mastodon-material-light/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/icons.scss b/app/javascript/styles/mastodon-material-light/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss b/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/media.scss b/app/javascript/styles/mastodon-material-light/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/modal.scss b/app/javascript/styles/mastodon-material-light/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/responsive.scss b/app/javascript/styles/mastodon-material-light/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/statuses.scss b/app/javascript/styles/mastodon-material-light/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/theme.scss b/app/javascript/styles/mastodon-material-light/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/variables.scss b/app/javascript/styles/mastodon-material-light/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/widgets.scss b/app/javascript/styles/mastodon-material-light/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/mastodon-material-light/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/color/black.scss b/app/javascript/styles/mastodon-material/color/black.scss
similarity index 96%
rename from app/javascript/styles/mastodon-material-dark/color/black.scss
rename to app/javascript/styles/mastodon-material/color/black.scss
index 693caa813..04674b6ff 100644
--- a/app/javascript/styles/mastodon-material-dark/color/black.scss
+++ b/app/javascript/styles/mastodon-material/color/black.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #000000;
@@ -85,8 +87,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
diff --git a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
similarity index 96%
rename from app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
rename to app/javascript/styles/mastodon-material/color/mastodon-dark.scss
index b2e6bf27a..f78894243 100644
--- a/app/javascript/styles/mastodon-material-light/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
@@ -23,6 +23,8 @@ $menu-text-color: #282c37;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #191b22;
@@ -85,8 +87,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
diff --git a/app/javascript/styles/material-black/color/mastodon-light.scss b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
similarity index 96%
rename from app/javascript/styles/material-black/color/mastodon-light.scss
rename to app/javascript/styles/mastodon-material/color/mastodon-light.scss
index 7e94b8de7..d6877379c 100644
--- a/app/javascript/styles/material-black/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
@@ -22,6 +22,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #eff3f5;
@@ -84,8 +86,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
diff --git a/app/javascript/styles/material-black/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
similarity index 96%
rename from app/javascript/styles/material-black/color/plus-classic.scss
rename to app/javascript/styles/mastodon-material/color/plus-classic.scss
index d94bbe90f..5d8da861e 100644
--- a/app/javascript/styles/material-black/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #fafafa;
@@ -84,8 +86,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
diff --git a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss b/app/javascript/styles/mastodon-material/color/v1-dark.scss
similarity index 96%
rename from app/javascript/styles/mastodon-material-light/color/v1-dark.scss
rename to app/javascript/styles/mastodon-material/color/v1-dark.scss
index d31fbf04f..06b7d2276 100644
--- a/app/javascript/styles/mastodon-material-light/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-dark.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #303030;
@@ -84,8 +86,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
diff --git a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss b/app/javascript/styles/mastodon-material/color/v1-light.scss
similarity index 96%
rename from app/javascript/styles/mastodon-material-dark/color/v1-light.scss
rename to app/javascript/styles/mastodon-material/color/v1-light.scss
index 2888e81b4..aedcf3caf 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-light.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $inverted-text-color;
 $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #fafafa;
@@ -85,8 +87,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
diff --git a/app/javascript/styles/material-black/color/v2-dark.scss b/app/javascript/styles/mastodon-material/color/v2-dark.scss
similarity index 94%
rename from app/javascript/styles/material-black/color/v2-dark.scss
rename to app/javascript/styles/mastodon-material/color/v2-dark.scss
index 025b238f5..706ecb5f3 100644
--- a/app/javascript/styles/material-black/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-dark.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $inverted-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #121212;
@@ -85,8 +87,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
@@ -102,7 +104,7 @@ $toggle-thumb-active-color: #1a73e8;
 $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 // Border color
-$border-color: #2e2e2e;
+$border-color: #5f6368;
 $border-hover-color: lighten($border-color, 30%);
 $border-active-color: $primary-color;
 
@@ -113,7 +115,7 @@ $scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
 
 // App bar color
 $top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
+$search-bar-color: lighten($top-bar-color, 18%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
diff --git a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss b/app/javascript/styles/mastodon-material/color/v2-light.scss
similarity index 96%
rename from app/javascript/styles/mastodon-material-dark/color/v2-light.scss
rename to app/javascript/styles/mastodon-material/color/v2-light.scss
index fd9469961..7c5840794 100644
--- a/app/javascript/styles/mastodon-material-dark/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-light.scss
@@ -23,6 +23,8 @@ $menu-text-color: $ui-text-color;
 $top-bar-text-color: $ui-text-color;
 $search-bar-text-color: $primary-text-color;
 $contained-button-text-color: #ffffff;
+$primary-text-on-shadow-color: #ffffff;
+$text-field-color: $ui-text-color;
 
 // Background-color
 $bg-color: #ffffff;
@@ -85,8 +87,8 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
+$outlined-button-hover-color: transparentize($primary-color, 0.8);
+$outlined-button-active-color: transparentize($primary-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
diff --git a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss b/app/javascript/styles/mastodon-material/layout/material-v1.scss
similarity index 56%
rename from app/javascript/styles/mastodon-material-light/layout/material-v1.scss
rename to app/javascript/styles/mastodon-material/layout/material-v1.scss
index 23c9a0616..6fcc39ef5 100644
--- a/app/javascript/styles/mastodon-material-light/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v1.scss
@@ -38,13 +38,18 @@ $media-radius: 0;
 $nav-drawer-item-radius: 0;
 
 
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
+// Avatar cropping settings
+$avatar-radius: 50%;  // Rounded cropping
+//$avatar-radius: 2px  // Material v1 square
 
 
 // Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
+$chip-type: contained;  // Material v1 styled contained chip
+
+
+// Button on statuses
+$button-on-status: text;  // Material v1 styled text button
+//$button-on-status: outlined;  // Material v2 styled outlined button
 
 
 // Button shadow
@@ -55,6 +60,10 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 $fab-size: 56px;
 
 
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
+// CW text area border
+$cw-area-border: none;
+//$cw-area-border: underlined;
+
+// Compose text area border
+$compose-area-border: none;
+//$compose-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v2.scss b/app/javascript/styles/mastodon-material/layout/material-v2.scss
similarity index 61%
rename from app/javascript/styles/material-black/layout/material-v2.scss
rename to app/javascript/styles/mastodon-material/layout/material-v2.scss
index 5700a99c8..24b5add29 100644
--- a/app/javascript/styles/material-black/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v2.scss
@@ -44,14 +44,19 @@ $nav-drawer-item-radius: 8px;  // corner rounded
 //$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
 
 
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
+// Avatar cropping settings
+$avatar-radius: 50%;  // Rounded cropping
+//$avatar-radius: 8px  // Material v2 square
 
 
 // Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
+$chip-type: outlined;  // Material v2 styled outlined chip
+//$outlined-chip: contained;  // Material v1 styled contained chip
+
+
+// Button on statuses
+$button-on-status: text;  // Material v1 styled text button
+//$button-on-status: outlined;  // Material v2 styled outlined button
 
 
 // Button shadow
@@ -64,7 +69,12 @@ $fab-size: 56px;  // Regular
 //$fab-size: 40px;  // Mini
 
 
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
+// CW text area border
+$cw-area-border: none;
+//$cw-area-border: underlined;
+//$cw-area-border: outlined;
+
+// Compose text area border
+$compose-area-border: none;
+//$compose-area-border: underlined;
+//$compose-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/astarte.scss b/app/javascript/styles/mastodon-material/plugins/astarte.scss
similarity index 74%
rename from app/javascript/styles/mastodon-material-dark/plugins/astarte.scss
rename to app/javascript/styles/mastodon-material/plugins/astarte.scss
index 8c2e534bb..4e4ff54ae 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/astarte.scss
+++ b/app/javascript/styles/mastodon-material/plugins/astarte.scss
@@ -1,13 +1,8 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
 .announcements {
     li {
         padding: 8px 16px;
         background: $card-bg-color;
+        color: $primary-text-color;
         border-radius: $card-radius;
         border: 1px solid $border-color;
     }
diff --git a/app/javascript/styles/mastodon-material-light/plugins/cards.scss b/app/javascript/styles/mastodon-material/plugins/cards.scss
similarity index 80%
rename from app/javascript/styles/mastodon-material-light/plugins/cards.scss
rename to app/javascript/styles/mastodon-material/plugins/cards.scss
index d9b3906a5..48faf1ea1 100644
--- a/app/javascript/styles/mastodon-material-light/plugins/cards.scss
+++ b/app/javascript/styles/mastodon-material/plugins/cards.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
 .column {
     box-shadow: none !important;
     margin: 2px 0 !important;
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss b/app/javascript/styles/mastodon-material/plugins/dense.scss
similarity index 88%
rename from app/javascript/styles/mastodon-material-dark/plugins/dense.scss
rename to app/javascript/styles/mastodon-material/plugins/dense.scss
index 413336d04..070bd9d69 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material/plugins/dense.scss
@@ -1,9 +1,3 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
 .drawer {
     &__header { height: 48px }
 
@@ -20,12 +14,16 @@
     &__buttons { height: 48px }
 
     &__button { margin: 6px }
+
+    &__back-button { margin: 6px }
 }
 
 .column-subheading { padding: 8px 16px }
 
 .column-link { padding: 12px 16px }
 
+.tabs-bar__link { padding: 12px 16px 8px 16px }
+
 .notification__filter-bar button { padding: 12px 0 }
 
 .getting-started__footer {
diff --git a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss b/app/javascript/styles/mastodon-material/plugins/plus.scss
similarity index 84%
rename from app/javascript/styles/mastodon-material-dark/plugins/plus.scss
rename to app/javascript/styles/mastodon-material/plugins/plus.scss
index e356e937b..36ef1cebb 100644
--- a/app/javascript/styles/mastodon-material-dark/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material/plugins/plus.scss
@@ -1,9 +1,3 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
 .status__action-bar-button {
     background: #eeeeee;
     width: 28px !important;
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/config.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/config.scss
new file mode 100644
index 000000000..12e2b691f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/mastodon-dark.scss';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/layout.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/loader.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
new file mode 100644
index 000000000..e17916a49
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+//@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/color.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/config.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/config.scss
new file mode 100644
index 000000000..8e59a4fb4
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/mastodon-light.scss';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/layout.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/loader.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
new file mode 100644
index 000000000..e17916a49
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+//@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/color.scss b/app/javascript/styles/mastodon-material/profiles/material-black/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/config.scss b/app/javascript/styles/mastodon-material/profiles/material-black/config.scss
new file mode 100644
index 000000000..46d921e34
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/black';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/material-black/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/layout.scss b/app/javascript/styles/mastodon-material/profiles/material-black/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/loader.scss b/app/javascript/styles/mastodon-material/profiles/material-black/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
new file mode 100644
index 000000000..e17916a49
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+//@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/config.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/config.scss
new file mode 100644
index 000000000..1197655f3
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/v2-dark.scss';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/layout.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/loader.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
new file mode 100644
index 000000000..e17916a49
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+//@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/color.scss b/app/javascript/styles/mastodon-material/profiles/material-light/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/config.scss b/app/javascript/styles/mastodon-material/profiles/material-light/config.scss
new file mode 100644
index 000000000..986befe53
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/config.scss
@@ -0,0 +1 @@
+// Add your settings below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/material-light/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/layout.scss b/app/javascript/styles/mastodon-material/profiles/material-light/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/loader.scss b/app/javascript/styles/mastodon-material/profiles/material-light/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
new file mode 100644
index 000000000..e17916a49
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+//@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/color.scss b/app/javascript/styles/mastodon-material/profiles/plus/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/config.scss b/app/javascript/styles/mastodon-material/profiles/plus/config.scss
new file mode 100644
index 000000000..56cd971c1
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/plus-classic';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/plus/icon_config.scss
new file mode 100644
index 000000000..d2a44c6d5
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/icon_config.scss
@@ -0,0 +1,9 @@
+// Add your icon customization below
+
+$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";
+
+$favorite-icon-color: #ffffff;
+
+$reply-icon: "comment";
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/layout.scss b/app/javascript/styles/mastodon-material/profiles/plus/layout.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/layout.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/loader.scss b/app/javascript/styles/mastodon-material/profiles/plus/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss b/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
new file mode 100644
index 000000000..89adaca8a
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+@import '../../plugins/cards';
+@import '../../plugins/dense';
+@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
new file mode 100644
index 000000000..25466d633
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
@@ -0,0 +1 @@
+// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
new file mode 100644
index 000000000..fb818fab0
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/v2-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_layout.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
similarity index 53%
rename from app/javascript/styles/y-zu-dark/custom_layout.scss
rename to app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
index fb9dbbe00..88c66fb64 100644
--- a/app/javascript/styles/y-zu-dark/custom_layout.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
@@ -1,6 +1,3 @@
-@charset "UTF-8";
-
-
 // Add your customization below
 
 $avater-radius: 2px;
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/loader.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
new file mode 100644
index 000000000..292ec7fa6
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
new file mode 100644
index 000000000..87a4fed42
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -0,0 +1,32 @@
+// Add your customization below
+
+$bg-color: #fafafa;
+
+$primary-color: #6D4C41;
+
+$icon-color: #92787D;
+
+$icon-hover-color: darken($icon-color, 10%);
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
+$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $contained-button-color;
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
+$text-button-color: $contained-button-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+
+$border-color: lighten($icon-color, 30%);
+$border-hover-color: darken($border-color, 30%);
+$border-active-color: $primary-color;
+
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$icon-tab-indicator-active-color: $top-bar-icon-color;
+$icon-tab-indicator-hover-color: $top-bar-icon-hover-color;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
new file mode 100644
index 000000000..d250ece15
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
@@ -0,0 +1,3 @@
+// Add your settings below
+
+@import '../../color/v2-light';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
new file mode 100644
index 000000000..f109ac61c
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
@@ -0,0 +1,3 @@
+// Add your icon customization below
+
+$icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_layout.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
similarity index 53%
rename from app/javascript/styles/y-zu-light/custom_layout.scss
rename to app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
index fb9dbbe00..88c66fb64 100644
--- a/app/javascript/styles/y-zu-light/custom_layout.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
@@ -1,6 +1,3 @@
-@charset "UTF-8";
-
-
 // Add your customization below
 
 $avater-radius: 2px;
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/loader.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/loader.scss
new file mode 100644
index 000000000..539b6b38f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/loader.scss
@@ -0,0 +1,11 @@
+@charset "UTF-8";
+
+@import '../../theme/base_config', '../../theme/base_icon_config';
+@import 'config', 'icon_config';
+@import 'color', 'layout';
+
+@import '../../theme/functions', '../../theme/mixins';
+@import '../../theme/theme';
+@import 'plugins';
+
+@import '../../theme/material-icons';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
new file mode 100644
index 000000000..292ec7fa6
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
@@ -0,0 +1,4 @@
+@import '../../plugins/astarte';
+//@import '../../plugins/cards';
+@import '../../plugins/dense';
+//@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/_functions.scss b/app/javascript/styles/mastodon-material/theme/_functions.scss
similarity index 73%
rename from app/javascript/styles/mastodon-material-light/theme/_functions.scss
rename to app/javascript/styles/mastodon-material/theme/_functions.scss
index 0374231ed..20ce3f055 100644
--- a/app/javascript/styles/mastodon-material-light/theme/_functions.scss
+++ b/app/javascript/styles/mastodon-material/theme/_functions.scss
@@ -1,8 +1,7 @@
-@charset "UTF-8";
 @use "sass:string";
 
 
 // convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
+@function svg-color($color) {
     @return '%23' + string.slice(inspect($color), 2, 7);
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
similarity index 82%
rename from app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
rename to app/javascript/styles/mastodon-material/theme/_mixins.scss
index fcd556f2b..56dc92b20 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -1,6 +1,3 @@
-@charset "UTF-8";
-
-
 $shadow-color-1: rgba(0,0,0,.2);
 $shadow-color-2: rgba(0,0,0,.14);
 $shadow-color-3: rgba(0,0,0,.12);
@@ -32,7 +29,7 @@ $shadow-color-3: rgba(0,0,0,.12);
 
 @mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
 
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
+@mixin material-transition { transition: .25s cubic-bezier(0,0,0.2,1) }
 
 @mixin search-bar-hover {
     @if $search-bar-hover {
@@ -41,16 +38,54 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
+@mixin chip-type($chip-type) {
+    @if $chip-type == contained {
+        background: $contained-chip-color;
+
+        &.active { background-color: $contained-chip-selected-color }
+
+        &:hover { background-color: $contained-chip-selected-color }
+    }
+
+    @if $chip-type == outlined {
+        background: $outlined-chip-color;
+        border: 1px solid $outlined-chip-selected-border-color;
+    
+        &.active { background-color: $outlined-chip-selected-color }
+    
+        &:hover { background: $outlined-chip-hover-color }
+    }
+}
+
+@mixin button-type($button-type) {
+    @if $button-type == contained {
+        @if $button-shadow { @include shadow-1dp }
+        background: $contained-button-color;
+        color: $contained-button-text-color;
+
+        &:hover { background: $contained-button-hover-color }
+
+        &:focus { background: $contained-button-color }
+    }
+
+    @if $button-type == outlined {
+        box-shadow: none;
+        background: transparent;
+        color: $outlined-button-color;
+        border: 1px solid $outlined-button-color;
+
+        &:hover { background: $outlined-button-hover-color }
+
+        &:focus { background: $outlined-button-hover-color }
+    }
+
+    @if $button-type == text {
+        box-shadow: none;
+        background: transparent;
+
+        &:hover { background: $text-button-hover-color }
+
+        &:focus { background: $text-button-focus-color }
     }
 }
 
@@ -61,31 +96,27 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
-@mixin text-area-border {
+@mixin text-area-border($text-area-border) {
+    background: $text-field-bg-color;
+    color: $text-field-color;
+
+    &:hover { border-color: $border-hover-color }
+
     @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
+        border-radius: $card-radius $card-radius 0 0;
+        border-bottom: 1px solid $border-color;
 
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
+        &:active,
+        &:focus { border-bottom: 2px solid $border-active-color }
     }
 
     @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
+        border-radius: $card-radius;
+        border: 1px solid $border-color;
 
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
+        &:active,
+        &:focus {
+            border: 2px solid $border-active-color;
         }
     }
 }
diff --git a/app/javascript/styles/mastodon-material/theme/about.scss b/app/javascript/styles/mastodon-material/theme/about.scss
new file mode 100644
index 000000000..2639ed357
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/about.scss
@@ -0,0 +1,17 @@
+.landing-page {
+    &__call-to-action {
+        @include shadow-2dp;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        padding: 24px 36px;
+
+        .row__information-board {
+            .information-board__section {
+                padding: 0 16px;
+                color: $primary-text-color;
+            }
+        }
+    }
+}
+
+.information-board__section span:last-child { color: $ui-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-dark/theme/account.scss b/app/javascript/styles/mastodon-material/theme/account.scss
similarity index 85%
rename from app/javascript/styles/mastodon-material-dark/theme/account.scss
rename to app/javascript/styles/mastodon-material/theme/account.scss
index 551b4f4a8..3b1c58138 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/account.scss
+++ b/app/javascript/styles/mastodon-material/theme/account.scss
@@ -1,9 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
 .account {
     border-bottom: 1px solid $border-color;
     padding: 16px;
@@ -12,19 +6,19 @@
     .account__display-name strong { color: $primary-text-color }
 
     &__avatar {
-        border-radius: $avater-radius;
+        border-radius: $avatar-radius;
         width: 40px;
         height: 40px;
 
         &-overlay {
             &-base {
-                border-radius: $avater-radius;
+                border-radius: $avatar-radius;
                 width: 44px;
                 height: 44px;
                 background-size: 44px;
             }
 
-            &-overlay { border-radius: $avater-radius }
+            &-overlay { border-radius: $avatar-radius }
         }
     }
 
@@ -62,6 +56,7 @@
                     border-radius: 50%;
                     padding: 8px;
                     margin-left: 8px;
+                    margin-right: 0;
                 }
             }
         }
@@ -71,7 +66,7 @@
 
             &__links {
                 color: $secondary-text-color;
-                padding: 10px 0;
+                padding: 8px 0;
 
                 a {
                     color: $secondary-text-color;
@@ -142,6 +137,26 @@
         }
 
         &__content { color: $secondary-text-color }
+
+        &__fields {
+            border-color: $border-color;
+
+            dl { border-bottom: 1px solid $border-color }
+
+            dt {
+                color: $primary-text-color;
+                background: $list-bg-inactive-color;
+            }
+
+            dd { color: $primary-text-color }
+
+            .verified {
+                border: none;
+                background: $verified-color;
+
+                &__mark { color: $primary-text-color }
+            }
+        }
     }
 
     &__section-headline {
@@ -167,7 +182,7 @@
     }
 
     &__relationship {
-        padding: 0;
+        padding: 8px;
         height: auto;
 
         .icon-button {
diff --git a/app/javascript/styles/material-black/theme/base_config.scss b/app/javascript/styles/mastodon-material/theme/base_config.scss
similarity index 90%
rename from app/javascript/styles/material-black/theme/base_config.scss
rename to app/javascript/styles/mastodon-material/theme/base_config.scss
index f36a139ba..a3f28a18e 100644
--- a/app/javascript/styles/material-black/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material/theme/base_config.scss
@@ -7,13 +7,13 @@
 // Color scheme
 @import '../color/v1-light';
 // Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
+// @import '../../color/v2-light';
 
 
 // Layout profile
 @import '../layout/material-v1';
 // Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
+// @import '../../layout/material-v2';
 
 
 // Search bar hover settings
diff --git a/app/javascript/styles/mastodon-material-dark/icon_config.scss b/app/javascript/styles/mastodon-material/theme/base_icon_config.scss
similarity index 88%
rename from app/javascript/styles/mastodon-material-dark/icon_config.scss
rename to app/javascript/styles/mastodon-material/theme/base_icon_config.scss
index 99046e176..2081d8828 100644
--- a/app/javascript/styles/mastodon-material-dark/icon_config.scss
+++ b/app/javascript/styles/mastodon-material/theme/base_icon_config.scss
@@ -16,9 +16,9 @@ $reply-icon: "reply";
 
 // Material Design Icon settings
 // If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
+$icon-font-source: google;  // Google Fonts
 //$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
+//$icon-font-source: self;  // Self-hosting
 
 // Material Icon style settings
 $icon-font-style: filled;
diff --git a/app/javascript/styles/mastodon-material-light/theme/basics.scss b/app/javascript/styles/mastodon-material/theme/basics.scss
similarity index 72%
rename from app/javascript/styles/mastodon-material-light/theme/basics.scss
rename to app/javascript/styles/mastodon-material/theme/basics.scss
index bb8f68bf0..96a12ee24 100644
--- a/app/javascript/styles/mastodon-material-light/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material/theme/basics.scss
@@ -1,9 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
 body,
 body.embed { background: $bg-color }
 
diff --git a/app/javascript/styles/material-black/theme/button.scss b/app/javascript/styles/mastodon-material/theme/button.scss
similarity index 84%
rename from app/javascript/styles/material-black/theme/button.scss
rename to app/javascript/styles/mastodon-material/theme/button.scss
index 5f909d843..ebb064595 100644
--- a/app/javascript/styles/material-black/theme/button.scss
+++ b/app/javascript/styles/mastodon-material/theme/button.scss
@@ -1,13 +1,7 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 @include button-shadow;
 
 .icon-button {
+    @include material-transition;
     color: $icon-button-color;
     border-radius: 50%;
 
@@ -22,14 +16,18 @@
     &.inverted {
         color: $icon-button-color;
 
-        &.active { color: $icon-button-active-color }
+        &.active,
+        &:active { color: $icon-button-active-color }
+
+        &:focus {
+            color: $icon-button-active-color;
+            background-color: transparent;
+        }
 
         &:hover {
             color: $icon-button-hover-color;
             background-color: $icon-bg-hover-color;
         }
-
-        &:focus { background-color: transparent }
     }
 
     &.overlayed {
@@ -51,13 +49,13 @@
         margin-left: 8px;
     }
 
+    &:focus { background-color: transparent }
+
     &:hover {
         @include material-transition;
         color: $icon-button-hover-color;
         background-color: $icon-bg-hover-color;
     }
-
-    &:focus { background-color: transparent }
 }
 
 // Checkbox with label
@@ -115,16 +113,7 @@ label.icon-button {
 
     &.button--block { margin: 8px 0 }
 
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
+    &.button-secondary { @include button-type($button-on-status) }
 
     &.confirmation-modal__cancel-button {
         box-shadow: none;
diff --git a/app/javascript/styles/mastodon-material-light/theme/columns.scss b/app/javascript/styles/mastodon-material/theme/columns.scss
similarity index 90%
rename from app/javascript/styles/mastodon-material-light/theme/columns.scss
rename to app/javascript/styles/mastodon-material/theme/columns.scss
index 77a5c777a..5313038db 100644
--- a/app/javascript/styles/mastodon-material-light/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material/theme/columns.scss
@@ -1,9 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
 .column {
     @include shadow-1dp;
     padding: 0;
@@ -90,6 +84,7 @@
 
         .column-header__setting-btn {
             padding: 8px;
+            margin: 0 8px;
             border-radius: 50%;
 
             &:last-child { padding-right: 8px }
@@ -111,6 +106,7 @@
     }
 
     &__collapsible {
+        transition: .25s cubic-bezier(0.0,0.0,0.2,1), .25s cubic-bezier(1,0.2,0,0);
         color: $ui-text-color;
         background: $card-bg-color;
         border-top: 1px solid $border-color;
@@ -120,14 +116,17 @@
             padding: 16px;
         }
 
-        &.collapsed { border-top: none }
+        &.collapsed {
+            opacity: 1;
+            border-top: none;
+        }
     }
 
     &__back-button {
         background: $top-bar-color;
         color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
+        margin: 10px;
+        padding: 8px;
         font-size: 20px;
 
         span { display: none }
@@ -140,6 +139,8 @@
     padding: 12px 16px;
     margin-top: 8px;
     border-top: 1px solid $border-color;
+
+    &:first-child { border-top: none }
 }
 
 .column-link {
@@ -181,8 +182,7 @@
 .column-settings {
     &__section {
         color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
+        margin: 16px 0 8px;
     }
 
     &__row .text-btn { margin-bottom: 0 }
@@ -261,11 +261,11 @@
 .muted {
     .status {
         &__content {
-            color: $read-primary-text-color;
+            color: $read-primary-text-color !important;
     
-            p { color: $read-primary-text-color }
+            p { color: $read-primary-text-color !important }
     
-            a { color: $read-secondary-text-color }
+            a { color: $read-secondary-text-color !important }
         }
 
         &__display-name strong { color: $read-primary-text-color }
@@ -384,21 +384,28 @@
     &__container { color: $primary-text-color }
 
     &__item {
-        padding: 16px;
+        padding: 16px 8px;
         font-size: 16px;
 
         &__unread { background: $badge-color }
+
+        &__range {
+            margin-bottom: 8px;
+            padding-right: 16px;
+        }
     }
 
     &__pagination {
         color: $ui-text-color;
-        padding: 16px;
+        padding: 0 8px 16px;
         bottom: 0;
+        position: initial;
+        float: right;
 
         .icon-button {
             @include icon-button;
             padding: 8px;
-            margin: 0 4px;
+            margin: 0 8px;
             line-height: normal !important;
             box-sizing: content-box;
         }
@@ -407,13 +414,9 @@
     }
 }
 
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
 .reactions-bar {
     margin-top: 16px;
-    width: calc(100% - 72px);
+    width: auto;
 
     .emoji-button {
         color: $icon-button-color;
@@ -425,17 +428,11 @@
     }
 
     &__item {
-        background: $contained-chip-color;
+        @include chip-type($chip-type);
         border-radius: 17px;
         margin: 2px 4px;
 
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
+        &.active .reactions-bar__item__count { color: $chip-selected-text-color }
 
         &__emoji {
             width: 24px;
@@ -470,6 +467,7 @@
             &.active {
                 color: $tab-indicator-active-color;
                 border-bottom: 4px solid $tab-indicator-active-color;
+                padding: 12px 0 8px;
     
                 &::before,
                 &:after { border: none }
diff --git a/app/javascript/styles/material-black/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
similarity index 90%
rename from app/javascript/styles/material-black/theme/components.scss
rename to app/javascript/styles/mastodon-material/theme/components.scss
index aa64aabc5..dec609cbd 100644
--- a/app/javascript/styles/material-black/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -1,18 +1,9 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
     &__overlay { background-color: rgba(0,0,0,.32) !important }
 
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
+    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 5%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 95%) }
 }
 
 .drawer {
@@ -60,6 +51,10 @@
         }
 
         &__mastodon { background: $card-bg-color }
+
+        &:hover,
+        &:active,
+        &:focus { opacity: 1.0 }
     }
 }
 
@@ -115,13 +110,9 @@
     margin-top: 0;
     color: $tips-text-color;
 
-    h4 {
-        color: $secondary-text-color;
-    }
+    h4 { color: $secondary-text-color }
 
-    em {
-        color: $search-bar-text-color;
-    }
+    em { color: $search-bar-text-color }
 }
 
 .search-results {
@@ -201,9 +192,12 @@
 .compose-form {
     .autosuggest-textarea {
         &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
+            @include text-area-border($compose-area-border);
             padding: 8px 42px 8px 16px;
+
+            @if $compose-area-border == outlined {
+                &:focus { padding: 7px 41px 7px 15px }
+            }
     
             &::placeholder { color: $tips-text-color }
         }
@@ -233,16 +227,13 @@
         &.spoiler-input--visible { margin-bottom: 16px }
 
         &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
+            @include text-area-border($cw-area-border);
+            padding: 8px 16px;
 
-            &:hover { border-color: $border-hover-color }
+            @if $cw-area-border == outlined {
+                &:focus { padding: 7px 15px }
+            }
 
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
             &::placeholder { color: $tips-text-color }
         }
     }
@@ -287,18 +278,22 @@
             .icon-button {
                 @include icon-button;
                 padding: 8px;
+                margin: 0 2px;
             }
 
             .text-icon-button {
                 width: 20px !important;
                 height: 20px !important;
                 padding: 8px;
+                margin: 0 2px;
                 line-height: 20px !important;
             }
         }
 
         &__poll-wrapper {
-            border-top: 1px solid $border-color;
+            @if $compose-area-border == none {
+                border-top: 1px solid $border-color;
+            } @else { border-top: none }
 
             ul { padding: 16px 12px 16px 0 }
 
@@ -310,15 +305,7 @@
                 &:focus { border-color: $border-hover-color }
             }
 
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
+            .button.button-secondary { @include button-type($button-on-status) }
 
             .poll__footer { border-top: none }
         }
@@ -331,6 +318,8 @@
 
 
 .poll {
+    margin-top: 8px;
+
     .button { margin-right: 8px }
 
     li { margin-bottom: 0 }
@@ -348,7 +337,7 @@
 
         &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
 
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
+        &.active:hover { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, $control-border-hover-color 5px, $control-border-hover-color 7px, $control-border-active-color 8px, $control-border-active-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
 
         &.checkbox {
             border-radius: 2px;
@@ -369,8 +358,6 @@
     }
 
     &__option {
-        padding: 16px 0 8px;
-
         input[type=text] {
             color: $primary-text-color;
             background: $text-field-bg-color;
@@ -378,8 +365,6 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
-
-        &__text { line-height: 34px }
     }
 
     &__chart {
@@ -462,9 +447,7 @@
     }
 }
 
-.character-counter {
-    color: $secondary-text-color;
-}
+.character-counter { color: $secondary-text-color }
 
 .reply-indicator {
     box-shadow: none;
@@ -549,8 +532,8 @@
 .directory {
     &__card {
         @include shadow-1dp;
-        margin: 8px 4px;
         border-radius: $card-radius;
+        margin-bottom: 16px;
 
         &__img { border-radius: $card-radius $card-radius 0 0 }
 
@@ -558,6 +541,8 @@
             background: $card-bg-color;
             padding: 8px 16px;
 
+            &__relationship { width: auto }
+
             .display-name {
                 margin-left: 16px;
 
@@ -582,6 +567,11 @@
             .accounts-table__count { padding: 16px 0 }
         }
     }
+
+    &__list {
+        @include material-transition;
+        margin: 16px 0;
+    }
 }
 
 .mute-modal {
diff --git a/app/javascript/styles/mastodon-material/theme/containers.scss b/app/javascript/styles/mastodon-material/theme/containers.scss
new file mode 100644
index 000000000..42a12a1ac
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/containers.scss
@@ -0,0 +1,161 @@
+.public-layout {
+    .header {
+        @include shadow-4dp;
+        background: $top-bar-color;
+        border-radius: $nav-bar-radius;
+        margin: 16px 0;
+
+        .brand {
+            svg { fill: $top-bar-text-color }
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .nav-link,
+        .nav-link.optional {
+            color: $top-bar-text-color;
+
+            &:hover {
+                background: $tab-indicator-bg-hover-color;
+                text-decoration: none;
+            }
+        }
+
+        .nav-button {
+            background: transparent;
+            margin: 0;
+            border-radius: 0;
+
+            &:hover { background: $tab-indicator-bg-hover-color }
+        }
+
+        .detailed-status__meta { margin-top: 16px }
+    }
+
+    .detailed-status { padding: 16px }
+
+    .footer {
+        padding-top: 16px;
+        padding-bottom: 64px;
+        color: $ui-text-color;
+
+        h4 { color: $ui-text-color }
+
+        ul a { color: $secondary-text-color }
+
+        .grid .column-2 h4 a { color: $ui-text-color }
+
+        .brand {
+            svg { fill: $icon-color }
+
+            &:hover svg { fill: $icon-hover-color }
+        }
+    }
+
+    .account__section-headline {
+        @include shadow-1dp;
+        border-radius: $card-radius $card-radius 0 0;
+    }
+
+    .public-account-header {
+        @include shadow-2dp;
+        margin-bottom: 16px;
+
+        &__image {
+            border-radius: $card-radius $card-radius 0 0;
+            background: $card-bg-color;
+
+            &::after { box-shadow: none }
+        }
+
+        &__bar {
+            background: linear-gradient(0deg, transparent, transparent 60px, rgba(0, 0, 0, 0.5) 60px, rgba(0, 0, 0, 0.2) 80%, transparent);
+
+            &::before {
+                background: $text-tab-bg-color;
+                border-radius: 0 0 $card-radius $card-radius;
+            }
+
+            .avatar img {
+                border-radius: $avatar-radius;
+                border: 2px solid $border-color;
+                background: $card-bg-color;
+            }
+        }
+
+        &__tabs {
+            margin-left: 24px;
+
+            &__name {
+                h1 {
+                    color: $primary-text-on-shadow-color;
+                    text-shadow: none;
+
+                    small { color: $primary-text-on-shadow-color }
+                }
+            }
+
+            &__tabs {
+                .counter {
+                    color: $secondary-text-color;
+                    padding: 8px 16px;
+                    border-right: none;
+
+                    &.active {
+                        &::after { border-bottom: 4px solid $text-tab-indicator-active-color }
+                    }
+
+                    &::after {
+                        border-bottom: none;
+                        opacity: 1;
+                    }
+
+                    &:hover { background: $text-tab-indicator-bg-hover-color }
+
+                    .counter-number {
+                        color: $ui-text-color;
+                        margin-bottom: 6px;
+                    }
+                }
+            }
+        }
+
+        &--no-bar .public-account-header {
+            &__image,
+            &__image img { border-radius: $card-radius }
+        }
+    }
+
+    .public-account-bio {
+        @include shadow-2dp;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        margin-bottom: 16px;
+
+        &__extra,
+        .roles {
+            padding: 16px;
+            color: $info-text-color;
+        }
+
+        .account__header {
+            &__content {
+                padding: 16px 16px 0;
+                color: $primary-text-color;
+            }
+
+            &__fields {
+                a,
+                .verified a { color: $primary-text-color }
+
+                dl:first-child .verified { border-radius: 0 $card-radius 0 0 }
+            }
+        }
+    }
+
+    .directory__list { grid-gap: 16px }
+
+    .grid { grid-gap: 16px }
+}
+
+.grid-4 { grid-gap: 16px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material-light/theme/control.scss b/app/javascript/styles/mastodon-material/theme/control.scss
similarity index 79%
rename from app/javascript/styles/mastodon-material-light/theme/control.scss
rename to app/javascript/styles/mastodon-material/theme/control.scss
index a205a4cb7..67d8160a7 100644
--- a/app/javascript/styles/mastodon-material-light/theme/control.scss
+++ b/app/javascript/styles/mastodon-material/theme/control.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .react-toggle {
     width: 36px;
     height: 16px;
@@ -49,11 +42,11 @@
     padding: 8px 0;
 
     &__input {
-        border: 2px solid $border-color;
+        border: 2px solid $control-border-color;
 
         &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
+            border-color: $control-border-active-color;
+            background: $control-border-active-color;
             padding: 3px;
             background-clip: content-box;
         }
@@ -61,7 +54,7 @@
 }
 
 .compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
+    border: 2px solid $control-border-color;
     border-radius: 2px;
 
     &.active {
diff --git a/app/javascript/styles/material-black/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
similarity index 80%
rename from app/javascript/styles/material-black/theme/emoji-picker.scss
rename to app/javascript/styles/mastodon-material/theme/emoji-picker.scss
index 91663fb93..d6959dbcc 100644
--- a/app/javascript/styles/material-black/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
@@ -1,14 +1,23 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
 .emoji-picker-dropdown {
     &__menu {
         @include shadow-8dp;
         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 {
@@ -30,9 +39,7 @@
     &-bar {
         border: 0 solid $border-color;
 
-        &:first-child {
-            background: $menu-bg-color;
-        }
+        &:first-child { background: $menu-bg-color }
     }
 
     &-anchor {
diff --git a/app/javascript/styles/mastodon-material-dark/theme/icons.scss b/app/javascript/styles/mastodon-material/theme/icons.scss
similarity index 75%
rename from app/javascript/styles/mastodon-material-dark/theme/icons.scss
rename to app/javascript/styles/mastodon-material/theme/icons.scss
index 987767544..bb4b28eac 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/icons.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .fa.fa-users.column-link,
 .fa.fa-globe.column-link,
 .fa.fa-address-book.column-link,
diff --git a/app/javascript/styles/material-black/theme/material-icons.scss b/app/javascript/styles/mastodon-material/theme/material-icons.scss
similarity index 93%
rename from app/javascript/styles/material-black/theme/material-icons.scss
rename to app/javascript/styles/mastodon-material/theme/material-icons.scss
index dd01ce3d6..4599453d2 100644
--- a/app/javascript/styles/material-black/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/material-icons.scss
@@ -1,11 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
 @include icon-font;
 
 .fa-fw {
@@ -78,7 +70,9 @@
     &.fa-upload,
     &.fa-comments,
     &.fa-angle-right,
-    &.fa-thumb-tack {
+    &.fa-thumb-tack,
+    &.fa-hashtag,
+    &.fa-expand {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -149,6 +143,8 @@
     &.fa-comments::before { content: "forum" }
     &.fa-angle-right::before { content: "chevron_right" }
     &.fa-thumb-tack::before { content: "push_pin" }
+    &.fa-hashtag::before { content: "tag" }
+    &.fa-expand::before { content: "open_in_full" }
 }
 
 // bookmark icon
@@ -173,7 +169,8 @@
 .star-icon.active,
 .star-icon.icon-button.active.active,
 .notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
+.status__action-bar-button.star-icon.icon-button.active,
+.media-modal__overlay .picture-in-picture__footer .icon-button.star-icon.active { color: $favorite-icon-color }
 
 // boost icon
 button.icon-button i.fa-retweet {
@@ -220,11 +217,14 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 .fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
 
 // top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
+.tabs-bar__link .fa {
+    &.fa-home,
+    &.fa-bell,
+    &.fa-users,
+    &.fa-globe,
+    &.fa-search {
+        &.fa-fw { vertical-align: text-bottom }
+    }
 }
 
 // getting-started and side bar icons
@@ -246,6 +246,12 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 // Attachment icon
 .attachment-list__list a .fa { vertical-align: middle }
 
+// verified icon
+.verified__mark { vertical-align: middle }
+
+// tag icon
+.directory__tag h4 .fa { vertical-align: bottom }
+
 // status detail icon
 .detailed-status .fa {
     font-size: 16px;
diff --git a/app/javascript/styles/material-black/theme/media.scss b/app/javascript/styles/mastodon-material/theme/media.scss
similarity index 92%
rename from app/javascript/styles/material-black/theme/media.scss
rename to app/javascript/styles/mastodon-material/theme/media.scss
index b8ac12414..6040e3a5f 100644
--- a/app/javascript/styles/material-black/theme/media.scss
+++ b/app/javascript/styles/mastodon-material/theme/media.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .media-gallery {
     border-radius: $media-radius;
 
@@ -30,7 +23,8 @@
         &--active { background-color: $media-page-indicator-active-color }
     }
 
-    &__close {
+    &__close,
+    &__zoom-button {
         &.icon-button {
             background: transparent;
             color: $media-icon-color;
@@ -69,11 +63,19 @@
                 color: $media-icon-hover-color;
                 background-color: transparent;
             }
+
+            &.star-icon.active {
+                &:active,
+                &:focus,
+                &:hover { background: transparent }
+            }
         }
     }
 }
 
 .video-player {
+    border-radius: 0;
+
     &__controls {
         background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
         padding: 0 12px;
diff --git a/app/javascript/styles/material-black/theme/modal.scss b/app/javascript/styles/mastodon-material/theme/modal.scss
similarity index 93%
rename from app/javascript/styles/material-black/theme/modal.scss
rename to app/javascript/styles/mastodon-material/theme/modal.scss
index 93e5b24c1..6efb8bb3c 100644
--- a/app/javascript/styles/material-black/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material/theme/modal.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .confirmation-modal {
     @include shadow-24dp;
     background: $card-bg-color;
diff --git a/app/javascript/styles/material-black/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
similarity index 89%
rename from app/javascript/styles/material-black/theme/responsive.scss
rename to app/javascript/styles/mastodon-material/theme/responsive.scss
index 8618f7ed7..53635cee4 100644
--- a/app/javascript/styles/material-black/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .tabs-bar {
     background: $top-bar-color;
 
@@ -52,6 +45,12 @@
 
 .columns-area--mobile {
     .column { margin: 0 !important }
+
+    .account__header {
+        &__account-note,
+        &__bio .account__header__content { padding: 8px 16px }
+    }
+
     .search__input { padding: 16px 46px }
 
     .search__icon {
@@ -93,6 +92,12 @@
 
 //single column mode
 @media screen and (min-width: 631px) {
+    .column:first-child,
+    .drawer:first-child { padding-left: 8px }
+
+    .column:last-child,
+    .drawer:last-child { padding-right: 8px }
+
     .tabs-bar__link {
         &:hover {
             background: $tab-indicator-bg-hover-color;
diff --git a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
similarity index 91%
rename from app/javascript/styles/mastodon-material-dark/theme/statuses.scss
rename to app/javascript/styles/mastodon-material/theme/statuses.scss
index 7e4374014..1c2408bce 100644
--- a/app/javascript/styles/mastodon-material-dark/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -1,10 +1,3 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
 .status {
     padding: 12px 12px 4px 70px;
     border-bottom: 1px solid $border-color;
@@ -42,16 +35,11 @@
 
         p { margin-bottom: 16px }
 
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
+        .status__content__spoiler-link { @include button-type($button-on-status) }
 
         &__spoiler-link {
             border: 0;
+            margin: 0 4px;
             color: $text-button-color;
         }
 
@@ -261,10 +249,7 @@ a.status-card {
         }
     }
 
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
+    .button.logo-button { margin-bottom: 16px }
 }
 
 // search user trends
diff --git a/app/javascript/styles/mastodon-material/theme/theme.scss b/app/javascript/styles/mastodon-material/theme/theme.scss
new file mode 100644
index 000000000..34c523277
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/theme.scss
@@ -0,0 +1,6 @@
+/*
+* Mastodon Material 0.3.0
+* Copyright (C) 2021 Rintan, Genbu Project
+*/
+
+@import 'about', 'account', 'basics', 'button', 'columns', 'components', 'containers', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/variables.scss b/app/javascript/styles/mastodon-material/theme/variables.scss
new file mode 100644
index 000000000..2ad8824b8
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/variables.scss
@@ -0,0 +1 @@
+.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/widgets.scss b/app/javascript/styles/mastodon-material/theme/widgets.scss
new file mode 100644
index 000000000..9090ea45f
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/widgets.scss
@@ -0,0 +1,123 @@
+.hero-widget {
+    @include shadow-2dp;
+    margin-bottom: 16px;
+
+    &__img {
+        border-radius: $card-radius $card-radius 0 0;
+        background: $card-bg-color;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__text {
+        background: $card-bg-color;
+        padding: 16px;
+        color: $primary-text-color;
+        border-radius: 0 0 $card-radius $card-radius;
+    }
+}
+
+.endorsements-widget {
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+
+    h4 {
+        padding: 12px 16px;
+        color: $section-text-color;
+    }
+
+    .account { padding: 8px 16px }
+}
+
+.trends-widget h4 { color: $section-text-color }
+
+.placeholder-widget {
+    border-radius: 0;
+    border: none;
+    color: $tips-text-color;
+    margin-bottom: 16px;
+}
+
+.directory__tag {
+    margin-bottom: 16px;
+
+    &>a,
+    &>div {
+        @include shadow-2dp;
+        background: $card-bg-color;
+        border-radius: $card-radius;
+        padding: 16px;
+
+        &:active,
+        &:focus,
+        &:hover { background: $card-bg-color }
+    }
+
+    h4 {
+        color: $primary-text-color;
+
+        .fa { color: $icon-color }
+
+        small { color: $info-text-color }
+    }
+}
+
+.contact-widget {
+    color: $ui-text-color;
+
+    h4 { color: $ui-text-color }
+
+    .account { padding: 4px 0 8px }
+
+    &>a {
+        padding: 0 8px 4px;
+        color: $primary-text-color;
+    }
+}
+
+.box-widget {
+    @include shadow-2dp;
+    padding: 16px;
+    border-radius: $card-radius;
+    background: $card-bg-color;
+}
+
+.rich-formatting {
+    color: $ui-text-color;
+
+    h1, h2, h3, h4, h5, h6 { color: $primary-text-color }
+
+    a { color: $link-text-color }
+
+    li, p { color: $ui-text-color }
+}
+
+.table-of-contents {
+    background: $bg-color;
+    border-radius: 0;
+
+    li a {
+        padding: 16px;
+        color: $ui-text-color;
+        border-bottom: 1px solid $border-color;
+    }
+}
+
+.page-header {
+    background: $card-bg-color;
+    padding: 42px 16px;
+    margin: 16px 0;
+
+    h1 {
+        color: $primary-text-color;
+        margin-bottom: 8px;
+    }
+
+    p { color: $ui-text-color }
+}
+
+.memoriam-widget,
+.page-header {
+    @include shadow-4dp;
+    border-radius: $card-radius;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black.scss b/app/javascript/styles/material-black.scss
index 19f29bc08..6383c8bd1 100644
--- a/app/javascript/styles/material-black.scss
+++ b/app/javascript/styles/material-black.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'material-black/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/material-black/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/black.scss b/app/javascript/styles/material-black/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/material-black/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/mastodon-dark.scss b/app/javascript/styles/material-black/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/material-black/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v1-dark.scss b/app/javascript/styles/material-black/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/material-black/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v1-light.scss b/app/javascript/styles/material-black/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/material-black/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/color/v2-light.scss b/app/javascript/styles/material-black/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/material-black/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/custom_color.scss b/app/javascript/styles/material-black/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-black/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/custom_config.scss b/app/javascript/styles/material-black/custom_config.scss
deleted file mode 100644
index b85ed3d23..000000000
--- a/app/javascript/styles/material-black/custom_config.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/black';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/custom_layout.scss b/app/javascript/styles/material-black/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-black/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/icon_config.scss b/app/javascript/styles/material-black/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/material-black/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/layout/material-v1.scss b/app/javascript/styles/material-black/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/material-black/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/loader.scss b/app/javascript/styles/material-black/loader.scss
deleted file mode 100644
index 1ddf9883f..000000000
--- a/app/javascript/styles/material-black/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/astarte.scss b/app/javascript/styles/material-black/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/material-black/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/cards.scss b/app/javascript/styles/material-black/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/material-black/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/dense.scss b/app/javascript/styles/material-black/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/material-black/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/plugins/plus.scss b/app/javascript/styles/material-black/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/material-black/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/_functions.scss b/app/javascript/styles/material-black/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/material-black/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/_mixins.scss b/app/javascript/styles/material-black/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/material-black/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/account.scss b/app/javascript/styles/material-black/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/material-black/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/basics.scss b/app/javascript/styles/material-black/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/material-black/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/columns.scss b/app/javascript/styles/material-black/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/material-black/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/containers.scss b/app/javascript/styles/material-black/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/material-black/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/control.scss b/app/javascript/styles/material-black/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/material-black/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/icons.scss b/app/javascript/styles/material-black/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/material-black/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/statuses.scss b/app/javascript/styles/material-black/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/material-black/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/theme.scss b/app/javascript/styles/material-black/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/material-black/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/variables.scss b/app/javascript/styles/material-black/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/material-black/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-black/theme/widgets.scss b/app/javascript/styles/material-black/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/material-black/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark.scss b/app/javascript/styles/material-dark.scss
index 8cfd6c6be..9a4be9797 100644
--- a/app/javascript/styles/material-dark.scss
+++ b/app/javascript/styles/material-dark.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'material-dark/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/material-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/black.scss b/app/javascript/styles/material-dark/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/material-dark/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/mastodon-dark.scss b/app/javascript/styles/material-dark/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/material-dark/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/mastodon-light.scss b/app/javascript/styles/material-dark/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/material-dark/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/plus-classic.scss b/app/javascript/styles/material-dark/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/material-dark/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v1-dark.scss b/app/javascript/styles/material-dark/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/material-dark/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v1-light.scss b/app/javascript/styles/material-dark/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/material-dark/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v2-dark.scss b/app/javascript/styles/material-dark/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/material-dark/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/color/v2-light.scss b/app/javascript/styles/material-dark/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/material-dark/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/custom_color.scss b/app/javascript/styles/material-dark/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-dark/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/custom_config.scss b/app/javascript/styles/material-dark/custom_config.scss
deleted file mode 100644
index 2a0c9e0fd..000000000
--- a/app/javascript/styles/material-dark/custom_config.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/v2-dark';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/custom_layout.scss b/app/javascript/styles/material-dark/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-dark/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/icon_config.scss b/app/javascript/styles/material-dark/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/material-dark/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v1.scss b/app/javascript/styles/material-dark/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/material-dark/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/layout/material-v2.scss b/app/javascript/styles/material-dark/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/material-dark/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/loader.scss b/app/javascript/styles/material-dark/loader.scss
deleted file mode 100644
index 1ddf9883f..000000000
--- a/app/javascript/styles/material-dark/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/astarte.scss b/app/javascript/styles/material-dark/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/material-dark/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/cards.scss b/app/javascript/styles/material-dark/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/material-dark/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/dense.scss b/app/javascript/styles/material-dark/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/material-dark/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/plugins/plus.scss b/app/javascript/styles/material-dark/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/material-dark/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/_functions.scss b/app/javascript/styles/material-dark/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/material-dark/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/_mixins.scss b/app/javascript/styles/material-dark/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/material-dark/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/account.scss b/app/javascript/styles/material-dark/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/material-dark/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/base_config.scss b/app/javascript/styles/material-dark/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/material-dark/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/basics.scss b/app/javascript/styles/material-dark/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/material-dark/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/button.scss b/app/javascript/styles/material-dark/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/material-dark/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/columns.scss b/app/javascript/styles/material-dark/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/material-dark/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/components.scss b/app/javascript/styles/material-dark/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/material-dark/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/containers.scss b/app/javascript/styles/material-dark/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/material-dark/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/control.scss b/app/javascript/styles/material-dark/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/material-dark/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/emoji-picker.scss b/app/javascript/styles/material-dark/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/material-dark/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/icons.scss b/app/javascript/styles/material-dark/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/material-dark/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/material-icons.scss b/app/javascript/styles/material-dark/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/material-dark/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/media.scss b/app/javascript/styles/material-dark/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/material-dark/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/modal.scss b/app/javascript/styles/material-dark/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/material-dark/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/responsive.scss b/app/javascript/styles/material-dark/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/material-dark/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/statuses.scss b/app/javascript/styles/material-dark/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/material-dark/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/theme.scss b/app/javascript/styles/material-dark/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/material-dark/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/variables.scss b/app/javascript/styles/material-dark/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/material-dark/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-dark/theme/widgets.scss b/app/javascript/styles/material-dark/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/material-dark/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light.scss b/app/javascript/styles/material-light.scss
index 9818f14f5..047c5802d 100644
--- a/app/javascript/styles/material-light.scss
+++ b/app/javascript/styles/material-light.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'material-light/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/material-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/black.scss b/app/javascript/styles/material-light/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/material-light/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/mastodon-dark.scss b/app/javascript/styles/material-light/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/material-light/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/mastodon-light.scss b/app/javascript/styles/material-light/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/material-light/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/plus-classic.scss b/app/javascript/styles/material-light/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/material-light/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v1-dark.scss b/app/javascript/styles/material-light/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/material-light/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v1-light.scss b/app/javascript/styles/material-light/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/material-light/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v2-dark.scss b/app/javascript/styles/material-light/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/material-light/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/color/v2-light.scss b/app/javascript/styles/material-light/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/material-light/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/custom_color.scss b/app/javascript/styles/material-light/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-light/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/custom_config.scss b/app/javascript/styles/material-light/custom_config.scss
deleted file mode 100644
index 43b6488b6..000000000
--- a/app/javascript/styles/material-light/custom_config.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/custom_layout.scss b/app/javascript/styles/material-light/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/material-light/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/icon_config.scss b/app/javascript/styles/material-light/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/material-light/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v1.scss b/app/javascript/styles/material-light/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/material-light/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/layout/material-v2.scss b/app/javascript/styles/material-light/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/material-light/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/loader.scss b/app/javascript/styles/material-light/loader.scss
deleted file mode 100644
index 1ddf9883f..000000000
--- a/app/javascript/styles/material-light/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-//@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/astarte.scss b/app/javascript/styles/material-light/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/material-light/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/cards.scss b/app/javascript/styles/material-light/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/material-light/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/dense.scss b/app/javascript/styles/material-light/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/material-light/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/plugins/plus.scss b/app/javascript/styles/material-light/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/material-light/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/_functions.scss b/app/javascript/styles/material-light/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/material-light/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/_mixins.scss b/app/javascript/styles/material-light/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/material-light/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/account.scss b/app/javascript/styles/material-light/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/material-light/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/base_config.scss b/app/javascript/styles/material-light/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/material-light/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/basics.scss b/app/javascript/styles/material-light/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/material-light/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/button.scss b/app/javascript/styles/material-light/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/material-light/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/columns.scss b/app/javascript/styles/material-light/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/material-light/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/components.scss b/app/javascript/styles/material-light/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/material-light/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/containers.scss b/app/javascript/styles/material-light/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/material-light/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/control.scss b/app/javascript/styles/material-light/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/material-light/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/emoji-picker.scss b/app/javascript/styles/material-light/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/material-light/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/icons.scss b/app/javascript/styles/material-light/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/material-light/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/material-icons.scss b/app/javascript/styles/material-light/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/material-light/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/media.scss b/app/javascript/styles/material-light/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/material-light/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/modal.scss b/app/javascript/styles/material-light/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/material-light/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/responsive.scss b/app/javascript/styles/material-light/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/material-light/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/statuses.scss b/app/javascript/styles/material-light/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/material-light/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/theme.scss b/app/javascript/styles/material-light/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/material-light/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/variables.scss b/app/javascript/styles/material-light/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/material-light/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/material-light/theme/widgets.scss b/app/javascript/styles/material-light/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/material-light/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus.scss b/app/javascript/styles/plus.scss
index 9cbccaa5f..75d6f9452 100644
--- a/app/javascript/styles/plus.scss
+++ b/app/javascript/styles/plus.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'plus/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/plus/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/black.scss b/app/javascript/styles/plus/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/plus/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-dark.scss b/app/javascript/styles/plus/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/plus/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/mastodon-light.scss b/app/javascript/styles/plus/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/plus/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/plus-classic.scss b/app/javascript/styles/plus/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/plus/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-dark.scss b/app/javascript/styles/plus/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/plus/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v1-light.scss b/app/javascript/styles/plus/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/plus/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-dark.scss b/app/javascript/styles/plus/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/plus/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/color/v2-light.scss b/app/javascript/styles/plus/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/plus/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_color.scss b/app/javascript/styles/plus/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/plus/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_config.scss b/app/javascript/styles/plus/custom_config.scss
deleted file mode 100644
index cd403efed..000000000
--- a/app/javascript/styles/plus/custom_config.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-@import 'color/plus-classic';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/custom_layout.scss b/app/javascript/styles/plus/custom_layout.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/plus/custom_layout.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/plus/icon_config.scss b/app/javascript/styles/plus/icon_config.scss
deleted file mode 100644
index 3e06e0820..000000000
--- a/app/javascript/styles/plus/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-//$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-//$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-//$reply-icon: "reply";
-$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v1.scss b/app/javascript/styles/plus/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/plus/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/layout/material-v2.scss b/app/javascript/styles/plus/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/plus/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/plus/loader.scss b/app/javascript/styles/plus/loader.scss
deleted file mode 100644
index 804d14f3e..000000000
--- a/app/javascript/styles/plus/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-@import 'plugins/cards';
-@import 'plugins/dense';
-@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/astarte.scss b/app/javascript/styles/plus/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/plus/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/cards.scss b/app/javascript/styles/plus/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/plus/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/dense.scss b/app/javascript/styles/plus/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/plus/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/plugins/plus.scss b/app/javascript/styles/plus/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/plus/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/_functions.scss b/app/javascript/styles/plus/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/plus/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/_mixins.scss b/app/javascript/styles/plus/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/plus/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/account.scss b/app/javascript/styles/plus/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/plus/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/base_config.scss b/app/javascript/styles/plus/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/plus/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/basics.scss b/app/javascript/styles/plus/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/plus/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/button.scss b/app/javascript/styles/plus/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/plus/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/columns.scss b/app/javascript/styles/plus/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/plus/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/components.scss b/app/javascript/styles/plus/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/plus/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/containers.scss b/app/javascript/styles/plus/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/plus/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/control.scss b/app/javascript/styles/plus/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/plus/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/emoji-picker.scss b/app/javascript/styles/plus/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/plus/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/icons.scss b/app/javascript/styles/plus/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/plus/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/material-icons.scss b/app/javascript/styles/plus/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/plus/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/media.scss b/app/javascript/styles/plus/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/plus/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/modal.scss b/app/javascript/styles/plus/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/plus/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/responsive.scss b/app/javascript/styles/plus/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/plus/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/statuses.scss b/app/javascript/styles/plus/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/plus/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/theme.scss b/app/javascript/styles/plus/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/plus/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/variables.scss b/app/javascript/styles/plus/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/plus/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/plus/theme/widgets.scss b/app/javascript/styles/plus/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/plus/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark.scss b/app/javascript/styles/y-zu-dark.scss
index 90bfe0053..248f4441b 100644
--- a/app/javascript/styles/y-zu-dark.scss
+++ b/app/javascript/styles/y-zu-dark.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'y-zu-dark/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/y-zu-dark/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/black.scss b/app/javascript/styles/y-zu-dark/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/y-zu-dark/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss b/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/y-zu-dark/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/mastodon-light.scss b/app/javascript/styles/y-zu-dark/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/y-zu-dark/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/plus-classic.scss b/app/javascript/styles/y-zu-dark/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/y-zu-dark/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v1-dark.scss b/app/javascript/styles/y-zu-dark/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/y-zu-dark/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v1-light.scss b/app/javascript/styles/y-zu-dark/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/y-zu-dark/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v2-dark.scss b/app/javascript/styles/y-zu-dark/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/y-zu-dark/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/color/v2-light.scss b/app/javascript/styles/y-zu-dark/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/y-zu-dark/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_color.scss b/app/javascript/styles/y-zu-dark/custom_color.scss
deleted file mode 100644
index b4ac46881..000000000
--- a/app/javascript/styles/y-zu-dark/custom_color.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/custom_config.scss b/app/javascript/styles/y-zu-dark/custom_config.scss
deleted file mode 100644
index e974e139c..000000000
--- a/app/javascript/styles/y-zu-dark/custom_config.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-
-@import "color/v2-dark.scss";
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/icon_config.scss b/app/javascript/styles/y-zu-dark/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/y-zu-dark/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/layout/material-v1.scss b/app/javascript/styles/y-zu-dark/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/y-zu-dark/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/layout/material-v2.scss b/app/javascript/styles/y-zu-dark/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/y-zu-dark/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/loader.scss b/app/javascript/styles/y-zu-dark/loader.scss
deleted file mode 100644
index f51dde3e4..000000000
--- a/app/javascript/styles/y-zu-dark/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/astarte.scss b/app/javascript/styles/y-zu-dark/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/y-zu-dark/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/cards.scss b/app/javascript/styles/y-zu-dark/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/y-zu-dark/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/dense.scss b/app/javascript/styles/y-zu-dark/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/y-zu-dark/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/plugins/plus.scss b/app/javascript/styles/y-zu-dark/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/y-zu-dark/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/_functions.scss b/app/javascript/styles/y-zu-dark/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/y-zu-dark/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/_mixins.scss b/app/javascript/styles/y-zu-dark/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/y-zu-dark/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/account.scss b/app/javascript/styles/y-zu-dark/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/y-zu-dark/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/base_config.scss b/app/javascript/styles/y-zu-dark/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/y-zu-dark/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/basics.scss b/app/javascript/styles/y-zu-dark/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/y-zu-dark/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/button.scss b/app/javascript/styles/y-zu-dark/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/y-zu-dark/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/columns.scss b/app/javascript/styles/y-zu-dark/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/y-zu-dark/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/components.scss b/app/javascript/styles/y-zu-dark/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/y-zu-dark/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/containers.scss b/app/javascript/styles/y-zu-dark/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/y-zu-dark/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/control.scss b/app/javascript/styles/y-zu-dark/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/y-zu-dark/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss b/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/y-zu-dark/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/icons.scss b/app/javascript/styles/y-zu-dark/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/y-zu-dark/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/material-icons.scss b/app/javascript/styles/y-zu-dark/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/y-zu-dark/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/media.scss b/app/javascript/styles/y-zu-dark/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/y-zu-dark/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/modal.scss b/app/javascript/styles/y-zu-dark/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/y-zu-dark/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/responsive.scss b/app/javascript/styles/y-zu-dark/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/y-zu-dark/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/statuses.scss b/app/javascript/styles/y-zu-dark/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/y-zu-dark/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/theme.scss b/app/javascript/styles/y-zu-dark/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/y-zu-dark/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/variables.scss b/app/javascript/styles/y-zu-dark/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/y-zu-dark/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-dark/theme/widgets.scss b/app/javascript/styles/y-zu-dark/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/y-zu-dark/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light.scss b/app/javascript/styles/y-zu-light.scss
index c769a7cef..090f0c00e 100644
--- a/app/javascript/styles/y-zu-light.scss
+++ b/app/javascript/styles/y-zu-light.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'y-zu-light/loader';
\ No newline at end of file
+@import 'mastodon-material/profiles/y-zu-light/loader';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/black.scss b/app/javascript/styles/y-zu-light/color/black.scss
deleted file mode 100644
index 693caa813..000000000
--- a/app/javascript/styles/y-zu-light/color/black.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #000000;
-$menu-bg-color: #121212;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #121212;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #000000;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #1e1e1e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #121212;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #1e1e1e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #1e1e1e;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/mastodon-dark.scss b/app/javascript/styles/y-zu-light/color/mastodon-dark.scss
deleted file mode 100644
index b2e6bf27a..000000000
--- a/app/javascript/styles/y-zu-light/color/mastodon-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9baec8;
-$ui-text-color: #fff;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #606984;
-$tips-text-color: #6d7889;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4ea2df;
-$menu-text-color: #282c37;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #191b22;
-$menu-bg-color: #d9e1e8;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #313543;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #282c37;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #42485a;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #393f4f;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#42485a, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #9baec8;
-$icon-hover-color: lighten($icon-color, 30%);
-$icon-bg-hover-color: lighten($bg-color, 14%);
-$icon-bg-active-color: lighten($bg-color, 18%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #fff;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.7);
-$text-button-focus-color: transparentize($text-button-color, 0.6);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($primary-color, 18%);
-
-// Border color
-$border-color: #393f4f;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 16%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 26%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 32%);
-
-// App bar color
-$top-bar-color: #313543;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/mastodon-light.scss b/app/javascript/styles/y-zu-light/color/mastodon-light.scss
deleted file mode 100644
index 7e94b8de7..000000000
--- a/app/javascript/styles/y-zu-light/color/mastodon-light.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #2b90d9;
-$secondary-color: #2b90d9;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #217aba;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #eff3f5;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($bg-color, 6%);
-$menu-bg-active-color: darken($bg-color, 10%);
-$menu-bg-active-hover-color: darken($bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #282c37;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: darken($bg-color, 4%);
-$icon-bg-active-color: darken($bg-color, 8%);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $icon-hover-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: lighten($text-button-color, 36%);
-$text-button-focus-color: lighten($text-button-color, 30%);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: $primary-color;
-$toggle-track-active-color: lighten($primary-color, 26%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: #ccd7e0;
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #ffffff;
-$search-bar-color: #d9e1e8;
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/plus-classic.scss b/app/javascript/styles/y-zu-light/color/plus-classic.scss
deleted file mode 100644
index d94bbe90f..000000000
--- a/app/javascript/styles/y-zu-light/color/plus-classic.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $secondary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #db4437;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v1-dark.scss b/app/javascript/styles/y-zu-light/color/v1-dark.scss
deleted file mode 100644
index d31fbf04f..000000000
--- a/app/javascript/styles/y-zu-light/color/v1-dark.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #303030;
-$menu-bg-color: #424242;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #424242;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #424242;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: lighten($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: lighten($top-bar-icon-color, 18%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($bg-color, 30%);
-$scroll-bar-thumb-active-color: lighten($bg-color, 38%);
-
-// App bar color
-$top-bar-color: #1565C0;
-$search-bar-color: lighten($bg-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v1-light.scss b/app/javascript/styles/y-zu-light/color/v1-light.scss
deleted file mode 100644
index 2888e81b4..000000000
--- a/app/javascript/styles/y-zu-light/color/v1-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $inverted-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #fafafa;
-$menu-bg-color: #ffffff;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: #ffffff;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: #ffffff;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: #ffffff;
-$top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
-$top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
-$top-bar-unread-icon-color: darken($primary-color, 30%);
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #2196f3;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v2-dark.scss b/app/javascript/styles/y-zu-light/color/v2-dark.scss
deleted file mode 100644
index 025b238f5..000000000
--- a/app/javascript/styles/y-zu-light/color/v2-dark.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: dark;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #ffffff;
-$secondary-text-color: #9aa0a6;
-$ui-text-color: #e8eaed;
-$inverted-text-color: #000000;
-$section-text-color: $primary-color;
-$info-text-color: #9aa0a6;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $inverted-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #121212;
-$menu-bg-color: #1e1e1e;
-$menu-bg-hover-color: lighten($menu-bg-color, 6%);
-$menu-bg-active-color: lighten($menu-bg-color, 10%);
-$menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
-$card-bg-color: #1e1e1e;
-$card-bg-hover-color: lighten($card-bg-color, 6%);
-$list-bg-color: #1e1e1e;
-$list-bg-hover-color: lighten($list-bg-color, 6%);
-$list-bg-active-color: lighten($list-bg-color, 10%);
-$list-bg-inactive-color: lighten($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: darken($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #2e2e2e;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: lighten($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #1e1e1e;
-$outlined-chip-hover-color: lighten($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#2e2e2e, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #e2e2e3;
-$icon-hover-color: #ffffff;
-$icon-bg-hover-color: transparentize(#ffffff, 0.8);
-$icon-bg-active-color: transparentize(#ffffff, 0.7);
-$disabled-icon-color: darken($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
-$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
-$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #2e2e2e;
-$border-hover-color: lighten($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: lighten($bg-color, 20%);
-$scroll-bar-thumb-hover-color: lighten($scroll-bar-thumb-color, 10%);
-$scroll-bar-thumb-active-color: lighten($scroll-bar-thumb-color, 18%);
-
-// App bar color
-$top-bar-color: #272727;
-$search-bar-color: lighten($top-bar-color, 6%);
-$search-bar-focus-color: #ffffff;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/color/v2-light.scss b/app/javascript/styles/y-zu-light/color/v2-light.scss
deleted file mode 100644
index fd9469961..000000000
--- a/app/javascript/styles/y-zu-light/color/v2-light.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-@charset "UTF-8";
-
-
-$color-scheme: light;
-
-// Base color
-$primary-color: #4285f4;
-$secondary-color: #db4437;
-$error-color: #B00020;
-$verified-color: #4caf50;
-
-// Text color
-$primary-text-color: #000000;
-$secondary-text-color: #5f6368;
-$ui-text-color: #202124;
-$inverted-text-color: #ffffff;
-$section-text-color: $primary-color;
-$info-text-color: #5e5e5e;
-$tips-text-color: #c0c0c0;
-$disabled-text-color: rgba(0,0,0,.54);
-$link-text-color: #4285f4;
-$menu-text-color: $ui-text-color;
-$top-bar-text-color: $ui-text-color;
-$search-bar-text-color: $primary-text-color;
-$contained-button-text-color: #ffffff;
-
-// Background-color
-$bg-color: #ffffff;
-$menu-bg-color: $bg-color;
-$menu-bg-hover-color: darken($menu-bg-color, 6%);
-$menu-bg-active-color: darken($menu-bg-color, 10%);
-$menu-bg-active-hover-color: darken($menu-bg-color, 16%);
-$card-bg-color: $bg-color;
-$card-bg-hover-color: darken($card-bg-color, 6%);
-$list-bg-color: $bg-color;
-$list-bg-hover-color: darken($list-bg-color, 6%);
-$list-bg-active-color: darken($list-bg-color, 10%);
-$list-bg-inactive-color: darken($list-bg-color, 10%);
-$text-field-bg-color: $card-bg-color;
-$verified-bg-color: lighten($verified-color, 20%);
-$unread-bg-color: transparentize($primary-color, 0.8);
-
-// Chip color
-$contained-chip-color: #e0e0e0;
-$chip-selected-text-color: $primary-color;
-$contained-chip-hover-color: darken($contained-chip-color, 6%);
-$contained-chip-selected-color: transparentize($chip-selected-text-color, 0.7);
-$outlined-chip-color: #ffffff;
-$outlined-chip-hover-color: darken($outlined-chip-color, 6%);
-$outlined-chip-selected-color: transparentize($chip-selected-text-color, 0.8);
-$outlined-chip-selected-border-color: transparentize($chip-selected-text-color, 0.7);
-
-// Relationship tag color
-$relationship-tag-color: transparentize(#e0e0e0, 0.2);
-
-// Badge color
-$badge-color: $primary-color;
-//$badge-color: $secondary-color;
-
-// Icon color
-$icon-color: #757575;
-$icon-hover-color: darken($icon-color, 30%);
-$icon-bg-hover-color: transparentize(#000000, 0.9);
-$icon-bg-active-color: transparentize(#000000, 0.8);
-$disabled-icon-color: lighten($icon-color, 16%);
-$top-bar-icon-color: $icon-color;
-$top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
-$top-bar-unread-icon-color: $secondary-color;
-$media-icon-color: transparentize(#ffffff, 0.4);
-$media-icon-hover-color: transparentize(#ffffff, 0.2);
-$media-icon-bg-color: transparentize(#000000, 0.5);
-$media-icon-bg-hover-color: transparentize(#000000, 0.8);
-
-// Control color
-$control-border-color: $icon-color;
-$control-border-active-color: $primary-color;
-$control-border-hover-color: transparentize($control-border-active-color, 0.8);
-
-// Button color
-$icon-button-color: $icon-color;
-$icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
-$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
-$contained-button-color: $primary-color;
-$contained-button-hover-color: lighten($contained-button-color, 10%);
-$outlined-button-color: $primary-color;
-$outlined-button-hover-color: lighten($primary-color, 36%);
-$outlined-button-active-color: lighten($primary-color, 30%);
-$text-button-color: $primary-color;
-$text-button-hover-color: transparentize($text-button-color, 0.8);
-$text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: #ffffff;
-$floating-action-button-hover-color: darken($floating-action-button-color, 6%);
-$floating-action-button-active-color: darken($floating-action-button-color, 10%);
-$floating-action-button-icon-color: $primary-color;
-
-// Toggle color
-$toggle-thumb-color: #ffffff;
-$toggle-track-color: darken($toggle-thumb-color, 18%);
-$toggle-thumb-active-color: #1a73e8;
-$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
-
-// Border color
-$border-color: #dadce0;
-$border-hover-color: darken($border-color, 30%);
-$border-active-color: $primary-color;
-
-// Scroll bar color
-$scroll-bar-thumb-color: darken($bg-color, 20%);
-$scroll-bar-thumb-hover-color: darken($bg-color, 30%);
-$scroll-bar-thumb-active-color: darken($bg-color, 38%);
-
-// App bar color
-$top-bar-color: $bg-color;
-$search-bar-color: darken($bg-color, 6%);
-$search-bar-focus-color: $bg-color;
-
-// Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
-
-// Media indicator color
-$media-page-indicator-color: #9e9e9e;
-$media-page-indicator-active-color: #e6e6e6;
-
-// Progress indicator color
-$progress-indicator-color: $primary-color;
-$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
-
-// Contents color in read status
-$read-primary-text-color: transparentize($primary-text-color, 0.3);
-$read-secondary-text-color: transparentize($secondary-text-color, 0.3);
-$read-ui-text-color: transparentize($ui-text-color, 0.3);
-$read-poll-bar-leading-color: transparentize($progress-indicator-color, 0.3);
-$read-poll-bar-color: transparentize($progress-indicator-track-color, 0.3);
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_color.scss b/app/javascript/styles/y-zu-light/custom_color.scss
deleted file mode 100644
index 7ace77932..000000000
--- a/app/javascript/styles/y-zu-light/custom_color.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your customization below
-$bg-color: #fafafa;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/custom_config.scss b/app/javascript/styles/y-zu-light/custom_config.scss
deleted file mode 100644
index 84a5a659a..000000000
--- a/app/javascript/styles/y-zu-light/custom_config.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@charset "UTF-8";
-
-
-// Add your settings below
-
-@import "color/v2-light.scss";
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/icon_config.scss b/app/javascript/styles/y-zu-light/icon_config.scss
deleted file mode 100644
index 99046e176..000000000
--- a/app/javascript/styles/y-zu-light/icon_config.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// Favorite icon settings
-$favorite-icon: "star"; $favorite-icon-border: "star_border";  // Star
-//$favorite-icon: "favorite"; $favorite-icon-border: "favorite_border";  // Heart
-//$favorite-icon: "plus_one"; $favorite-icon-border: "plus_one";  // +1
-
-$favorite-icon-color: #ffd600;  // Star
-//$favorite-icon-color: #ff4081;  // Heart
-//$favorite-icon-color: #db4437;  // +1
-//$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
-
-
-// Reply icon settings
-$reply-icon: "reply";
-//$reply-icon: "comment";  // blooming
-
-
-// Material Design Icon settings
-// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in '../../fonts' folder and configure below.
-//$icon-font-source: google;  // Google Fonts
-//$icon-font-source: github;  // GitHub
-$icon-font-source: self;  // Self-hosting
-
-// Material Icon style settings
-$icon-font-style: filled;
-//$icon-font-style: outlined;
-//$icon-font-style: round;
-//$icon-font-style: sharp;
-//$icon-font-style: two-tone;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/layout/material-v1.scss b/app/javascript/styles/y-zu-light/layout/material-v1.scss
deleted file mode 100644
index 23c9a0616..000000000
--- a/app/javascript/styles/y-zu-light/layout/material-v1.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 2px;
-
-
-// Search bar radius
-$search-bar-radius: 2px;
-
-
-// Bar radius settings
-$bar-radius: 0;
-
-
-// Button radius settings
-$button-radius: 2px;
-
-
-// Card radius settings
-$card-radius: 2px;
-
-
-// Dialog radius settings
-$dialog-radius: 2px;
-
-
-// Menu radius settings
-$menu-radius: 2px;
-
-
-// Media radius settings
-$media-radius: 0;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 0;
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 2px  // Material v1 square
-
-
-// Chip settings
-$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/layout/material-v2.scss b/app/javascript/styles/y-zu-light/layout/material-v2.scss
deleted file mode 100644
index 5700a99c8..000000000
--- a/app/javascript/styles/y-zu-light/layout/material-v2.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@charset "UTF-8";
-@import '../theme/mixins';
-
-
-// Navigation bar radius
-$nav-bar-radius: 8px;
-//$nav-bar-radius: 28px;  // full radius
-
-
-// Search bar radius
-$search-bar-radius: 8px;
-//$search-bar-radius: 21px;  // full rounded
-
-
-// Bar radius settings
-$bar-radius: 0;
-//$bar-radius: 8px;
-
-
-// Button radius settings
-$button-radius: 8px;
-
-
-// Card radius settings
-$card-radius: 8px;
-
-
-// Dialog radius settings
-$dialog-radius: 8px;
-
-
-// Menu radius settings
-$menu-radius: 8px;
-
-
-// Media radius settings
-$media-radius: 0;
-//$media-radius: 2px;
-
-
-// Navigation drawer item settings
-$nav-drawer-item-radius: 8px;  // corner rounded
-//$nav-drawer-item-radius: 32px;  // full rounded
-//$nav-drawer-item-radius: 32px 0 0 32px;  // left rounded
-
-
-// Avater cropping settings
-$avater-radius: 50%;  // Rounded cropping
-//$avater-radius: 8px  // Material v2 square
-
-
-// Chip settings
-$outlined-chip: true;  // Material v2 styled outlined chip
-//$outlined-chip: false;  // Material v1 styled contained chip
-
-
-// Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
-
-
-// Floating Action Button size
-$fab-size: 56px;  // Regular
-//$fab-size: 40px;  // Mini
-
-
-// Text area border
-$text-area-border: false;
-//$text-area-border: underlined;
-//$text-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/loader.scss b/app/javascript/styles/y-zu-light/loader.scss
deleted file mode 100644
index f51dde3e4..000000000
--- a/app/javascript/styles/y-zu-light/loader.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'theme/theme';
-@import 'theme/material-icons';
-
-// Plugins
-@import 'plugins/astarte';
-//@import 'plugins/cards';
-@import 'plugins/dense';
-//@import 'plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/astarte.scss b/app/javascript/styles/y-zu-light/plugins/astarte.scss
deleted file mode 100644
index 8c2e534bb..000000000
--- a/app/javascript/styles/y-zu-light/plugins/astarte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.announcements {
-    li {
-        padding: 8px 16px;
-        background: $card-bg-color;
-        border-radius: $card-radius;
-        border: 1px solid $border-color;
-    }
-
-    &__icon {
-        margin: 0;
-        right: 16px;
-        height: 20px;
-
-        .icon-button {
-            @include icon-button;
-
-            &:hover { background: transparent }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/cards.scss b/app/javascript/styles/y-zu-light/plugins/cards.scss
deleted file mode 100644
index d9b3906a5..000000000
--- a/app/javascript/styles/y-zu-light/plugins/cards.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import '../theme/mixins';
-
-
-.column {
-    box-shadow: none !important;
-    margin: 2px 0 !important;
-    padding: 8px !important;
-
-    > .scrollable { background: $bg-color }
-}
-
-.status {
-    border-bottom: 0;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-
-    &__prepend { padding: 8px 8px 2px 0 }
-}
-
-.account { border-bottom: 0 !important }
-
-.status__wrapper.status__wrapper,
-.notification.notification {
-    @include shadow-1dp;
-    margin: 8px 2px;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-}
-
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
-
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/dense.scss b/app/javascript/styles/y-zu-light/plugins/dense.scss
deleted file mode 100644
index 413336d04..000000000
--- a/app/javascript/styles/y-zu-light/plugins/dense.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.drawer {
-    &__header { height: 48px }
-
-    &__tab { margin: 6px auto 6px }
-}
-
-.column { margin: 10px 5px }
-
-.column-header {
-    height: 48px;
-
-    > button { padding: 12px 16px }
-    
-    &__buttons { height: 48px }
-
-    &__button { margin: 6px }
-}
-
-.column-subheading { padding: 8px 16px }
-
-.column-link { padding: 12px 16px }
-
-.notification__filter-bar button { padding: 12px 0 }
-
-.getting-started__footer {
-    padding: 12px 16px;
-
-    p { margin-bottom: 12px }
-}
-
-.compose-form {
-    .compose-form {
-        &__publish { padding-top: 8px }
-
-        &__buttons-wrapper {
-            .icon-button,
-            .text-icon-button { padding: 4px }
-        }
-    }
-}
-
-.status {
-    padding: 8px 8px 4px 66px;
-
-    &__expand { width: 66px }
-
-    &__info { padding-right: 0 }
-
-    &__avatar {
-        left: 8px;
-        top: 10px;
-    }
-
-    &__content { padding-top: 2px }
-
-    &__action-bar-button {
-        margin: 0 4px;
-
-        &.icon-button { padding: 4px }
-    }
-
-    &__action-bar-dropdown {
-        width: 28px !important;
-        height: 28px !important;
-        margin: 0 4px;
-
-        .icon-button { padding: 4px }
-    }
-}
-
-.detailed-status {
-    padding: 14px;
-
-    &__meta { margin-top: 14px }
-
-    &__action-bar { padding: 10px 0 }
-}
-
-.reply-indicator { padding: 8px }
-
-.button.button--block { margin: 6px 0 }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/plugins/plus.scss b/app/javascript/styles/y-zu-light/plugins/plus.scss
deleted file mode 100644
index e356e937b..000000000
--- a/app/javascript/styles/y-zu-light/plugins/plus.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-@import '../theme/base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.status__action-bar-button {
-    background: #eeeeee;
-    width: 28px !important;
-    height: 28px !important;
-
-    .fa { vertical-align: bottom }
-}
-
-// exception
-.media-modal__overlay .picture-in-picture__footer .icon-button,
-.status__action-bar-button.icon-button--with-counter { background: transparent }
-
-// favorite icon
-.star-icon.active,
-.star-icon.icon-button.active.activate,
-.notification__favourite-icon-wrapper .star-icon { background: #db4437 }
-
-.notification__favourite-icon-wrapper {
-    left: -34px;
-
-    .star-icon {
-        border-radius: 50%;
-        width: 28px;
-        height: 28px;
-        vertical-align: baseline;
-        font-size: 18px;
-
-        &.fa-fw::before { vertical-align: middle }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/_functions.scss b/app/javascript/styles/y-zu-light/theme/_functions.scss
deleted file mode 100644
index 0374231ed..000000000
--- a/app/javascript/styles/y-zu-light/theme/_functions.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@charset "UTF-8";
-@use "sass:string";
-
-
-// convert hex color code to svg styled ascii color code
-@function svg-color ($color) {
-    @return '%23' + string.slice(inspect($color), 2, 7);
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/_mixins.scss b/app/javascript/styles/y-zu-light/theme/_mixins.scss
deleted file mode 100644
index fcd556f2b..000000000
--- a/app/javascript/styles/y-zu-light/theme/_mixins.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-@charset "UTF-8";
-
-
-$shadow-color-1: rgba(0,0,0,.2);
-$shadow-color-2: rgba(0,0,0,.14);
-$shadow-color-3: rgba(0,0,0,.12);
-
-@mixin shadow-1dp { box-shadow: 0 2px 1px -1px $shadow-color-1, 0 1px 1px 0 $shadow-color-2, 0 1px 3px 0 $shadow-color-3 }
-@mixin shadow-2dp { box-shadow: 0 3px 1px -2px $shadow-color-1, 0 2px 2px 0 $shadow-color-2, 0 1px 5px 0 $shadow-color-3 }
-@mixin shadow-3dp { box-shadow: 0 3px 3px -2px $shadow-color-1, 0 3px 4px 0 $shadow-color-2, 0 1px 8px 0 $shadow-color-3 }
-@mixin shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px 0 $shadow-color-2, 0 1px 10px 0 $shadow-color-3 }
-@mixin shadow-5dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 5px 8px 0 $shadow-color-2, 0 1px 14px 0 $shadow-color-3 }
-@mixin shadow-6dp { box-shadow: 0 3px 5px -1px $shadow-color-1, 0 6px 10px 0 $shadow-color-2, 0 1px 18px 0 $shadow-color-3 }
-@mixin shadow-7dp { box-shadow: 0 4px 5px -2px $shadow-color-1, 0 7px 10px 1px $shadow-color-2, 0 2px 16px 1px $shadow-color-3 }
-@mixin shadow-8dp { box-shadow: 0 5px 5px -3px $shadow-color-1, 0 8px 10px 1px $shadow-color-2, 0 3px 14px 2px $shadow-color-3 }
-@mixin shadow-9dp { box-shadow: 0 5px 6px -3px $shadow-color-1, 0 9px 12px 1px $shadow-color-2, 0 3px 16px 2px $shadow-color-3 }
-@mixin shadow-10dp { box-shadow: 0 6px 6px -3px $shadow-color-1, 0 10px 14px 1px $shadow-color-2, 0 4px 18px 3px $shadow-color-3 }
-@mixin shadow-11dp { box-shadow: 0 6px 7px -4px $shadow-color-1, 0 11px 15px 1px $shadow-color-2, 0 4px 20px 3px $shadow-color-3 }
-@mixin shadow-12dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 12px 17px 2px $shadow-color-2, 0 5px 22px 4px $shadow-color-3 }
-@mixin shadow-13dp { box-shadow: 0 7px 8px -4px $shadow-color-1, 0 13px 19px 2px $shadow-color-2, 0 5px 24px 4px $shadow-color-3 }
-@mixin shadow-14dp { box-shadow: 0 7px 9px -4px $shadow-color-1, 0 14px 21px 2px $shadow-color-2, 0 5px 26px 4px $shadow-color-3 }
-@mixin shadow-15dp { box-shadow: 0 8px 9px -5px $shadow-color-1, 0 15px 22px 2px $shadow-color-2, 0 6px 28px 5px $shadow-color-3 }
-@mixin shadow-16dp { box-shadow: 0 8px 10px -5px $shadow-color-1, 0 16px 24px 2px $shadow-color-2, 0 6px 30px 5px $shadow-color-3 }
-@mixin shadow-17dp { box-shadow: 0 8px 11px -5px $shadow-color-1, 0 17px 26px 2px $shadow-color-2, 0 6px 32px 5px $shadow-color-3 }
-@mixin shadow-18dp { box-shadow: 0 9px 11px -5px $shadow-color-1, 0 18px 28px 2px $shadow-color-2, 0 7px 34px 6px $shadow-color-3 }
-@mixin shadow-19dp { box-shadow: 0 9px 12px -6px $shadow-color-1, 0 19px 29px 2px $shadow-color-2, 0 7px 36px 6px $shadow-color-3 }
-@mixin shadow-20dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 20px 31px 3px $shadow-color-2, 0 8px 38px 7px $shadow-color-3 }
-@mixin shadow-21dp { box-shadow: 0 10px 13px -6px $shadow-color-1, 0 21px 33px 3px $shadow-color-2, 0 8px 40px 7px $shadow-color-3 }
-@mixin shadow-22dp { box-shadow: 0 10px 14px -6px $shadow-color-1, 0 22px 35px 3px $shadow-color-2, 0 8px 42px 7px $shadow-color-3 }
-@mixin shadow-23dp { box-shadow: 0 11px 14px -7px $shadow-color-1, 0 23px 36px 3px $shadow-color-2, 0 9px 44px 8px $shadow-color-3 }
-@mixin shadow-24dp { box-shadow: 0 11px 15px -7px $shadow-color-1, 0 24px 38px 3px $shadow-color-2, 0 9px 46px 8px $shadow-color-3 }
-
-@mixin non-overflow-shadow-4dp { box-shadow: 0 2px 4px -1px $shadow-color-1, 0 4px 5px -1px $shadow-color-2}
-
-@mixin material-transition { transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1) }
-
-@mixin search-bar-hover {
-    @if $search-bar-hover {
-        @include shadow-2dp;
-        background: $search-bar-focus-color;
-    }
-}
-
-@mixin outlined-chip {
-    @if $outlined-chip {
-        .reactions-bar__item {
-            background: $outlined-chip-color !important;
-            border: 1px solid $outlined-chip-selected-border-color !important;
-        
-            &.active { background-color: $outlined-chip-selected-color !important }
-        
-            &:hover { background: $outlined-chip-hover-color !important }
-        }
-    }
-}
-
-@mixin button-shadow {
-    @if $button-shadow {
-        .button,
-        .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
-    }
-}
-
-@mixin text-area-border {
-    @if $text-area-border == underlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius $card-radius 0 0;
-            border-bottom: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-        }
-    }
-
-    @if $text-area-border == outlined {
-        .compose-form .autosuggest-textarea__textarea {
-            border-radius: $card-radius;
-            border: 1px solid $border-color;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus {
-                border: 2px solid $border-active-color;
-                padding: 7px 41px 7px 15px;
-            }
-        }
-    }
-}
-
-@mixin icon-button {
-    width: 20px !important;
-    height: 20px !important;
-    font-size: 20px !important;
-}
-
-// check background-image value
-@mixin bg-image {
-    @if $bg-image == none {        
-    } @else { background-image: url($bg-image) }
-}
-
-
-@mixin icon-font-style {
-    @if $icon-font-style == filled { font-family: "Material Icons" }
-    @if $icon-font-style == outlined { font-family: "Material Icons Outlined" }
-    @if $icon-font-style == round { font-family: "Material Icons Round" }
-    @if $icon-font-style == sharp { font-family: "Material Icons Sharp" }
-    @if $icon-font-style == two-tone { font-family: "Material Icons Two Tone" }
-}
-
-@mixin icon-font {
-    @if $icon-font-source == github {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/raw/master/font/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://raw.githubusercontent.com/google/material-design-icons/master/font/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-
-    @if $icon-font-source == google {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("https://fonts.gstatic.com/s/materialicons/v55/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("https://fonts.gstatic.com/s/materialiconsoutlined/v25/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons Round"),
-                     url("https://fonts.gstatic.com/s/materialiconsround/v24/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("https://fonts.gstatic.com/s/materialiconssharp/v25/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2") format('woff2');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("https://fonts.gstatic.com/s/materialiconstwotone/v23/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2") format('woff2');
-            }
-        }
-    }
-
-    @if $icon-font-source == self {
-        @if $icon-font-style == filled {
-            @font-face {
-                font-family: "Material Icons";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIcons-Regular.ttf") format('truetype');
-            }
-        }
-        @if $icon-font-style == outlined {
-            @font-face {
-                font-family: "Material Icons Outlined";
-                src: local("Material Icons Outlined"),
-                     url("../fonts/MaterialIconsOutlined-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == round {
-            @font-face {
-                font-family: "Material Icons Round";
-                src: local("Material Icons"),
-                     url("../fonts/MaterialIconsRound-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == sharp {
-            @font-face {
-                font-family: "Material Icons Sharp";
-                src: local("Material Icons Sharp"),
-                     url("../fonts/MaterialIconsSharp-Regular.otf") format('opentype');
-            }
-        }
-        @if $icon-font-style == two-tone {
-            @font-face {
-                font-family: "Material Icons Two Tone";
-                src: local("Material Icons Two Tone"),
-                     url("../fonts/MaterialIconsTwoTone-Regular.otf") format('opentype');
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/account.scss b/app/javascript/styles/y-zu-light/theme/account.scss
deleted file mode 100644
index 551b4f4a8..000000000
--- a/app/javascript/styles/y-zu-light/theme/account.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.account {
-    border-bottom: 1px solid $border-color;
-    padding: 16px;
-
-    .account__display-name,
-    .account__display-name strong { color: $primary-text-color }
-
-    &__avatar {
-        border-radius: $avater-radius;
-        width: 40px;
-        height: 40px;
-
-        &-overlay {
-            &-base {
-                border-radius: $avater-radius;
-                width: 44px;
-                height: 44px;
-                background-size: 44px;
-            }
-
-            &-overlay { border-radius: $avater-radius }
-        }
-    }
-
-    &__avatar-wrapper {
-        margin-left: 0;
-        margin-right: 16px;
-    }
-
-    &__header {
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px;
-            border-bottom: none;
-
-            .avatar .account__avatar { border: none }
-        }
-
-        &__tabs {
-            padding: 8px;
-
-            &__name {
-                padding: 8px;
-
-                h1 {
-                    color: $primary-text-color;
-
-                    small { color: $secondary-text-color }
-                }
-            }
-
-            &__buttons {
-                .icon-button {
-                    @include icon-button;
-                    border: none;
-                    border-radius: 50%;
-                    padding: 8px;
-                    margin-left: 8px;
-                }
-            }
-        }
-
-        &__extra {
-            margin-top: 0;
-
-            &__links {
-                color: $secondary-text-color;
-                padding: 10px 0;
-
-                a {
-                    color: $secondary-text-color;
-                    padding: 4px 12px;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &__bio {
-            margin: 0;
-
-            .account__header {
-                &__content {
-                    color: $primary-text-color;
-                    padding: 8px;
-                }
-
-                &__fields {
-                    border: 1px solid $border-color;
-                    border-radius: 4px;
-
-                    .verified {
-                        border: none;
-                        background: $verified-bg-color;
-
-                        a,
-                        &__mark { color: $primary-text-color }
-                    }
-
-                    dl {
-                        border-bottom: 1px solid $border-color;
-
-                        &:first-child .verified { border-radius: 0 }
-
-                        &:last-child { border-bottom: 0 }
-                    }
-
-                    dt {
-                        color: $primary-text-color;
-                        background: $list-bg-inactive-color;
-                    }
-
-                    dd { color: $primary-text-color }
-                }
-            }
-        }
-
-        &__account-note {
-            padding: 8px 16px;
-            border-bottom: 1px solid $border-color;
-
-            label {
-                color: $ui-text-color;
-                margin-bottom: 8px;
-            }
-
-            textarea {
-                color: $primary-text-color;
-                padding: 8px 16px;
-                border-radius: 0;
-
-                &:focus { background: transparent }
-
-                &::placeholder { color: $tips-text-color }
-            }
-        }
-
-        &__content { color: $secondary-text-color }
-    }
-
-    &__section-headline {
-        background: $text-tab-bg-color;
-        border-bottom: 1px solid $border-color;
-
-        a {
-            padding: 16px 0;
-            color: $text-tab-indicator-color;
-
-            &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
-
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $text-tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $text-tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__relationship {
-        padding: 0;
-        height: auto;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-}
-
-.account-role {
-    padding: 4px 8px;
-    border-radius: 17px;
-    color: $ui-text-color;
-    background-color: $contained-chip-color;
-}
-
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
-.account-gallery {
-    &__item { border-radius: 0 }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/base_config.scss b/app/javascript/styles/y-zu-light/theme/base_config.scss
deleted file mode 100644
index f36a139ba..000000000
--- a/app/javascript/styles/y-zu-light/theme/base_config.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@charset "UTF-8";
-
-
-// [important] This file is base file. DO NOT edit this file. If you want to change this file, you should edit "../custom_config.scss".
-
-
-// Color scheme
-@import '../color/v1-light';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'color/v2-light';
-
-
-// Layout profile
-@import '../layout/material-v1';
-// Note: If you change this section in custom_config.scss, you have to write like below. Be careful about relative path.
-// @import 'layout/material-v2';
-
-
-// Search bar hover settings
-// You can enable/disable search bar floating.
-$search-bar-hover: false;
-
-
-// Status font size in timeline
-$status-font-size: 15px;  // mastodon default
-//$status-font-size: 16px;  // compatible with material design
-
-
-// Name font size in timeline status
-$name-font-size: 15px;  // mastodon default
-//$name-font-size: 16px;  // compatible with material design
-
-
-// Background image
-// If you want to use the local image, please put it in "../"
-$bg-image: none;
-//$bg-image: "./image.png";
-//$bg-image: "https://example.com/img/image.png";
-
-
-// Columns transparency settings
-$bar-transparency: 1.0;  // opacity
-//$bar-transparency: 0.8;  // semi-transparent
-
-$column-transparency: 1.0;  // opacity
-//$column-transparency: 0.8;  // semi-transparent
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/basics.scss b/app/javascript/styles/y-zu-light/theme/basics.scss
deleted file mode 100644
index bb8f68bf0..000000000
--- a/app/javascript/styles/y-zu-light/theme/basics.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-body,
-body.embed { background: $bg-color }
-
-.focusable:focus { background: transparent }
-
-// Chrome & Safari scroll bar
-::-webkit-scrollbar-thumb {
-    background: $scroll-bar-thumb-color;
-
-    &:hover { background: $scroll-bar-thumb-hover-color }
-    &:active { background: $scroll-bar-thumb-active-color }
-}
-
-::-webkit-scrollbar-track,
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background: transparent !important;
-}
-
-// Firefox scroll bar
-html { scrollbar-color: $scroll-bar-thumb-color transparent }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/button.scss b/app/javascript/styles/y-zu-light/theme/button.scss
deleted file mode 100644
index 5f909d843..000000000
--- a/app/javascript/styles/y-zu-light/theme/button.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include button-shadow;
-
-.icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-
-    &.active {
-        color: $icon-button-active-color;
-
-        &:hover { color: $icon-button-active-hover-color }
-    }
-
-    &.disabled { color: $disabled-icon-color }
-
-    &.inverted {
-        color: $icon-button-color;
-
-        &.active { color: $icon-button-active-color }
-
-        &:hover {
-            color: $icon-button-hover-color;
-            background-color: $icon-bg-hover-color;
-        }
-
-        &:focus { background-color: transparent }
-    }
-
-    &.overlayed {
-        @include icon-button;
-        border-radius: 50%;
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        padding: 4px;
-        line-height: 20px !important;
-    
-        &:hover {
-            background: $media-icon-bg-color;
-            color: $media-icon-hover-color;
-        }
-    }
-
-    &__counter {
-        width: 16px;
-        margin-left: 8px;
-    }
-
-    &:hover {
-        @include material-transition;
-        color: $icon-button-hover-color;
-        background-color: $icon-bg-hover-color;
-    }
-
-    &:focus { background-color: transparent }
-}
-
-// Checkbox with label
-label.icon-button {
-    &.active {
-        color: $ui-text-color;
-        background-color: transparent;
-    }
-
-    &:hover {
-        @include material-transition;
-        background-color: transparent;
-    }
-}
-
-.text-icon-button {
-    color: $icon-button-color;
-    border-radius: 50%;
-    font-size: 14px;
-
-    &.active {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-active-color;
-    }
-
-    &:hover {
-        background-color: $icon-bg-hover-color;
-        color: $icon-button-hover-color;
-    }
-}
-
-.button {
-    background-color: $contained-button-color;
-    border-radius: $button-radius;
-
-    &:active,
-    &:focus {
-        background-color: $contained-button-color;
-        border-radius: $button-radius;
-    }
-
-    &:hover {
-        @include shadow-2dp;
-        background-color: $contained-button-hover-color;
-    }
-
-    &.logo-button {
-        background: $contained-button-color;
-        margin: 2px;
-    
-        &:hover { background: $contained-button-hover-color }
-    
-        .button--destructive:hover { background: $contained-button-hover-color }
-    }
-
-    &.button--block { margin: 8px 0 }
-
-    &.button-secondary {
-        color: $text-button-color;
-        border: none;
-        box-shadow: none;
-    
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-    }
-
-    &.confirmation-modal__cancel-button {
-        box-shadow: none;
-        background-color: transparent;
-        margin: 0 8px;
-        color: $text-button-color;
-    
-        &:hover { background: $text-button-hover-color }
-    
-        &:focus { background: $text-button-focus-color }
-    }
-}
-
-.spoiler-button__overlay__label {
-    background: $media-icon-bg-color;
-    border-radius: $button-radius;
-    color: $media-icon-color;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/columns.scss b/app/javascript/styles/y-zu-light/theme/columns.scss
deleted file mode 100644
index 77a5c777a..000000000
--- a/app/javascript/styles/y-zu-light/theme/columns.scss
+++ /dev/null
@@ -1,511 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.column {
-    @include shadow-1dp;
-    padding: 0;
-    margin: 10px 8px;
-    border-radius: $card-radius;
-
-    &>.scrollable {
-        background: $list-bg-color;
-        opacity: $column-transparency;
-    }
-
-    &:last-child { box-shadow: none }
-}
-
-.column-header {
-    background: $top-bar-color;
-    border-radius: $bar-radius;
-    height: 56px;
-
-    > button {
-        padding: 16px;
-        color: $top-bar-text-color;
-    }
-
-    &>.column-header__back-button { color: $top-bar-icon-color }
-
-    &.active {
-        .column-header__icon {
-            color: $top-bar-unread-icon-color;
-            text-shadow: none;
-        }
-    }
-
-    &__icon {
-        margin-right: 16px;
-        color: $top-bar-icon-color;
-        font-size: 20px;
-    }
-
-    &__buttons { height: 56px }
-
-    &__button {
-        @include icon-button;
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        padding: 8px;
-        margin: 10px;
-        border-radius: 50%;
-        box-sizing: content-box;
-
-        &.active {
-            color: $top-bar-icon-active-color;
-            background: $icon-bg-active-color;
-
-            &:hover {
-                color: $top-bar-icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-
-        &:hover {
-            color: $top-bar-icon-hover-color;
-            background: $icon-bg-hover-color;
-        }
-    }
-
-    &__setting-btn {
-        color: $icon-button-color;
-        padding: 8px 0;
-
-        &:hover {
-            color: $icon-button-hover-color;
-            text-decoration: none;
-        }
-
-        .fa { font-size: 20px }
-
-        span { vertical-align: middle }
-    }
-
-    &__setting-arrows {
-        font-size: 16px;
-        border-bottom: 8px;
-
-        .column-header__setting-btn {
-            padding: 8px;
-            border-radius: 50%;
-
-            &:last-child { padding-right: 8px }
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        border-radius: $bar-radius;
-        opacity: $bar-transparency;
-
-        .announcements { border-top: 1px solid $border-color }
-
-        &.active {
-            @include shadow-4dp;
-
-            &::before { background: transparent }
-        }
-    }
-
-    &__collapsible {
-        color: $ui-text-color;
-        background: $card-bg-color;
-        border-top: 1px solid $border-color;
-
-        &-inner {
-            background: $card-bg-color;
-            padding: 16px;
-        }
-
-        &.collapsed { border-top: none }
-    }
-
-    &__back-button {
-        background: $top-bar-color;
-        color: $top-bar-icon-color;
-        margin: 8px 10px;
-        padding: 10px;
-        font-size: 20px;
-
-        span { display: none }
-    }
-}
-
-.column-subheading {
-    color: $section-text-color;
-    background: $bg-color;
-    padding: 12px 16px;
-    margin-top: 8px;
-    border-top: 1px solid $border-color;
-}
-
-.column-link {
-    color: $ui-text-color;
-    background: $bg-color;
-    padding: 16px;
-    border-radius: $nav-drawer-item-radius;
-
-    &:hover { background: $list-bg-hover-color }
-
-    &:active,
-    &:focus { background: $list-bg-active-color }
-
-    &__icon {
-        margin-right: 32px;
-        font-size: 20px;
-    }
-
-    &--transparent {
-        &.active {
-            color: $ui-text-color;
-            background: $menu-bg-active-color;
-
-            &:hover { background: $menu-bg-active-hover-color }
-    
-            .fa { color: $icon-color }
-        }
-
-        &:hover {
-            color: $ui-text-color;
-
-            .fa { color: $icon-color }
-        }
-    }
-
-    .fa { color: $icon-color }
-}
-
-.column-settings {
-    &__section {
-        color: $section-text-color;
-        margin-bottom: 0;
-        margin-top: 8px;
-    }
-
-    &__row .text-btn { margin-bottom: 0 }
-}
-
-.column-back-button {
-    @include shadow-4dp;
-    background: $top-bar-color;
-    color: $top-bar-icon-color;
-    padding: 16px;
-
-    span { visibility: hidden }  // hide "back" string
-
-    &--slim-button { top: -54px }
-}
-
-.column-inline-form {
-    padding: 16px 0 16px 16px;
-    background: $card-bg-color;
-
-    .icon-button { margin: 0 16px }
-}
-
-.columns-area {
-    @include bg-image;
-    background-size: contain;
-}
-
-.setting-text {
-    color: $primary-text-color;
-    background: $text-field-bg-color;
-    border-radius: $bar-radius;
-
-    &::placeholder { color: $tips-text-color }
-}
-
-.empty-column-indicator {
-    color: $secondary-text-color;
-    background: $card-bg-color;
-    font-size: 16px;
-    contain: initial;  // padding fix
-}
-
-.conversation {
-    border-bottom: 1px solid $border-color;
-    padding: 12px;
-    background: $list-bg-inactive-color;
-
-    &--unread {
-        background: $list-bg-color;
-
-        .conversation__content__relative-time { color: $info-text-color }
-    }
-
-    &__unread { background: $primary-color }
-
-    &__avatar { padding: 0 16px 0 0 }
-
-    &__content {
-        padding: 0;
-
-        &__relative-time {
-            font-size: 14px;
-            color: $info-text-color;
-        }
-
-        &__names,
-        &__names a {
-            color: $primary-text-color;
-            font-size: 16px;
-        }
-    }
-}
-
-// read status in notification column
-.muted {
-    .status {
-        &__content {
-            color: $read-primary-text-color;
-    
-            p { color: $read-primary-text-color }
-    
-            a { color: $read-secondary-text-color }
-        }
-
-        &__display-name strong { color: $read-primary-text-color }
-    }
-
-    .poll {
-        color: $read-primary-text-color;
-
-        &__chart {
-            background: $read-poll-bar-color;
-    
-            &.leading { background: $read-poll-bar-leading-color }
-        }
-
-        &__footer,
-        &__link { color: $read-ui-text-color }
-    }
-}
-
-.load-gap { border-bottom: 1px solid $border-color }
-
-.load-more {
-    color: $icon-color;
-    padding: 16px;
-
-    &:hover { background: $menu-bg-hover-color }
-}
-
-.getting-started {
-    background: $bg-color;
-    color: $ui-text-color;
-    opacity: $column-transparency;
-
-    &__wrapper {
-        background: $bg-color;
-        height: auto !important;
-        padding-bottom: 8px;
-        border-bottom: 1px solid $border-color;
-    }
-
-    &__footer {
-        padding: 16px;
-        
-        p {
-            color: $secondary-text-color;
-            font-size: 12px;
-            margin-bottom: 16px;
-        }
-
-        a { color: $ui-text-color }
-
-        p a { color: $link-text-color }
-    }
-
-    &__trends {
-        background: $bg-color;
-        margin-bottom: 0;
-        opacity: $column-transparency;
-
-        h4 {
-            color: $section-text-color;
-            padding: 12px 16px;
-            margin-top: 8px;
-            border-top: 1px solid $border-color;
-            border-bottom: none;
-        }
-    }
-}
-
-.trends {
-    &__header {
-        color: $section-text-color;
-        background: transparent;
-        border-bottom: 1px solid $border-color;
-        padding: 16px;
-
-        .fa { margin-right: 8px }
-    }
-
-    &__item {
-        padding: 16px;
-        border-bottom: none;
-    
-        &__name {
-            color: $secondary-text-color;
-            font-size: 12px;
-    
-            a { color: $primary-text-color }
-        }
-    
-        &__current {
-            padding-right: 16px;
-            margin-left: 4px;
-            color: $secondary-text-color;
-        }
-    
-        &__sparkline path {
-            stroke: $primary-color;
-            fill: $primary-color;
-            fill-opacity: 0.5;
-        }
-    }
-}
-
-.setting-toggle {
-    &__label {
-        color: $ui-text-color;
-        margin: 8px 8px 8px 14px;
-    }
-}
-
-.announcements {
-    background: $card-bg-color;
-    padding: 0 8px;
-
-    &__container { color: $primary-text-color }
-
-    &__item {
-        padding: 16px;
-        font-size: 16px;
-
-        &__unread { background: $badge-color }
-    }
-
-    &__pagination {
-        color: $ui-text-color;
-        padding: 16px;
-        bottom: 0;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            margin: 0 4px;
-            line-height: normal !important;
-            box-sizing: content-box;
-        }
-
-        span { vertical-align: super }
-    }
-}
-
-.react-swipeable-view-container { transition: transform .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s, height 0.3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s !important }
-
-@include outlined-chip;
-
-.reactions-bar {
-    margin-top: 16px;
-    width: calc(100% - 72px);
-
-    .emoji-button {
-        color: $icon-button-color;
-        font-size: 20px;
-
-        &:hover { color: $icon-button-hover-color }
-
-        &:active { color: $icon-button-active-color }
-    }
-
-    &__item {
-        background: $contained-chip-color;
-        border-radius: 17px;
-        margin: 2px 4px;
-
-        &.active {
-            background-color: $contained-chip-selected-color;
-
-            .reactions-bar__item__count { color: $chip-selected-text-color }
-
-            &:hover { background-color: $contained-chip-selected-color }
-        }
-
-        &__emoji {
-            width: 24px;
-            height: 24px;
-            margin: 4px 0 4px 2px;
-        }
-
-        &__count {
-            font-size: 16px;
-            margin: 0 12px 0 8px;
-            color: $secondary-text-color;
-        }
-
-        &:hover { background: $contained-chip-hover-color }
-    }
-}
-
-.notification {
-    &__filter-bar {
-        background: $tab-bg-color;
-        border-bottom: 1px solid $border-color;
-        z-index: 1;
-        opacity: $bar-transparency;
-    
-        button {
-            background: $tab-bg-color;
-            color: $tab-indicator-color;
-            font-size: 16px;
-
-            span { font-size: 14px }
-    
-            &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-    
-                &::before,
-                &:after { border: none }
-
-                &:focus { background: $tab-indicator-bg-focus-color }
-            }
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-    }
-
-    &__message {
-        color: $secondary-text-color;
-        margin: 0 16px 0 70px;
-        font-size: 16px;
-    }
-
-    &__display-name:hover { color: inherit }
-}
-
-.notification-favourite .status.status-direct {
-    .icon-button.disabled { color: $disabled-icon-color }
-}
-
-.relationship-tag {
-    color: $ui-text-color;
-    background-color: $relationship-tag-color;
-    font-size: 12px;
-    border-radius: 17px;
-    padding: 4px 8px;
-    opacity: 1;
-}
-
-.attachment-list__list a { color: $secondary-text-color }
-
-// unread notification
-.notification.unread:before, .status__wrapper.unread:before { border-left: none }
-
-.notification.unread, .status__wrapper.unread { background-color: $unread-bg-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/components.scss b/app/javascript/styles/y-zu-light/theme/components.scss
deleted file mode 100644
index aa64aabc5..000000000
--- a/app/javascript/styles/y-zu-light/theme/components.scss
+++ /dev/null
@@ -1,647 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-@include text-area-border;
-
-.modal-root {
-    transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
-
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 10%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 90%) }
-}
-
-.drawer {
-    &__header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        justify-content: space-around;
-        opacity: $bar-transparency;
-    
-        a { transition: none }
-    
-        a:hover {
-            background: $icon-bg-hover-color;
-            border-radius: 50%;
-        }
-    }
-
-    &__tab {
-        color: $top-bar-icon-color;
-        font-size: 20px;
-        margin: 10px auto 10px;
-        padding: 8px;
-        flex: none;
-        height: 20px;
-        width: 20px;
-        border-bottom: none;
-        text-align: justify;
-    
-        &:hover { color: $top-bar-icon-hover-color }
-    }
-
-    &__pager {
-        @include shadow-1dp;
-        border-radius: $card-radius;
-    }
-
-    &__inner {
-        background: $card-bg-color;
-        opacity: $column-transparency;
-
-        &.darker {
-            background: $card-bg-color;
-            position: inherit;
-        }
-
-        &__mastodon { background: $card-bg-color }
-    }
-}
-
-.search {
-    &__input {
-        background: $search-bar-color;
-        color: $tips-text-color;
-        border-radius: $search-bar-radius;
-        padding: 12px 12px 12px 40px;
-        opacity: $bar-transparency;
-
-        &:focus {
-            @include shadow-2dp;
-            background: $search-bar-focus-color;
-            color: $search-bar-text-color;
-        }
-
-        &:hover { @include search-bar-hover }
-
-        &::placeholder { color: $tips-text-color }
-    }
-
-    &__icon {
-        .fa {
-            color: $icon-color;
-            font-size: 20px;
-            top: 12px;
-            right: unset;
-            left: 12px;
-            height: 6px;
-            transition: none;
-
-            &.active { opacity: 1 }
-
-            &-search {
-                transform: none;
-                opacity: 1;
-            }
-            &-times-circle.active {
-                right: 16px;
-                left: unset;
-                transform: none;
-            }
-        }
-    }
-}
-
-.search-popout {
-    @include shadow-2dp;
-    background: $search-bar-focus-color;
-    border-radius: 0px $bar-radius;
-    border-top: 1px solid $border-color;
-    margin-top: 0;
-    color: $tips-text-color;
-
-    h4 {
-        color: $secondary-text-color;
-    }
-
-    em {
-        color: $search-bar-text-color;
-    }
-}
-
-.search-results {
-    &__header {
-        color: $secondary-text-color;
-        background-color: $card-bg-color;
-        padding: 16px;
-
-        .fa { margin-right: 16px }
-    }
-
-    &__section {
-        h5 {
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            padding: 16px;
-            color: $section-text-color;
-
-            .fa { margin-right: 8px }
-        }
-    }
-}
-
-.navigation-bar {
-    color: $secondary-text-color;
-    padding: 14px;
-
-    strong {
-        color: $ui-text-color;
-    }
-
-    .navigation-bar__actions .compose__action-bar .icon-button {
-        width: 36px !important;
-        height: 36px !important;
-        padding: 8px;
-
-        &.active {
-            color: $icon-hover-color;
-            background: $icon-bg-active-color;
-        }
-    }
-}
-
-.navigation-panel hr {
-    border-top: 1px solid $border-color;
-    margin: 8px 0;
-}
-
-.flex-spacer { margin: 8px 0 }
-
-.dropdown-menu {
-    @include shadow-8dp;
-    background: $menu-bg-color;
-    padding: 8px 0;
-    border-radius: $menu-radius;
-
-    &__arrow { visibility: hidden }
-
-    &__item a {
-        font-size: 14px;
-        padding: 8px 16px;
-        background: $menu-bg-color;
-        color: $menu-text-color;
-
-        &:hover, &:active {
-            background: $menu-bg-hover-color;
-            color: $menu-text-color;
-        }
-    }
-
-    &__separator {
-        margin: 8px 0;
-        border-bottom: 1px solid $border-color;
-    }
-}
-
-.compose-form {
-    .autosuggest-textarea {
-        &__textarea {
-            background: $text-field-bg-color;
-            color: $ui-text-color;
-            padding: 8px 42px 8px 16px;
-    
-            &::placeholder { color: $tips-text-color }
-        }
-
-        &__suggestions {
-            @include shadow-1dp;
-            background: $menu-bg-color;
-            color: $ui-text-color;
-            border-radius: $card-radius;
-            font-size: 16px;
-            padding: 8px 0;
-
-            &__item {
-                padding: 8px;
-                border-radius: 0;
-
-                &:hover { background: $menu-bg-hover-color }
-
-                &.selected,
-                &:focus,
-                &:active { background: $menu-bg-active-color }
-            }
-        }
-    }
-
-    .spoiler-input {
-        &.spoiler-input--visible { margin-bottom: 16px }
-
-        &__input {
-            color: $ui-text-color;
-            background: $card-bg-color;
-            border-bottom: 1px solid $border-color;
-            border-radius: 0;
-
-            &:hover { border-color: $border-hover-color }
-
-            &:active,
-            &:focus { border-bottom: 2px solid $border-active-color }
-    
-            &::placeholder { color: $tips-text-color }
-        }
-    }
-
-    .compose-form {
-        &__warning {
-            color: $secondary-text-color;
-            background: $card-bg-color;
-            padding: 16px;
-            border: 1px solid $border-color;
-            border-radius: $card-radius;
-            box-shadow: none;
-
-            a { color: $link-text-color }
-        }
-
-        &__modifiers {
-            background: $card-bg-color;
-            color: $tips-text-color;
-
-            .compose-form {
-                &__upload-thumbnail { border-radius: 0 }
-
-                &__upload__actions {
-                    @include material-transition;
-
-                    .icon-button {
-                        color: $media-icon-color;
-                        font-size: 16px;
-
-                        &:hover { background-color: transparent }
-                    }
-                }
-            }
-        }
-
-        &__buttons-wrapper {
-            background: $card-bg-color;
-            color: $tips-text-color;
-            padding: 8px;
-
-            .icon-button {
-                @include icon-button;
-                padding: 8px;
-            }
-
-            .text-icon-button {
-                width: 20px !important;
-                height: 20px !important;
-                padding: 8px;
-                line-height: 20px !important;
-            }
-        }
-
-        &__poll-wrapper {
-            border-top: 1px solid $border-color;
-
-            ul { padding: 16px 12px 16px 0 }
-
-            select {
-                color: $ui-text-color;
-                background-color: $bg-color;
-                border: 0;
-
-                &:focus { border-color: $border-hover-color }
-            }
-
-            .button.button-secondary {
-                box-shadow: none;
-                color: $text-button-color;
-
-                &:hover { background-color: $text-button-hover-color }
-
-                &:active,
-                &:focus { background-color: $text-button-focus-color }
-            }
-
-            .poll__footer { border-top: none }
-        }
-
-        &__publish .compose-form__publish-button-wrapper { box-shadow: none }
-    }
-}
-
-.no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
-
-
-.poll {
-    .button { margin-right: 8px }
-
-    li { margin-bottom: 0 }
-
-    &__input {
-        border: none;
-        width: 20px;
-        height: 20px;
-        flex: 0 0 20px;
-        padding: 18px;
-        margin: 0 2px;
-        background: radial-gradient(circle, transparent, transparent 7px, $control-border-color 8px, $control-border-color 9px, transparent 10px, transparent);
-        
-        &:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color)}
-
-        &.active { background: radial-gradient(circle, $control-border-active-color, $control-border-active-color 4px, transparent 5px, transparent 7px, $control-border-active-color 8px, $control-border-active-color 9px, transparent 10px, transparent) }
-
-        &.active:hover { background: radial-gradient(circle, $control-border-hover-color, $control-border-hover-color 7px, $control-border-color 8px, $control-border-color 9px, $control-border-hover-color 10px, $control-border-hover-color) }
-
-        &.checkbox {
-            border-radius: 2px;
-            border: 2px solid $control-border-color;
-            padding: 8px;
-            margin: 8px 10px;
-            background: none;
-        }
-    }
-
-    &__text input[type=text] {
-        color: $ui-text-color;
-        background: $text-field-bg-color;
-        border: 1px solid $border-color;
-        padding: 8px 12px;
-    
-        &:focus { border-color: $border-hover-color }
-    }
-
-    &__option {
-        padding: 16px 0 8px;
-
-        input[type=text] {
-            color: $primary-text-color;
-            background: $text-field-bg-color;
-            border: none;
-            border-radius: 2px;
-            padding: 8px 16px;
-        }
-
-        &__text { line-height: 34px }
-    }
-
-    &__chart {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-    
-        &.leading { background: $progress-indicator-color }
-    }
-
-    &__footer {
-        padding-top: 8px;
-        padding-bottom: 0;
-        color: $ui-text-color;
-    }
-
-    &__link { color: $ui-text-color }
-}
-
-.privacy-dropdown {
-    &.active .privacy-dropdown__value.active {
-        background: $icon-bg-hover-color;
-        border-radius: 50%;
-        box-shadow: none;
-
-        .icon-button { color: $icon-button-active-color }
-    }
-
-    &__dropdown {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $dialog-radius;
-    }
-
-    &__option {
-        color: $icon-color;
-        padding: 8px 16px;
-
-        &__icon {
-            font-size: 20px;
-            margin-right: 12px;
-        }
-
-        &__content {
-            color: $secondary-text-color;
-
-            strong { color: $ui-text-color }
-        }
-
-        &.active {
-            background: $menu-bg-active-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-
-            &:hover {
-                background: $menu-bg-active-color;
-                
-                .privacy-dropdown__option__content {
-                    color: $secondary-text-color;
-
-                    strong { color: $ui-text-color }
-                }
-            }
-        }
-
-        &:hover {
-            background: $menu-bg-hover-color;
-            color: $icon-hover-color;
-
-            .privacy-dropdown__option__content {
-                color: $secondary-text-color;
-
-                strong { color: $ui-text-color }
-            }
-        }
-    }
-}
-
-.character-counter {
-    color: $secondary-text-color;
-}
-
-.reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
-    padding: 16px;
-
-    &__header { margin-bottom: 4px }
-
-    &__display {
-        &-name {
-            color: $primary-text-color;
-            padding-right: 24px;
-        }
-
-        &-avatar { margin-right: 8px }
-    }
-
-    &__content {
-        color: $primary-text-color;
-
-        p { margin-bottom: 16px }
-    }
-}
-
-.attachment-list {
-    &__list a { color: $secondary-text-color }
-
-    &.compact .fa { color: $icon-color }
-}
-
-.block-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.load-more {
-    color: $ui-text-color;
-
-    &:hover { background: transparent }
-}
-
-.autosuggest-hashtag {
-    &__name { color: $menu-text-color }
-}
-
-.filter-form {
-    background: $bg-color;
-    color: $ui-text-color;
-
-    &__column { padding: 8px 16px }
-}
-
-.directory {
-    &__card {
-        @include shadow-1dp;
-        margin: 8px 4px;
-        border-radius: $card-radius;
-
-        &__img { border-radius: $card-radius $card-radius 0 0 }
-
-        &__bar {
-            background: $card-bg-color;
-            padding: 8px 16px;
-
-            .display-name {
-                margin-left: 16px;
-
-                strong {
-                    font-size: 16px;
-                    color: $primary-text-color;
-                }
-
-                span { color: $secondary-text-color }
-            }
-        }
-
-        &__extra {
-            background: $card-bg-color;
-            border-radius: 0 0 $card-radius $card-radius;
-
-            .account__header__content {
-                padding: 8px 16px;
-                border-bottom: 1px solid $border-color;
-            }
-
-            .accounts-table__count { padding: 16px 0 }
-        }
-    }
-}
-
-.mute-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__container { padding: 24px }
-
-    &__explanation { margin-top: 16px }
-
-    &__action-bar {
-        background: $card-bg-color;
-        padding: 8px;
-        justify-content: flex-end;
-    }
-
-    &__cancel-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background-color: $text-button-hover-color;
-        }
-
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-
-    .setting-toggle {
-        margin-top: 16px;
-        margin-bottom: 16px;
-
-        &__label {
-            color: $ui-text-color;
-            margin: 0 0 0 12px;
-        }
-    }
-}
-
-.upload-progress {
-    color: $ui-text-color;
-    
-    &__backdrop {
-        border-radius: 0;
-        background: $progress-indicator-track-color;
-        margin-top: 6px;
-    }
-
-    &__tracker {
-        border-radius: 0;
-        background: $progress-indicator-color;
-    }
-}
-
-.emoji-button { padding: 8px }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/containers.scss b/app/javascript/styles/y-zu-light/theme/containers.scss
deleted file mode 100644
index 09af289b0..000000000
--- a/app/javascript/styles/y-zu-light/theme/containers.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.public-layout {
-    .header {
-        @include shadow-4dp;
-        background: $top-bar-color;
-        border-radius: $nav-bar-radius;
-        margin: 16px 0;
-
-        .brand:hover { background: $tab-indicator-bg-hover-color }
-
-        .nav-link,
-        .nav-link.optional {
-            color: $top-bar-text-color;
-
-            &:hover {
-                background: $tab-indicator-bg-hover-color;
-                text-decoration: none;
-            }
-        }
-
-        .nav-button {
-            background: transparent;
-            margin: 0;
-            border-radius: 0;
-
-            &:hover { background: $tab-indicator-bg-hover-color }
-        }
-
-        .detailed-status__meta { margin-top: 16px }
-    }
-
-    .detailed-status { padding: 16px }
-
-    .footer {
-        padding-top: 16px;
-        padding-bottom: 64px;
-        color: $ui-text-color;
-
-        h4 { color: $ui-text-color }
-
-        ul a { color: $secondary-text-color }
-
-        .grid .column-2 h4 a { color: $ui-text-color }
-
-        .brand {
-            svg { fill: $icon-color }
-
-            &:hover svg { fill: $icon-hover-color }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/control.scss b/app/javascript/styles/y-zu-light/theme/control.scss
deleted file mode 100644
index a205a4cb7..000000000
--- a/app/javascript/styles/y-zu-light/theme/control.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.react-toggle {
-    width: 36px;
-    height: 16px;
-    border-radius: 15px;
-
-    &-track {
-        background-color: $toggle-track-color;
-        margin: 4px;
-        width: 36px;
-        height: 16px;
-
-        &-check { visibility: hidden }
-        &-x { visibility: hidden }
-    }
-
-    &-thumb {
-        @include shadow-1dp;
-        width: 20px;
-        height: 20px;
-        border: 0;
-        background-color: $toggle-thumb-color;
-    }
-
-    &--checked {
-        .react-toggle{
-            &-track { background-color: $toggle-track-active-color }
-
-            &-thumb {
-                background-color: $toggle-thumb-active-color;
-                left: 22px;
-            }
-        }
-
-        &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-active-color !important }
-
-    }
-
-    &:hover:not(.react-toggle--disabled) .react-toggle-track { background-color: $toggle-track-color }
-}
-
-.radio-button {
-    padding: 8px 0;
-
-    &__input {
-        border: 2px solid $border-color;
-
-        &.checked {
-            border-color: $icon-button-active-color;
-            background: $icon-button-active-color;
-            padding: 3px;
-            background-clip: content-box;
-        }
-    }
-}
-
-.compose-form__sensitive-button .checkbox {
-    border: 2px solid $border-color;
-    border-radius: 2px;
-
-    &.active {
-        border-color: $primary-color;
-        background: $primary-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/emoji-picker.scss b/app/javascript/styles/y-zu-light/theme/emoji-picker.scss
deleted file mode 100644
index 91663fb93..000000000
--- a/app/javascript/styles/y-zu-light/theme/emoji-picker.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-.emoji-picker-dropdown {
-    &__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-    }
-
-    &__modifiers__menu {
-        @include shadow-8dp;
-        background: $menu-bg-color;
-        border-radius: $menu-radius;
-
-        button {
-            padding: 8px;
-        }
-    }
-}
-
-.emoji-mart {
-    width: 388px !important;
-    font-size: 14px;
-    color: $menu-text-color;
-
-    &-bar {
-        border: 0 solid $border-color;
-
-        &:first-child {
-            background: $menu-bg-color;
-        }
-    }
-
-    &-anchor {
-        color: $text-tab-indicator-color;
-        padding: 10px 4px;
-
-        &-bar { background-color: $icon-tab-indicator-active-color }
-
-        &-selected { color: $icon-tab-indicator-hover-color }
-
-        &:hover { color: $icon-tab-indicator-hover-color }
-    }
-
-    &-search {
-        background: $menu-bg-color;
-
-        input {
-            outline: none;
-            padding: 8px;
-            background: $search-bar-color;
-            color: $ui-text-color;
-            border: 0;
-            border-radius: $search-bar-radius;
-
-            &:focus {
-                @include shadow-2dp;
-                background: $search-bar-focus-color;
-                color: $search-bar-text-color;
-            }
-        }
-    }
-
-    &-scroll {
-        padding: 0 8px 8px;
-        background: $menu-bg-color;
-    }
-
-    &-category {
-        &-label span {
-            padding: 4px 6px;
-            background: $menu-bg-color;
-        }
-
-        .emoji-mart-emoji:hover::before { background-color: $icon-bg-hover-color }
-    }
-
-    &-no-results { color: $secondary-text-color }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/icons.scss b/app/javascript/styles/y-zu-light/theme/icons.scss
deleted file mode 100644
index 987767544..000000000
--- a/app/javascript/styles/y-zu-light/theme/icons.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.fa.fa-users.column-link,
-.fa.fa-globe.column-link,
-.fa.fa-address-book.column-link,
-.fa.fa-bullhorn.column-link,
-.fa.fa-envelope.column-link,
-.fa.fa-bookmark.column-link,
-.fa.fa-star.column-link,
-.fa.fa-list-ul.column-link {
-    &__icon.fa-fw { color: $icon-color }
-}
-
-.fa.fa-lock { text-transform: none }
-
-.icon-with-badge__badge {
-    background: $badge-color;
-    border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/material-icons.scss b/app/javascript/styles/y-zu-light/theme/material-icons.scss
deleted file mode 100644
index dd01ce3d6..000000000
--- a/app/javascript/styles/y-zu-light/theme/material-icons.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config', '../icon_config';
-@import '../custom_color', '../custom_layout';
-@import 'functions';
-@import 'mixins';
-
-
-@include icon-font;
-
-.fa-fw {
-    width: 20px;
-    height: 20px;
-    font-size: 20px;
-}
-
-.fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
-    &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
-    &.fa-sign-out,
-    &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
-    &.fa-paperclip,
-    &.fa-tasks,
-    &.fa-plus,
-    &.fa-unlock,
-    &.fa-lock,
-    &.fa-envelope,
-    &.fa-home,
-    &.fa-bullhorn,
-    &.fa-sliders,
-    &.fa-chevron-left,
-    &.fa-chevron-right,
-    &.fa-reply,
-    &.fa-reply-all,
-    &.fa-share-alt,
-    &.fa-star,
-    &.fa-bookmark,
-    &.fa-ellipsis-h,
-    &.fa-bell,
-    &.fa-bell-o,
-    &.fa-eraser,
-    &.fa-users,
-    &.fa-file-text,
-    &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
-    &.fa-eye,
-    &.fa-eye-slash,
-    &.fa-pencil,
-    &.fa-trash,
-    &.fa-play,
-    &.fa-external-link,
-    &.fa-retweet,
-    &.fa-link,
-    &.fa-pause,
-    &.fa-volume-up,
-    &.fa-volume-off,
-    &.fa-expand,
-    &.fa-download,
-    &.fa-arrows-alt,
-    &.fa-compress,
-    &.fa-user-times,
-    &.fa-check,
-    &.fa-quote-right,
-    &.fa-upload,
-    &.fa-comments,
-    &.fa-angle-right,
-    &.fa-thumb-tack {
-        @include icon-font-style;
-        line-height: 1;
-        letter-spacing: normal;
-        text-transform: none;
-        display: inline-block;
-        white-space: nowrap;
-        word-wrap: normal;
-        direction: ltr;
-        font-feature-settings: 'liga';
-        -webkit-font-smoothing: antialiased;
-    }
-}
-
-.fa {
-    &.fa-bars::before, &.fa-navicon::before,&.fa-reorder::before { content: "menu" }
-    &.fa-globe::before { content: "public" }
-    &.fa-cog::before, &.fa-cogs::before, &.fa-gears::before { content: "settings" }
-    &.fa-sign-out::before { content: "exit_to_app" }
-    &.fa-search::before { content: "search" }
-    &.fa-times::before, &.fa-times-circle::before, &.fa-close::before, &.fa-remove::before { content: "close" }
-    &.fa-chevron-down::before, &.fa-ellipsis-v::before { content: "more_vert" }
-    &.fa-paperclip::before { content: "attach_file" }
-    &.fa-tasks::before { content: "poll" }
-    &.fa-plus::before { content: "add" }
-    &.fa-unlock::before { content: "lock_open" }
-    &.fa-lock::before { content: "lock" }
-    &.fa-envelope::before { content: "mail" }
-    &.fa-home::before { content: "home" }
-    &.fa-bullhorn::before { content: "announcement" }
-    &.fa-sliders::before { content: "tune" }
-    &.fa-chevron-left::before { content: "arrow_back" }
-    &.fa-chevron-right::before { content: "arrow_forward" }
-    &.fa-reply::before { content: $reply-icon }
-    &.fa-reply-all::before { content: "reply_all" }
-    &.fa-share-alt::before { content: "share" }
-    &.fa-star::before { content: $favorite-icon }
-    &.fa-bookmark::before { content: "bookmark" }
-    &.fa-ellipsis-h::before { content: "more_horiz" }
-    &.fa-bell::before { content: "notifications" }
-    &.fa-bell-o::before { content: "notifications" }
-    &.fa-eraser::before { content: "clear_all" }
-    &.fa-users::before { content: "people" }
-    &.fa-file-text::before { content: "web" }
-    &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
-    &.fa-eye::before { content: "visibility" }
-    &.fa-eye-slash::before { content : "visibility_off" }
-    &.fa-pencil::before { content: "create" }
-    &.fa-trash::before { content: "delete" }
-    &.fa-play::before { content: "play_arrow" }
-    &.fa-external-link::before { content: "open_in_new" }
-    &.fa-retweet::before { content: "repeat" }
-    &.fa-link::before { content: "link" }
-    &.fa-pause::before { content: "pause" }
-    &.fa-volume-up::before { content: "volume_up" }
-    &.fa-volume-off::before { content: "volume_off" }
-    &.fa-expand::before { content: "web_asset" }
-    &.fa-download::before { content: "file_download" }
-    &.fa-arrows-alt::before { content: "fullscreen" }
-    &.fa-compress::before { content: "fullscreen_exit" }
-    &.fa-user-times::before { content: "person_remove" }
-    &.fa-check::before { content: "check" }
-    &.fa-quote-right::before { content: "format_quote" }
-    &.fa-upload::before { content: "file_upload" }
-    &.fa-comments::before { content: "forum" }
-    &.fa-angle-right::before { content: "chevron_right" }
-    &.fa-thumb-tack::before { content: "push_pin" }
-}
-
-// bookmark icon
-.status__action-bar-button.icon-button,
-.bookmark-icon.icon-button {
-    .fa.fa-bookmark::before { content: "bookmark_border" }
-    &.active .fa.fa-bookmark::before { content: "bookmark" }
-}
-
-// favorite icon
-.status__action-bar-button.star-icon.icon-button,
-.star-icon.icon-button {
-    .fa.fa-star::before { content: $favorite-icon-border }
-
-    &.active,
-    &.active.activate {
-        .fa.fa-star::before { content: $favorite-icon }
-    }
-}
-
-// favorite icon color
-.star-icon.active,
-.star-icon.icon-button.active.active,
-.notification__favourite-icon-wrapper .star-icon,
-.status__action-bar-button.star-icon.icon-button.active { color: $favorite-icon-color }
-
-// boost icon
-button.icon-button i.fa-retweet {
-    height: 20px;
-    width: 20px;
-    transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
-
-button.icon-button i.fa-retweet:hover,
-button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-retweet:hover,
-button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($disabled-icon-color)}" width="20px" height="20px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>');
-}
-
-// dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
-
-// icon in tab settings
-.text-btn.column-header__setting-btn {
-    .fa {
-        vertical-align: middle;
-
-        &.fa-eraser { margin-right: 8px } // clear notification
-    }
-}
-
-// top bar icons align
-.fa.fa-bell.column-header__icon.fa-fw,
-.fa.fa-home.column-header__icon.fa-fw,
-.fa.fa-users.column-header__icon.fa-fw,
-.fa.fa-globe.column-header__icon.fa-fw,
-.fa.fa-bars.column-header__icon.fa-fw,
-.fa.fa-bookmark.column-header__icon.fa-fw,
-.fa.fa-address-book-o.column-header__icon.fa-fw,
-.fa.fa-envelope.column-header__icon.fa-fw,
-.fa.fa-star.column-header__icon.fa-fw { vertical-align: text-bottom }
-
-// top bar icons in single column mode
-.tabs-bar__link {
-    .fa.fa-home.fa-fw,
-    .fa.fa-bell.fa-fw,
-    .fa.fa-users.fa-fw,
-    .fa.fa-globe.fa-fw { vertical-align: text-bottom }
-}
-
-// getting-started and side bar icons
-.column-link .fa,
-.column-link--transparent .fa { vertical-align: text-bottom }
-
-// uploaded media icons align
-.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button .fa {
-    font-size: 20px;
-    vertical-align: text-bottom;
-}
-
-// search results icons align
-.search-results__header .fa { vertical-align: text-bottom }
-
-// read more icon
-.status__content__read-more-button .fa { vertical-align: bottom }
-
-// Attachment icon
-.attachment-list__list a .fa { vertical-align: middle }
-
-// status detail icon
-.detailed-status .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
-
-// status scope
-.status__visibility-icon .fa,
-.account__header__tabs__name .fa {
-    font-size: 16px;
-    vertical-align: text-bottom;
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/media.scss b/app/javascript/styles/y-zu-light/theme/media.scss
deleted file mode 100644
index b8ac12414..000000000
--- a/app/javascript/styles/y-zu-light/theme/media.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.media-gallery {
-    border-radius: $media-radius;
-
-    &__item { border-radius: $media-radius }
-}
-
-.media-modal {
-    &__nav {
-        background: $media-icon-bg-color;
-        color: $media-icon-color;
-        height: 48px;
-        width: 48px;
-        margin: auto 16px;
-        padding: 8px;
-        border-radius: 50%;
-    
-        .fa { width: 32px }
-    }
-
-    &__button {
-        background-color: $media-page-indicator-color;
-
-        &--active { background-color: $media-page-indicator-active-color }
-    }
-
-    &__close {
-        &.icon-button {
-            background: transparent;
-            color: $media-icon-color;
-            font-size: 24px !important;
-            width: 24px !important;
-            height: 24px !important;
-            padding: 8px;
-            box-sizing: content-box;
-            line-height: normal !important;
-    
-            &:hover {
-                background: $media-icon-bg-hover-color;
-                color: $media-icon-hover-color;
-            }
-    
-            .fa-fw {
-                width: 24px;
-                height: 24px;
-            }
-        }
-    }
-
-    &__meta {
-        bottom: 24px;
-
-        a { color: $media-icon-color }
-    }
-
-    &__overlay {
-        .picture-in-picture__footer .icon-button {
-            color: $media-icon-color;
-
-            &:active,
-            &:focus,
-            &:hover {
-                color: $media-icon-hover-color;
-                background-color: transparent;
-            }
-        }
-    }
-}
-
-.video-player {
-    &__controls {
-        background: linear-gradient(0deg,rgba(0,0,0,.5),rgba(0,0,0,.2) 60%,transparent);
-        padding: 0 12px;
-    }
-
-    &__seek {
-        &::before {
-            background: rgba(255,255,255,.2);
-            border-radius: 0;
-        }
-
-        &__buffer {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__progress {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__volume {
-        &::before {
-            background: rgba(255,255,255,.4);
-            border-radius: 0;
-        }
-
-        &__current {
-            background: $primary-color;
-            border-radius: 0;
-        }
-
-        &__handle {
-            @include material-transition;
-            background-color: $primary-color;
-            box-shadow: none;
-        }
-    }
-
-    &__time-current { margin-left: 68px }
-
-    &__buttons button { font-size: 20px }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/modal.scss b/app/javascript/styles/y-zu-light/theme/modal.scss
deleted file mode 100644
index 93e5b24c1..000000000
--- a/app/javascript/styles/y-zu-light/theme/modal.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.confirmation-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $dialog-radius;
-
-    &__container {
-        text-align: left;
-        padding: 24px;
-    }
-
-    &__action-bar {
-        justify-content: flex-end;
-        background: $card-bg-color;
-        padding: 8px;
-    }
-
-    &__secondary-button {
-        box-shadow: none !important;
-        color: $text-button-color;
-        background: transparent;
-        margin: 0 8px;
-
-        &:hover {
-            color: $text-button-color;
-            background: $text-button-hover-color;
-        }
-        
-        &:focus,
-        &:active {
-            color: $text-button-color;
-            background-color: $text-button-focus-color;
-        }
-    }
-}
-
-.actions-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    border-radius: $card-radius;
-
-    ul li:not(:empty) a {
-        color: $ui-text-color;
-        font-size: 16px;
-
-        &:hover {
-            background: $card-bg-hover-color;
-            color: $ui-text-color;
-        }
-    }
-
-    .dropdown-menu__separator { border-bottom-color: $border-color }
-
-    .status {
-        background: $card-bg-color;
-        border-bottom-color: $border-color;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        &__avatar {
-            left: 12px;
-            top: 12px;
-        }
-    }
-}
-
-.report-modal {
-    @include shadow-24dp;
-    background: $card-bg-color;
-    color: $ui-text-color;
-    border-radius: $card-radius;
-
-    &__target {
-        padding: 24px;
-        text-align: left;
-        font-weight: bold;
-    }
-
-    &__container {
-        border-top: none;
-    }
-
-    &__comment {
-        border-right: none;
-
-        .setting-text-label { color: $ui-text-color }
-    }
-}
-
-.embed-modal .embed-modal__container {
-    padding: 0 24px 24px 24px;
-
-    .hint {
-        margin-bottom: 16px;
-        color: $secondary-text-color;
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/responsive.scss b/app/javascript/styles/y-zu-light/theme/responsive.scss
deleted file mode 100644
index 8618f7ed7..000000000
--- a/app/javascript/styles/y-zu-light/theme/responsive.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.tabs-bar {
-    background: $top-bar-color;
-
-    &__link {
-        padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
-        border-bottom: 4px solid transparent;
-
-        &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
-        }
-
-        .fa { font-size: 20px }
-
-        span {
-            margin-left: 8px;
-            vertical-align: text-bottom;
-        }
-    }
-
-    &__wrapper {
-        @include shadow-4dp;
-        background: transparent;
-    }
-}
-
-#tabs-bar__portal { overflow-y: hidden }
-
-.floating-action-button {
-    @include shadow-6dp;
-    background: $floating-action-button-color;
-    color: $floating-action-button-icon-color;
-    font-size: 24px;
-    width: $fab-size;
-    height: $fab-size;
-    bottom: 16px;
-    right: 16px;
-
-    &:hover { background: $floating-action-button-hover-color }
-
-    &:active,
-    &:focus { background: $floating-action-button-active-color }
-}
-
-.columns-area--mobile {
-    .column { margin: 0 !important }
-    .search__input { padding: 16px 46px }
-
-    .search__icon {
-        .fa {
-            top: 16px;
-            left: 16px;
-        }
-
-        .fa-times-circle.active { left: unset }
-    }
-}
-
-// small size screen
-@media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
-}
-
-// middle size screen
-@media screen and (min-width: 415px) {
-    .tabs-bar {
-        margin-bottom: 0;
-
-        &__wrapper {
-            padding-top: 0;
-
-            .tabs-bar { margin-bottom: 0 }
-        }
-    }
-
-    .columns-area__panels {
-        &__main {
-            @include shadow-1dp;
-            padding: 0;
-        }
-
-        &__pane { padding: 0 16px }
-    }
-}
-
-//single column mode
-@media screen and (min-width: 631px) {
-    .tabs-bar__link {
-        &:hover {
-            background: $tab-indicator-bg-hover-color;
-            border-bottom-color: transparent;
-        }
-
-        &:active,
-        &:focus {
-            background: $tab-indicator-bg-focus-color;
-            border-bottom-color: $tab-bg-color;
-        }
-
-        &.active { border-bottom-color: $tab-indicator-active-color }
-    }
-}
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/statuses.scss b/app/javascript/styles/y-zu-light/theme/statuses.scss
deleted file mode 100644
index 7e4374014..000000000
--- a/app/javascript/styles/y-zu-light/theme/statuses.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.status {
-    padding: 12px 12px 4px 70px;
-    border-bottom: 1px solid $border-color;
-
-    &__expand { width: 70px }
-
-    &__info {
-        font-size: $name-font-size;
-        padding-right: 4px;
-    }
-
-    &__relative-time { color: $info-text-color }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__avatar {
-        left: 12px;
-        top: 12px;
-    }
-
-    &__content {
-        font-size: $status-font-size;
-        padding-top: 4px;
-        color: $primary-text-color;
-
-        a {
-            color: $link-text-color;
-
-            &.unhandled-link { color: $link-text-color }
-        }
-
-        p { margin-bottom: 16px }
-
-        .status__content__spoiler-link {
-            background: transparent;
-
-            &:hover { background: $text-button-hover-color }
-
-            &:focus { background: $text-button-focus-color }
-        }
-
-        &__spoiler-link {
-            border: 0;
-            color: $text-button-color;
-        }
-
-        &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
-            padding: 4px 6px;
-
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
-        }
-    }
-
-    &__action-bar {
-        margin-top: 4px;
-
-        &__counter {
-            margin-right: 6px;
-
-            &__label {
-                font-size: 14px;
-                color: $info-text-color;
-            }
-        }
-    }
-
-    &__action-bar-button {
-        margin-right: 4px;
-
-        &.icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &--with-counter {
-                margin-right: 4px;
-                width: auto !important;
-
-                &:hover { background: transparent }
-            }
-        }
-    }
-
-    &__action-bar-dropdown {
-        width: 36px !important;
-        height: 36px !important;
-        box-sizing: content-box;
-
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-
-            &:hover {
-                color:$icon-hover-color;
-                background: $icon-bg-hover-color;
-            }
-        }
-    }
-
-    &__prepend {
-        color: $secondary-text-color;
-        margin-left: 64px;
-
-        .status__display-name strong { color: $secondary-text-color }
-    }
-
-    &.status-direct:not(.read) {
-        background: transparent;
-        border-bottom-color: $border-color;
-    }
-
-    &__visibility-icon { color: $icon-color }
-}
-
-.status-card {
-    color: $icon-color;
-    border-color: $border-color;
-    outline: none;
-    margin-top: 16px;
-
-    &__image {
-        background: transparent;
-
-        &>.fa {
-            font-size: 26px;
-        }
-    }
-
-    &__title {
-        color: $primary-text-color;
-        margin-bottom: 6px;
-    }
-
-    &__description { color: $secondary-text-color }
-
-    &__actions {
-        &>div {
-            background: $media-icon-bg-color;
-            border-radius: $button-radius;
-        }
-
-        button,
-        a {
-            color: $media-icon-color;
-            font-size: 20px;
-        }
-
-        a { bottom: auto }
-    }
-
-    &.compact {
-        border-color: $border-color;
-        outline: none;
-        background: transparent;
-        
-        .status-card {
-            &__content { padding: 12px }
-            &__image { flex: 0 0 64px }
-        }
-
-        &:hover { background-color: transparent !important }
-    }
-
-    &.horizontal {
-        border-radius: 0;
-        
-        .status-card {
-            &__image-preview { border-radius: 0 }
-
-            &__image-image { border-radius: 0 }
-        }
-    }
-}
-
-a.status-card {
-    &:hover { background-color: $card-bg-color }
-}
-
-.embed .status,
-.public-layout .status { padding: 16px 16px 16px 80px }
-
-// Detailed status in mobile
-.status.light {
-    .status {
-        &__display-name { color: $primary-text-color }
-        &__relative-time { color: $info-text-color }
-        &__content { color: $primary-text-color }
-    }
-
-    .display-name { color: $secondary-text-color }
-    .display-name strong { color: $primary-text-color }
-}
-
-.detailed-status {
-    background: $card-bg-color;
-    padding: 16px;
-
-    &.detailed-status--flex.detailed-status-public { border-radius: $card-radius }
-
-    &__display-name {
-        color: $secondary-text-color;
-
-        strong { color: $primary-text-color }
-    }
-
-    &__meta {
-        margin-top: 16px;
-        color: $info-text-color;
-    }
-
-    &__action-bar {
-        background: $card-bg-color;
-        border-top: none;
-        border-bottom: 1px solid $border-color;
-        padding: 8px 0;
-    }
-
-    &__action-bar-dropdown {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-
-            &.active {
-                color: $icon-hover-color;
-                background: $icon-bg-active-color;
-            }
-        }
-    }
-
-    &__button {
-        .icon-button {
-            @include icon-button;
-            padding: 8px;
-            box-sizing: content-box;
-        }
-    }
-
-    .button.logo-button {
-        margin-bottom: 16px;
-        line-height: 36px;
-    }
-}
-
-// search user trends
-.display-name {
-    &__html { color: $primary-text-color }
-    &__account { color: $secondary-text-color }
-}
-
-.activity-stream {
-    @include shadow-1dp;
-    margin-bottom: 16px;
-    border-radius: $card-radius;
-
-    .entry {
-        background: $card-bg-color;
-
-        &:first-child {
-            .detailed-status,
-            .load-more,
-            .status { border-radius: $card-radius $card-radius 0 0 }
-        }
-    }
-}
-
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/theme.scss b/app/javascript/styles/y-zu-light/theme/theme.scss
deleted file mode 100644
index 367893682..000000000
--- a/app/javascript/styles/y-zu-light/theme/theme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* Mastodon Material 0.2.1
-* Author: Rintan, Genbu Project
-* Copyright (C) 2020 Rintan, Genbu Project
-*/
-
-@charset "UTF-8";
-
-
-@import 'account', 'basics', 'button', 'columns', 'containers', 'components', 'base_config', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/variables.scss b/app/javascript/styles/y-zu-light/theme/variables.scss
deleted file mode 100644
index 0b948881b..000000000
--- a/app/javascript/styles/y-zu-light/theme/variables.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-
-
-.link-button { color: $link-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/y-zu-light/theme/widgets.scss b/app/javascript/styles/y-zu-light/theme/widgets.scss
deleted file mode 100644
index 4abdfbae9..000000000
--- a/app/javascript/styles/y-zu-light/theme/widgets.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@charset "UTF-8";
-@import 'base_config';
-@import '../custom_config';
-@import '../custom_color', '../custom_layout';
-@import 'mixins';
-
-
-.hero-widget {
-    @include shadow-2dp;
-    margin-bottom: 16px;
-
-    &__img {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $card-bg-color;
-
-        img { border-radius: $card-radius $card-radius 0 0 }
-    }
-
-    &__text {
-        background: $card-bg-color;
-        padding: 16px;
-        color: $primary-text-color;
-        border-radius: 0 0 $card-radius $card-radius;
-    }
-}
-
-.endorsements-widget {
-    padding-bottom: 8px;
-    margin-bottom: 8px;
-}
-
-.trends-widget h4 { color: $section-text-color }
\ No newline at end of file

From 1474d573d0b0c346c840832cf305e9bb0e6abcf7 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Wed, 10 Mar 2021 18:59:50 +0900
Subject: [PATCH 081/200] fix y-zu theme

---
 .../profiles/y-zu-dark/color.scss             | 40 ++++++++++++++++++-
 .../profiles/y-zu-dark/layout.scss            |  8 +++-
 .../profiles/y-zu-light/color.scss            | 14 +++++--
 .../profiles/y-zu-light/layout.scss           |  8 +++-
 4 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
index 25466d633..f97e21926 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
@@ -1 +1,39 @@
-// Add your customization below
\ No newline at end of file
+// Add your customization below
+
+$primary-color: #8D6E63;
+
+$section-text-color: $primary-color;
+
+$icon-color: #D7CCC8;
+$icon-hover-color: #ffffff;
+$top-bar-icon-color: $icon-color;
+$top-bar-icon-hover-color: $icon-hover-color;
+$top-bar-icon-active-color: $primary-color;
+
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
+$icon-button-color: $icon-color;
+$icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: $primary-color;
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
+$contained-button-color: $primary-color;
+$contained-button-hover-color: lighten($contained-button-color, 10%);
+$outlined-button-color: $primary-color;
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
+$text-button-color: $primary-color;
+$text-button-hover-color: transparentize($text-button-color, 0.8);
+$text-button-focus-color: transparentize($text-button-color, 0.7);
+$floating-action-button-icon-color: $primary-color;
+
+$toggle-thumb-active-color: #795548;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
+$tab-indicator-color: $top-bar-icon-color;
+$tab-indicator-active-color: $top-bar-icon-color;
+$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
+$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
+$icon-tab-indicator-active-color: $primary-color;
+$icon-tab-indicator-hover-color: $icon-hover-color;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
index 88c66fb64..0c3d2a73e 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/layout.scss
@@ -1,5 +1,9 @@
 // Add your customization below
 
-$avater-radius: 2px;
+$avatar-radius: 2px;
 
-$text-area-border: outlined;
\ No newline at end of file
+$button-on-status: outlined; 
+
+$cw-area-border: outlined;
+
+$compose-area-border: outlined;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
index 87a4fed42..5e389df40 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -1,16 +1,19 @@
 // Add your customization below
 
-$bg-color: #fafafa;
-
 $primary-color: #6D4C41;
 
-$icon-color: #92787D;
+$section-text-color: $primary-color;
 
+$icon-color: #92787D;
 $icon-hover-color: darken($icon-color, 10%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
 
+$control-border-color: $icon-color;
+$control-border-active-color: $primary-color;
+$control-border-hover-color: transparentize($control-border-active-color, 0.8);
+
 $icon-button-color: $icon-color;
 $icon-button-hover-color: $icon-hover-color;
 $contained-button-color: $primary-color;
@@ -22,6 +25,11 @@ $text-button-color: $contained-button-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
 
+$bg-color: #fafafa;
+
+$toggle-thumb-active-color: $primary-color;
+$toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
+
 $border-color: lighten($icon-color, 30%);
 $border-hover-color: darken($border-color, 30%);
 $border-active-color: $primary-color;
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
index 88c66fb64..0c3d2a73e 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/layout.scss
@@ -1,5 +1,9 @@
 // Add your customization below
 
-$avater-radius: 2px;
+$avatar-radius: 2px;
 
-$text-area-border: outlined;
\ No newline at end of file
+$button-on-status: outlined; 
+
+$cw-area-border: outlined;
+
+$compose-area-border: outlined;
\ No newline at end of file

From e50aba28ee53f84a7d8e3ee62113cd9008fe30c3 Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Mon, 29 Mar 2021 12:33:02 +0900
Subject: [PATCH 082/200] Delete dependabot.yml

---
 .github/dependabot.yml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index c4cd48878..000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: "/"
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 99
-    allow:
-      - dependency-type: direct
-
-  - package-ecosystem: bundler
-    directory: "/"
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 99
-    allow:
-      - dependency-type: direct

From 4b8f6985d59df820b10e7b631133c3b099400daa Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Mon, 29 Mar 2021 12:38:22 +0900
Subject: [PATCH 083/200] update material theme

---
 .../styles/mastodon-material/color/black.scss |  10 +-
 .../color/mastodon-dark.scss                  |  10 +-
 .../color/mastodon-light.scss                 |  10 +-
 .../mastodon-material/color/plus-classic.scss |  10 +-
 .../mastodon-material/color/v1-dark.scss      |  10 +-
 .../mastodon-material/color/v1-light.scss     |  10 +-
 .../mastodon-material/color/v2-dark.scss      |  14 +-
 .../mastodon-material/color/v2-light.scss     |  10 +-
 .../mastodon-material/layout/material-v1.scss |  15 +-
 .../mastodon-material/layout/material-v2.scss |  17 +-
 .../profiles/y-zu-dark/color.scss             |  25 ++-
 .../profiles/y-zu-light/color.scss            |  13 +-
 .../mastodon-material/theme/_mixins.scss      |   7 +
 .../mastodon-material/theme/account.scss      |  74 +++++++--
 .../styles/mastodon-material/theme/admin.scss | 151 ++++++++++++++++++
 .../mastodon-material/theme/basics.scss       |   3 +-
 .../mastodon-material/theme/button.scss       |  21 +++
 .../mastodon-material/theme/components.scss   |  63 +++++++-
 .../mastodon-material/theme/containers.scss   |   3 +
 .../styles/mastodon-material/theme/forms.scss | 137 ++++++++++++++++
 .../theme/material-icons.scss                 |  71 +++++---
 .../mastodon-material/theme/responsive.scss   |  15 ++
 .../mastodon-material/theme/statuses.scss     |  14 +-
 .../mastodon-material/theme/tables.scss       |  83 ++++++++++
 .../styles/mastodon-material/theme/theme.scss |   2 +-
 .../mastodon-material/theme/widgets.scss      |  41 ++++-
 26 files changed, 744 insertions(+), 95 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material/theme/admin.scss
 create mode 100644 app/javascript/styles/mastodon-material/theme/forms.scss
 create mode 100644 app/javascript/styles/mastodon-material/theme/tables.scss

diff --git a/app/javascript/styles/mastodon-material/color/black.scss b/app/javascript/styles/mastodon-material/color/black.scss
index 04674b6ff..67c8cd7d5 100644
--- a/app/javascript/styles/mastodon-material/color/black.scss
+++ b/app/javascript/styles/mastodon-material/color/black.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: lighten($card-bg-color, 6%);
 $list-bg-color: #000000;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-active-hover-color: lighten($list-bg-color, 16%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: lighten($bg-color, 6%);
+$dropdown-field-bg-hover-color: lighten($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: lighten($dropdown-field-bg-color, 10%);
 $verified-bg-color: darken($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -87,11 +91,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -139,6 +144,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
index f78894243..626de6075 100644
--- a/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: lighten($card-bg-color, 6%);
 $list-bg-color: #282c37;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-active-hover-color: lighten($list-bg-color, 16%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: lighten($bg-color, 6%);
+$dropdown-field-bg-hover-color: lighten($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: lighten($dropdown-field-bg-color, 10%);
 $verified-bg-color: darken($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -87,11 +91,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.7);
 $text-button-focus-color: transparentize($text-button-color, 0.6);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -139,6 +144,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/mastodon-light.scss b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
index d6877379c..833dca194 100644
--- a/app/javascript/styles/mastodon-material/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
@@ -36,8 +36,12 @@ $card-bg-hover-color: darken($card-bg-color, 6%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-active-hover-color: darken($list-bg-color, 16%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: darken($bg-color, 6%);
+$dropdown-field-bg-hover-color: darken($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: darken($dropdown-field-bg-color, 10%);
 $verified-bg-color: lighten($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -86,11 +90,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: lighten($text-button-color, 36%);
 $text-button-focus-color: lighten($text-button-color, 30%);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -138,6 +143,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
index 5d8da861e..cc8b89f2f 100644
--- a/app/javascript/styles/mastodon-material/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: darken($card-bg-color, 6%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-active-hover-color: darken($list-bg-color, 16%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: darken($bg-color, 6%);
+$dropdown-field-bg-hover-color: darken($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: darken($dropdown-field-bg-color, 10%);
 $verified-bg-color: lighten($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -86,11 +90,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $secondary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -138,6 +143,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/v1-dark.scss b/app/javascript/styles/mastodon-material/color/v1-dark.scss
index 06b7d2276..d0bde6154 100644
--- a/app/javascript/styles/mastodon-material/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-dark.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: lighten($card-bg-color, 6%);
 $list-bg-color: #424242;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-active-hover-color: lighten($list-bg-color, 16%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: lighten($bg-color, 6%);
+$dropdown-field-bg-hover-color: lighten($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: lighten($dropdown-field-bg-color, 10%);
 $verified-bg-color: darken($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -86,11 +90,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -138,6 +143,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/v1-light.scss b/app/javascript/styles/mastodon-material/color/v1-light.scss
index aedcf3caf..58bb0ad4e 100644
--- a/app/javascript/styles/mastodon-material/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-light.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: darken($card-bg-color, 6%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-active-hover-color: darken($list-bg-color, 16%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: darken($bg-color, 6%);
+$dropdown-field-bg-hover-color: darken($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: darken($dropdown-field-bg-color, 10%);
 $verified-bg-color: lighten($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -87,11 +91,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: $primary-color;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
@@ -139,6 +144,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/v2-dark.scss b/app/javascript/styles/mastodon-material/color/v2-dark.scss
index 706ecb5f3..842c6f648 100644
--- a/app/javascript/styles/mastodon-material/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-dark.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: lighten($card-bg-color, 6%);
 $list-bg-color: #1e1e1e;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
+$list-bg-active-hover-color: lighten($list-bg-color, 16%);
 $list-bg-inactive-color: lighten($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: lighten($bg-color, 6%);
+$dropdown-field-bg-hover-color: lighten($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: lighten($dropdown-field-bg-color, 10%);
 $verified-bg-color: darken($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -87,15 +91,16 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-color: $primary-color;
+$disabled-button-color: #cccccc;
+$floating-action-button-color: #272727;
 $floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
 $floating-action-button-active-color: lighten($floating-action-button-color, 10%);
-$floating-action-button-icon-color: #ffffff;
+$floating-action-button-icon-color: $primary-color;
 
 // Toggle color
 $toggle-thumb-color: #ffffff;
@@ -139,6 +144,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/color/v2-light.scss b/app/javascript/styles/mastodon-material/color/v2-light.scss
index 7c5840794..10e7a0b91 100644
--- a/app/javascript/styles/mastodon-material/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-light.scss
@@ -37,8 +37,12 @@ $card-bg-hover-color: darken($card-bg-color, 6%);
 $list-bg-color: $bg-color;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
+$list-bg-active-hover-color: darken($list-bg-color, 16%);
 $list-bg-inactive-color: darken($list-bg-color, 10%);
 $text-field-bg-color: $card-bg-color;
+$dropdown-field-bg-color: darken($bg-color, 6%);
+$dropdown-field-bg-hover-color: darken($dropdown-field-bg-color, 6%);
+$dropdown-field-bg-active-color: darken($dropdown-field-bg-color, 10%);
 $verified-bg-color: lighten($verified-color, 20%);
 $unread-bg-color: transparentize($primary-color, 0.8);
 
@@ -87,11 +91,12 @@ $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $primary-color;
-$outlined-button-hover-color: transparentize($primary-color, 0.8);
-$outlined-button-active-color: transparentize($primary-color, 0.7);
+$outlined-button-hover-color: transparentize($outlined-button-color, 0.8);
+$outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
+$disabled-button-color: #cccccc;
 $floating-action-button-color: #ffffff;
 $floating-action-button-hover-color: darken($floating-action-button-color, 6%);
 $floating-action-button-active-color: darken($floating-action-button-color, 10%);
@@ -139,6 +144,7 @@ $media-page-indicator-active-color: #e6e6e6;
 // Progress indicator color
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
 
 // Contents color in read status
 $read-primary-text-color: transparentize($primary-text-color, 0.3);
diff --git a/app/javascript/styles/mastodon-material/layout/material-v1.scss b/app/javascript/styles/mastodon-material/layout/material-v1.scss
index 6fcc39ef5..661cc55a4 100644
--- a/app/javascript/styles/mastodon-material/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v1.scss
@@ -41,6 +41,7 @@ $nav-drawer-item-radius: 0;
 // Avatar cropping settings
 $avatar-radius: 50%;  // Rounded cropping
 //$avatar-radius: 2px  // Material v1 square
+//$avatar-radius: $card-radius  // Fit to card radius
 
 
 // Chip settings
@@ -60,10 +61,14 @@ $button-shadow: true;  // Material v1 styled colored button with shadow
 $fab-size: 56px;
 
 
-// CW text area border
-$cw-area-border: none;
-//$cw-area-border: underlined;
+// CW text field border
+$cw-area-border: underlined;
+//$cw-area-border: none;
 
-// Compose text area border
+// Compose text field border
 $compose-area-border: none;
-//$compose-area-border: underlined;
\ No newline at end of file
+//$compose-area-border: underlined;
+
+// Other text field border
+$other-text-area-border: underlined;
+//$other-text-area-border: none;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/layout/material-v2.scss b/app/javascript/styles/mastodon-material/layout/material-v2.scss
index 24b5add29..98a3285c7 100644
--- a/app/javascript/styles/mastodon-material/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v2.scss
@@ -46,6 +46,8 @@ $nav-drawer-item-radius: 8px;  // corner rounded
 
 // Avatar cropping settings
 $avatar-radius: 50%;  // Rounded cropping
+//$avatar-radius: $card-radius  // Fit to card radius
+//$avatar-radius: 2px  // Material v1 square
 //$avatar-radius: 8px  // Material v2 square
 
 
@@ -60,8 +62,8 @@ $button-on-status: text;  // Material v1 styled text button
 
 
 // Button shadow
-$button-shadow: false;  // Material v2 styled colored button without shadow
-//$button-shadow: true;  // Material v1 styled colored button with shadow
+$button-shadow: true;  // Material v1 styled colored button with shadow
+//$button-shadow: false;  // Material v2 styled colored button without shadow
 
 
 // Floating Action Button size
@@ -69,12 +71,17 @@ $fab-size: 56px;  // Regular
 //$fab-size: 40px;  // Mini
 
 
-// CW text area border
+// CW text field border
 $cw-area-border: none;
 //$cw-area-border: underlined;
 //$cw-area-border: outlined;
 
-// Compose text area border
+// Compose text field border
 $compose-area-border: none;
 //$compose-area-border: underlined;
-//$compose-area-border: outlined;
\ No newline at end of file
+//$compose-area-border: outlined;
+
+// Other text field border
+$other-text-area-border: underlined;
+//$other-text-area-border: outlined;
+//$other-text-area-border: none;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
index f97e21926..687c8ed00 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
@@ -1,14 +1,14 @@
 // Add your customization below
 
-$primary-color: #8D6E63;
+$primary-color: #7e5f66;
 
-$section-text-color: $primary-color;
+$section-text-color: lighten($primary-color, 10%);
 
-$icon-color: #D7CCC8;
+$icon-color: #d2d2d2;
 $icon-hover-color: #ffffff;
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: $icon-hover-color;
-$top-bar-icon-active-color: $primary-color;
+$top-bar-icon-active-color: lighten($primary-color, 20%);
 
 $control-border-color: $icon-color;
 $control-border-active-color: $primary-color;
@@ -16,7 +16,7 @@ $control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 $icon-button-color: $icon-color;
 $icon-button-hover-color: $icon-hover-color;
-$icon-button-active-color: $primary-color;
+$icon-button-active-color: lighten($primary-color, 20%);
 $icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
@@ -26,14 +26,23 @@ $outlined-button-active-color: transparentize($outlined-button-color, 0.7);
 $text-button-color: $primary-color;
 $text-button-hover-color: transparentize($text-button-color, 0.8);
 $text-button-focus-color: transparentize($text-button-color, 0.7);
-$floating-action-button-icon-color: $primary-color;
+$floating-action-button-color: $primary-color;
+$floating-action-button-hover-color: lighten($floating-action-button-color, 6%);
+$floating-action-button-active-color: lighten($floating-action-button-color, 10%);
+$floating-action-button-icon-color: #ffffff;
 
-$toggle-thumb-active-color: #795548;
+$toggle-thumb-active-color: $primary-color;
 $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
+$border-active-color: $primary-color;
+
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
 $tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
 $tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
 $icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
\ No newline at end of file
+$icon-tab-indicator-hover-color: $icon-hover-color;
+
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
index 5e389df40..910560fe9 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -1,14 +1,15 @@
 // Add your customization below
 
-$primary-color: #6D4C41;
+$primary-color: #7e5f66;
 
 $section-text-color: $primary-color;
 
-$icon-color: #92787D;
+$icon-color: #92787d;
 $icon-hover-color: darken($icon-color, 10%);
 $top-bar-icon-color: $icon-color;
 $top-bar-icon-hover-color: darken($top-bar-icon-color, 10%);
 $top-bar-icon-active-color: darken($top-bar-icon-color, 18%);
+$floating-action-button-icon-color: $primary-color;
 
 $control-border-color: $icon-color;
 $control-border-active-color: $primary-color;
@@ -36,5 +37,11 @@ $border-active-color: $primary-color;
 
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
+$text-tab-indicator-color: lighten($top-bar-icon-color, 10%);
+$text-tab-indicator-active-color: $top-bar-icon-color;
 $icon-tab-indicator-active-color: $top-bar-icon-color;
-$icon-tab-indicator-hover-color: $top-bar-icon-hover-color;
\ No newline at end of file
+$icon-tab-indicator-hover-color: $top-bar-icon-hover-color;
+
+$progress-indicator-color: $primary-color;
+$progress-indicator-track-color: lighten($progress-indicator-color, 30%);
+$loading-indicator-color: $primary-color;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
index 56dc92b20..7c45fb0b7 100644
--- a/app/javascript/styles/mastodon-material/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -58,6 +58,9 @@ $shadow-color-3: rgba(0,0,0,.12);
 }
 
 @mixin button-type($button-type) {
+    border-radius: $button-radius;
+    display: inline-block;
+    
     @if $button-type == contained {
         @if $button-shadow { @include shadow-1dp }
         background: $contained-button-color;
@@ -91,7 +94,10 @@ $shadow-color-3: rgba(0,0,0,.12);
 
 @mixin button-shadow {
     @if $button-shadow {
+        button.btn,
         .button,
+        .block-button,
+        .input-copy button,
         .compose-form .compose-form__publish-button-wrapper { @include shadow-2dp }
     }
 }
@@ -104,6 +110,7 @@ $shadow-color-3: rgba(0,0,0,.12);
 
     @if $text-area-border == underlined {
         border-radius: $card-radius $card-radius 0 0;
+        border: 0;
         border-bottom: 1px solid $border-color;
 
         &:active,
diff --git a/app/javascript/styles/mastodon-material/theme/account.scss b/app/javascript/styles/mastodon-material/theme/account.scss
index 3b1c58138..b045a96cb 100644
--- a/app/javascript/styles/mastodon-material/theme/account.scss
+++ b/app/javascript/styles/mastodon-material/theme/account.scss
@@ -152,7 +152,7 @@
 
             .verified {
                 border: none;
-                background: $verified-color;
+                background: $verified-bg-color;
 
                 &__mark { color: $primary-text-color }
             }
@@ -183,7 +183,6 @@
 
     &__relationship {
         padding: 8px;
-        height: auto;
 
         .icon-button {
             @include icon-button;
@@ -193,19 +192,76 @@
     }
 }
 
-.account-role {
+.account-role,
+.simple_form .recommended {
     padding: 4px 8px;
     border-radius: 17px;
     color: $ui-text-color;
     background-color: $contained-chip-color;
 }
 
-.accounts-table__count {
-    color: $ui-text-color;
-
-    small { color: $secondary-text-color }
-}
-
 .account-gallery {
     &__item { border-radius: 0 }
+}
+
+.card {
+    &>a {
+        @include shadow-1dp;
+        
+        &:active .card__bar,
+        &:focus .card__bar,
+        &:hover .card__bar { background: $card-bg-color }
+    }
+
+    &__img {
+        background: $card-bg-color;
+        border-radius: $card-radius $card-radius 0 0;
+
+        img { border-radius: $card-radius $card-radius 0 0 }
+    }
+
+    &__bar {
+        padding: 16px;
+        background: $card-bg-color;
+        border-radius: 0 0 $card-radius $card-radius;
+
+        .avatar {
+            padding-top: 0;
+
+            img {
+                border-radius: $avatar-radius;
+                background: $card-bg-color;
+            }
+        }
+
+        .display-name {
+            margin-left: 16px;
+
+            strong { color: $primary-text-color }
+
+            span { color: $secondary-text-color }
+        }
+    }
+}
+
+.pagination {
+    padding: 28px;
+
+    .gap,
+    .newer,
+    .older,
+    .page,
+    a {
+        color: $ui-text-color;
+        padding: 8px;
+    }
+
+    .current {
+        background: $contained-chip-color;
+        color: $ui-text-color;
+        margin: 0 8px;
+        border-radius: 50%;
+        width: 16px;
+        height: 16px;
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/admin.scss b/app/javascript/styles/mastodon-material/theme/admin.scss
new file mode 100644
index 000000000..dd9509a94
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/admin.scss
@@ -0,0 +1,151 @@
+.admin-wrapper {
+    .sidebar-wrapper__inner { background: $bg-color }
+
+    .sidebar {
+        &__toggle {
+            background: $top-bar-color;
+
+            &__icon { color: $top-bar-icon-color }
+
+            &__logo svg { fill: $top-bar-text-color }
+
+            a {
+                border-radius: 50%;
+
+                &:hover { background: $icon-bg-hover-color }
+            }
+        }
+
+        ul {
+            a {
+                padding: 16px;
+                color: $ui-text-color;
+                border-radius: 0;
+        
+                i.fa {
+                    margin-right: 32px;
+                    color: $icon-color;
+                }
+        
+                &.selected {
+                    background: $list-bg-active-color;
+    
+                    &:hover { background: $list-bg-active-hover-color }
+                }
+    
+                &:hover {
+                    color: $ui-text-color;
+                    background-color: $list-bg-hover-color;
+                }
+            }
+    
+            ul {
+                background: $bg-color;
+                
+                a { padding: 16px 36px }
+            }
+    
+            .simple-navigation-active-leaf a {
+                color: $ui-text-color;
+                background-color: $list-bg-active-color;
+    
+                &:hover { background-color: $list-bg-active-hover-color }
+            }
+        }
+    }
+
+    .content {
+        padding: 60px 16px 16px;
+
+        h2,
+        h3,
+        h6 { color: $ui-text-color }
+
+        h3 { margin-bottom: 28px }
+
+        h4 {
+            color: $section-text-color;
+            border-top: 1px solid $border-color;
+            border-bottom: none;
+            padding: 12px 16px;
+        }
+
+        hr {
+            border-bottom: 1px solid $border-color;
+            margin: 16px 0;
+        }
+
+        .muted-hint {
+            color: $ui-text-color;
+
+            a { color: $link-text-color }
+        }
+
+        .positive-hint { color: $verified-color }
+
+        .directory__tag h4 { color: $ui-text-color }
+
+        &>p {
+            color: $ui-text-color;
+            margin-bottom: 16px;
+
+            strong { color: $primary-text-color }
+        }
+    }
+
+    .content-heading {
+        border-bottom: none;
+        margin: -16px -16px 40px 0;
+
+        &>* {
+            margin-top: 16px;
+            margin-right: 16px;
+        }
+    }
+}
+
+.filters .filter-subset {
+    padding: 0 16px;
+    margin: 0 0 16px;
+    border-right: 1px solid $border-color;
+
+    strong { color: $ui-text-color }
+
+    ul {
+        margin-top: 0;
+
+        li { margin-right: 0 }
+    }
+
+    a {
+        color: $text-tab-indicator-color;
+        border-bottom: 2px solid transparent;
+        padding: 8px;
+
+        &.selected {
+            color: $text-tab-indicator-active-color;
+            border-bottom: 2px solid $text-tab-indicator-active-color;
+
+            &:hover {
+                color: $text-tab-indicator-active-color;
+                border-bottom: 2px solid $text-tab-indicator-active-color;
+            }
+        }
+
+        &:hover {
+            color: $text-tab-indicator-color;
+            background: $text-tab-indicator-bg-hover-color;
+            border-bottom: 2px solid transparent;
+        }
+    }
+}
+
+body {
+    .positive-hint { color: $verified-color }
+    
+    .muted-hint {
+        color: $ui-text-color;
+    
+        a { color: $link-text-color }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/basics.scss b/app/javascript/styles/mastodon-material/theme/basics.scss
index 96a12ee24..79d093374 100644
--- a/app/javascript/styles/mastodon-material/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material/theme/basics.scss
@@ -1,5 +1,6 @@
 body,
-body.embed { background: $bg-color }
+body.embed,
+body.admin { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/mastodon-material/theme/button.scss b/app/javascript/styles/mastodon-material/theme/button.scss
index ebb064595..0fee5ab06 100644
--- a/app/javascript/styles/mastodon-material/theme/button.scss
+++ b/app/javascript/styles/mastodon-material/theme/button.scss
@@ -111,6 +111,9 @@ label.icon-button {
         .button--destructive:hover { background: $contained-button-hover-color }
     }
 
+    &:disabled,
+    &.disabled { background-color: $disabled-button-color }
+
     &.button--block { margin: 8px 0 }
 
     &.button-secondary { @include button-type($button-on-status) }
@@ -131,4 +134,22 @@ label.icon-button {
     background: $media-icon-bg-color;
     border-radius: $button-radius;
     color: $media-icon-color;
+}
+
+.simple_form {
+    .block-button, .block-button:last-child
+    .button, .button:last-child
+    button, button:last-child {
+        display: inline-block;
+        border-radius: $button-radius;
+        background: $contained-button-color;
+        color: $contained-button-text-color;
+        width: auto;
+        height: 36px;
+        padding: 10px 16px;
+        margin-left: auto;
+        font-size: 14px;
+
+        &:hover { background: $contained-button-hover-color }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index dec609cbd..24909122a 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -1,9 +1,7 @@
 .modal-root {
     transition: opacity .25s cubic-bezier(0.0,0.0,0.2,1);
 
-    &__overlay { background-color: rgba(0,0,0,.32) !important }
-
-    &__container { background: linear-gradient(rgba(0, 0, 0, 0.48) 5%, transparent 20%, transparent 80%, rgba(0, 0, 0, 0.48) 95%) }
+    &__overlay { background-color: rgba(0,0,0,.7) !important }
 }
 
 .drawer {
@@ -299,9 +297,11 @@
 
             select {
                 color: $ui-text-color;
-                background-color: $bg-color;
+                background-color: $dropdown-field-bg-color;
                 border: 0;
 
+                option { background: $list-bg-color }
+
                 &:focus { border-color: $border-hover-color }
             }
 
@@ -322,7 +322,7 @@
 
     .button { margin-right: 8px }
 
-    li { margin-bottom: 0 }
+    li { margin-bottom: 8px }
 
     &__input {
         border: none;
@@ -634,4 +634,55 @@
     }
 }
 
-.emoji-button { padding: 8px }
\ No newline at end of file
+.emoji-button { padding: 8px }
+
+.focusable:focus .detailed-status,
+.focusable:focus .detailed-status__action-bar { background: transparent }
+
+.no-reduce-motion .loading-indicator {
+    display: inline-block;
+    position: relative;
+    color: transparent;
+    width: 80px;
+    height: 80px;
+
+    &__figure {
+        box-sizing: border-box;
+        display: block;
+        position: absolute;
+        width: 48px;
+        height: 48px;
+        top: 10%;
+        left: 10%;
+        margin: 8px;
+        border: 4px solid transparent;
+        border-radius: 50%;
+        animation: loading-indicator 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+        border-color: $loading-indicator-color transparent transparent transparent;
+
+        &:nth-child(1) {
+            animation-delay: -0.45s;
+        }
+
+        &:nth-child(2) {
+            animation-delay: -0.3s;
+        }
+
+        &:nth-child(3) {
+            animation-delay: -0.15s;
+        }
+    }
+}
+@keyframes loading-indicator {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+}
+
+.loading-bar {
+    background-color: $loading-indicator-color;
+    height: 4px;
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/containers.scss b/app/javascript/styles/mastodon-material/theme/containers.scss
index 42a12a1ac..c4fa3aaea 100644
--- a/app/javascript/styles/mastodon-material/theme/containers.scss
+++ b/app/javascript/styles/mastodon-material/theme/containers.scss
@@ -16,6 +16,7 @@
             color: $top-bar-text-color;
 
             &:hover {
+                color: $top-bar-text-color;
                 background: $tab-indicator-bg-hover-color;
                 text-decoration: none;
             }
@@ -66,6 +67,8 @@
             background: $card-bg-color;
 
             &::after { box-shadow: none }
+
+            img { border-radius: $card-radius $card-radius 0 0 }
         }
 
         &__bar {
diff --git a/app/javascript/styles/mastodon-material/theme/forms.scss b/app/javascript/styles/mastodon-material/theme/forms.scss
new file mode 100644
index 000000000..af55dcdf9
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/forms.scss
@@ -0,0 +1,137 @@
+.simple_form {
+    .fields-row {
+        padding-top: 8px;
+        margin: 0 -8px 28px;
+    
+        &__column { padding: 0 8px }
+    }
+
+    .fields-group {
+        padding: 16px;
+        margin-bottom: 0;
+    }
+
+    .input {
+        margin-bottom: 16px;
+
+        &.with_label .label_input>label,
+        &.with_block_label>label,
+        &.with_floating_label .label_input>label { color: $ui-text-color }
+
+        &.with_block_label .hint { margin-bottom: 16px }
+
+        &.boolean {
+            .recommended { margin: 0 8px }
+
+            .label_input>label { padding-top: 3px }
+        }
+
+        &.radio_buttons .radio {
+            margin-bottom: 16px;
+
+            label {
+                margin-bottom: 0;
+                color: $ui-text-color;
+            }
+        }
+    }
+
+    .label_input__wrapper {
+        border-radius: $card-radius;
+
+        &:hover { background: $dropdown-field-bg-hover-color }
+
+        &:active,
+        &:focus { background: $dropdown-field-bg-active-color }
+    }
+
+    .card { margin-bottom: 16px }
+
+    .row .input { padding: 0 4px }
+
+    .hint {
+        color: $ui-text-color;
+
+        code {
+            border-radius: 2px;
+            background: $contained-chip-color;
+            color: $ui-text-color;
+        }
+    }
+
+    .check_boxes .checkbox label {
+        color: $primary-text-color;
+        padding-top: 8px;
+    }
+
+    p.hint {
+        padding: 16px;
+        margin-bottom: 0;
+        color: $ui-text-color;
+    }
+
+    select {
+        color: $ui-text-color;
+        background-color: $dropdown-field-bg-color;
+        border: none;
+        border-radius: $menu-radius $menu-radius 0 0;
+        padding-left: 16px;
+        padding-right: 40px;
+        height: 40px;
+
+        option { background-color: $menu-bg-color }
+
+        &:hover { background-color: $dropdown-field-bg-hover-color }
+
+        &:active,
+        &:focus { background-color: $dropdown-field-bg-active-color }
+    }
+
+    h4 { margin-bottom: 0 !important }
+
+    input[type=email],
+    input[type=number],
+    input[type=password],
+    input[type=text],
+    input[type=url],
+    textarea {
+        @include text-area-border($other-text-area-border);
+        color: $text-field-color;
+        background: $text-field-bg-color;
+        padding: 16px;
+
+        &:active,
+        &:focus { background: $text-field-bg-color }
+
+        &::placeholder { color: $tips-text-color }
+    }
+}
+
+.flash-message {
+    @include shadow-1dp;
+    background: $card-bg-color;
+    color: $ui-text-color;
+    border-radius: $card-radius;
+    padding: 16px;
+    margin: 0 16px 32px;
+
+    a {
+        color: $link-text-color;
+
+        &:hover { color: $link-text-color }
+    }
+
+    &.translation-prompt { color: $ui-text-color }
+}
+
+.input-copy {
+    background: $bg-color;
+    padding-right: 8px;
+    border: 0;
+}
+
+input {
+    &#account_header.file.optional,
+    &#account_avatar.file.optional,
+    &#import_data.file.optional { color: $ui-text-color }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/material-icons.scss b/app/javascript/styles/mastodon-material/theme/material-icons.scss
index 4599453d2..28e4b5cdd 100644
--- a/app/javascript/styles/mastodon-material/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/material-icons.scss
@@ -7,21 +7,13 @@
 }
 
 .fa {
-    &.fa-bars,
-    &.fa-navicon,
-    &.fa-reorder,
+    &.fa-bars, &.fa-navicon, &.fa-reorder,
     &.fa-globe,
-    &.fa-cog,
-    &.fa-cogs,
-    &.fa-gears,
+    &.fa-cog, &.fa-cogs, &.fa-gears,
     &.fa-sign-out,
     &.fa-search,
-    &.fa-times,
-    &.fa-times-circle,
-    &.fa-close,
-    &.fa-remove,
-    &.fa-chevron-down,
-    &.fa-ellipsis-v,
+    &.fa-times, &.fa-times-circle, &.fa-close, &.fa-remove,
+    &.fa-chevron-down, &.fa-ellipsis-v,
     &.fa-paperclip,
     &.fa-tasks,
     &.fa-plus,
@@ -33,6 +25,7 @@
     &.fa-sliders,
     &.fa-chevron-left,
     &.fa-chevron-right,
+    &.fa-arrow-right,
     &.fa-reply,
     &.fa-reply-all,
     &.fa-share-alt,
@@ -45,10 +38,8 @@
     &.fa-users,
     &.fa-file-text,
     &.fa-user-plus,
-    &.fa-address-book,
-    &.fa-address-book-o,
-    &.fa-list,
-    &.fa-list-ul,
+    &.fa-address-book, &.fa-address-book-o,
+    &.fa-list, &.fa-list-ul,
     &.fa-eye,
     &.fa-eye-slash,
     &.fa-pencil,
@@ -72,7 +63,14 @@
     &.fa-angle-right,
     &.fa-thumb-tack,
     &.fa-hashtag,
-    &.fa-expand {
+    &.fa-expand,
+    &.fa-refresh,
+    &.fa-user,
+    &.fa-desktop,
+    &.fa-exchange,
+    &.fa-cloud-upload,
+    &.fa-cloud-download,
+    &.fa-mobile-phone, &.fa-mobile {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -105,6 +103,7 @@
     &.fa-sliders::before { content: "tune" }
     &.fa-chevron-left::before { content: "arrow_back" }
     &.fa-chevron-right::before { content: "arrow_forward" }
+    &.fa-arrow-right::before { content: "arrow_forward" }
     &.fa-reply::before { content: $reply-icon }
     &.fa-reply-all::before { content: "reply_all" }
     &.fa-share-alt::before { content: "share" }
@@ -117,10 +116,8 @@
     &.fa-users::before { content: "people" }
     &.fa-file-text::before { content: "web" }
     &.fa-user-plus::before { content: "person_add" }
-    &.fa-address-book::before { content: "explore" }
-    &.fa-address-book-o::before { content: "explore" }
-    &.fa-list::before { content: "list" }
-    &.fa-list-ul::before { content: "list" }
+    &.fa-address-book::before, &.fa-address-book-o::before { content: "explore" }
+    &.fa-list::before, &.fa-list-ul::before { content: "list" }
     &.fa-eye::before { content: "visibility" }
     &.fa-eye-slash::before { content : "visibility_off" }
     &.fa-pencil::before { content: "create" }
@@ -145,6 +142,13 @@
     &.fa-thumb-tack::before { content: "push_pin" }
     &.fa-hashtag::before { content: "tag" }
     &.fa-expand::before { content: "open_in_full" }
+    &.fa-refresh::before { content: "refresh" }
+    &.fa-user::before { content: "person" }
+    &.fa-desktop::before { content: "web_asset" }
+    &.fa-exchange::before { content: "sync_alt" }
+    &.fa-cloud-upload::before { content: "cloud_upload" }
+    &.fa-cloud-download::before { content: "cloud_download" }
+    &.fa-mobile-phone::before, &.fa-mobile::before { content: "smartphone" }
 }
 
 // bookmark icon
@@ -177,14 +181,14 @@ button.icon-button i.fa-retweet {
     height: 20px;
     width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 .media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
 
 button.icon-button i.fa-retweet:hover,
 button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
@@ -194,7 +198,10 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
 }
 
 // dropdown icon
-.compose-form__poll-wrapper select { background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>') no-repeat right 8px center/auto 16px}
+.compose-form__poll-wrapper select,
+.simple_form select {
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#{svg-color($icon-color)}" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 10l5 5 5-5z"/></svg>');
+}
 
 // icon in tab settings
 .text-btn.column-header__setting-btn {
@@ -258,9 +265,23 @@ button.icon-button.disabled:hover i.fa-retweet  /* v3.3.0 or above */ {
     vertical-align: text-bottom;
 }
 
+// Icons in lists or tables
+tbody tr td span .fa {
+    color: $icon-color;
+    vertical-align: bottom;
+}
+a.table-action-link i.fa,
+button.table-action-link i.fa {
+    font-size: 16px;
+    vertical-align: bottom;
+}
+
 // status scope
 .status__visibility-icon .fa,
 .account__header__tabs__name .fa {
     font-size: 16px;
     vertical-align: text-bottom;
-}
\ No newline at end of file
+}
+
+// sidebar icon in settings
+.admin-wrapper .sidebar ul a i.fa { vertical-align: text-bottom }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
index 53635cee4..ccc145908 100644
--- a/app/javascript/styles/mastodon-material/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -112,4 +112,19 @@
 
         &.active { border-bottom-color: $tab-indicator-active-color }
     }
+}
+
+@media screen and (max-width: 600px) {
+    .admin-wrapper {
+        .sidebar {
+            ul {
+                background: $card-bg-color;
+                
+                a,
+                ul a { border-bottom: none }
+            }
+        }
+
+        .sidebar-wrapper { @include shadow-4dp }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
index 1c2408bce..00b587298 100644
--- a/app/javascript/styles/mastodon-material/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -44,17 +44,11 @@
         }
 
         &__read-more-button {
-            font-size: 14px;
-            color: $text-button-color;
-            border-radius: $button-radius;
+            @include button-type($button-on-status);
             padding: 4px 6px;
+            margin: 4px;
 
-            &:hover {
-                background: $text-button-hover-color;
-                text-decoration: none;
-            }
-
-            &:focus { background: $text-button-focus-color }
+            &:hover { text-decoration: none }
         }
     }
 
@@ -274,4 +268,4 @@ a.status-card {
     }
 }
 
-.entry.entry-center { border-bottom: 1px solid $border-color }
\ No newline at end of file
+.entry.h-cite.p-comment.entry-successor { border-top: 1px solid $border-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/tables.scss b/app/javascript/styles/mastodon-material/theme/tables.scss
new file mode 100644
index 000000000..3e39d086b
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/theme/tables.scss
@@ -0,0 +1,83 @@
+.batch-table {
+    border: 1px solid $border-color;
+    border-radius: 4px;
+
+    &__toolbar {
+        border: none;
+        border-bottom: 1px solid $border-color;
+        background: $list-bg-color;
+        border-radius: 4px 4px 0 0;
+
+        &__actions { padding-right: 16px }
+    }
+
+    &__row {
+        border: none;
+        border-bottom: 1px solid $border-color;
+        background: $list-bg-color;
+
+        &:nth-child(2n) {
+            background: $list-bg-color;
+
+            &:hover { background: $list-bg-hover-color }
+        }
+
+        &:last-child {
+            border-bottom: none;
+            border-radius: 0 0 4px 4px;
+        }
+
+        &:hover { background: $list-bg-hover-color }
+    }
+}
+
+a.table-action-link,
+button.table-action-link {
+    padding: 4px 8px;
+    margin-right: 0;
+    color: $text-button-color;
+    border-radius: $button-radius;
+
+    i.fa { margin-right: 8px }
+
+    &:hover {
+        color: $text-button-color;
+        background: $text-button-hover-color;
+    }
+
+    &:first-child { padding-left: 8px }
+}
+
+.table-wrapper {
+    margin-bottom: 24px;
+    border-radius: 2px;
+}
+
+.table {
+    border: 1px solid $border-color;
+
+    td,
+    th {
+        background: $list-bg-color;
+        border-top: 1px solid $border-color;
+    }
+
+    &>thead {
+        color: $ui-text-color;
+
+        &>tr>th { border-bottom: 1px solid $border-color }
+    }
+
+    &>tbody {
+        color: $ui-text-color;
+
+        &>tr {
+            &>td { vertical-align: middle }
+            
+            &:nth-child(odd) {
+                &>td,
+                &>th { background: transparent }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/theme.scss b/app/javascript/styles/mastodon-material/theme/theme.scss
index 34c523277..a9421cd43 100644
--- a/app/javascript/styles/mastodon-material/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material/theme/theme.scss
@@ -3,4 +3,4 @@
 * Copyright (C) 2021 Rintan, Genbu Project
 */
 
-@import 'about', 'account', 'basics', 'button', 'columns', 'components', 'containers', 'control', 'emoji-picker', 'icons', 'media', 'modal', 'responsive', 'statuses', 'variables', 'widgets';
\ No newline at end of file
+@import 'about', 'account', 'admin', 'basics', 'button', 'columns', 'components', 'containers', 'control', 'emoji-picker', 'icons', 'forms', 'media', 'modal', 'responsive', 'statuses', 'tables', 'variables', 'widgets';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/widgets.scss b/app/javascript/styles/mastodon-material/theme/widgets.scss
index 9090ea45f..e8841f9f8 100644
--- a/app/javascript/styles/mastodon-material/theme/widgets.scss
+++ b/app/javascript/styles/mastodon-material/theme/widgets.scss
@@ -90,16 +90,36 @@
     a { color: $link-text-color }
 
     li, p { color: $ui-text-color }
+
+    strong { color: $primary-text-color }
+
+    table {
+        border-radius: 4px;
+        border: 1px solid $border-color;
+
+        thead tr,
+        tbody tr {
+            color: $ui-text-color;
+            border-bottom: 1px solid $border-color;
+        } 
+    }
 }
 
 .table-of-contents {
     background: $bg-color;
     border-radius: 0;
 
-    li a {
-        padding: 16px;
-        color: $ui-text-color;
-        border-bottom: 1px solid $border-color;
+    li {
+        ul {
+            padding-left: 16px;
+            border-bottom: 1px solid $border-color;
+        }
+
+        a {
+            padding: 16px;
+            color: $ui-text-color;
+            border-bottom: 1px solid $border-color;
+        }
     }
 }
 
@@ -120,4 +140,17 @@
 .page-header {
     @include shadow-4dp;
     border-radius: $card-radius;
+}
+
+.accounts-table {
+    tbody td { padding: 16px 8px }
+
+    .fa.active,
+    .fa.active.passive { color: $icon-color }
+
+    &__count {
+        color: $ui-text-color;
+    
+        small { color: $secondary-text-color }
+    }
 }
\ No newline at end of file

From dd0680278612ae4c48ca71d231292133581eaf30 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Tue, 30 Mar 2021 14:15:07 +0900
Subject: [PATCH 084/200] update Material theme

---
 .../profiles/y-zu-dark/color.scss             |  2 +
 .../profiles/y-zu-light/color.scss            |  4 ++
 .../styles/mastodon-material/theme/about.scss | 33 ++++++++++++++++
 .../mastodon-material/theme/basics.scss       |  3 +-
 .../mastodon-material/theme/button.scss       | 11 +++++-
 .../mastodon-material/theme/columns.scss      |  9 ++++-
 .../mastodon-material/theme/components.scss   | 14 +++++++
 .../mastodon-material/theme/containers.scss   | 23 ++++++++++-
 .../styles/mastodon-material/theme/forms.scss | 39 ++++++++++++++++---
 .../theme/material-icons.scss                 |  4 +-
 .../mastodon-material/theme/responsive.scss   | 10 +++++
 .../mastodon-material/theme/widgets.scss      |  7 ++++
 12 files changed, 148 insertions(+), 11 deletions(-)

diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
index 687c8ed00..b273c0652 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
@@ -4,6 +4,8 @@ $primary-color: #7e5f66;
 
 $section-text-color: lighten($primary-color, 10%);
 
+$unread-bg-color: transparentize($primary-color, 0.8);
+
 $icon-color: #d2d2d2;
 $icon-hover-color: #ffffff;
 $top-bar-icon-color: $icon-color;
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
index 910560fe9..63e171c06 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -4,6 +4,8 @@ $primary-color: #7e5f66;
 
 $section-text-color: $primary-color;
 
+$unread-bg-color: transparentize($primary-color, 0.8);
+
 $icon-color: #92787d;
 $icon-hover-color: darken($icon-color, 10%);
 $top-bar-icon-color: $icon-color;
@@ -17,6 +19,8 @@ $control-border-hover-color: transparentize($control-border-active-color, 0.8);
 
 $icon-button-color: $icon-color;
 $icon-button-hover-color: $icon-hover-color;
+$icon-button-active-color: lighten($primary-color, 20%);
+$icon-button-active-hover-color: lighten($icon-button-active-color, 10%);
 $contained-button-color: $primary-color;
 $contained-button-hover-color: lighten($contained-button-color, 10%);
 $outlined-button-color: $contained-button-color;
diff --git a/app/javascript/styles/mastodon-material/theme/about.scss b/app/javascript/styles/mastodon-material/theme/about.scss
index 2639ed357..ea78fde16 100644
--- a/app/javascript/styles/mastodon-material/theme/about.scss
+++ b/app/javascript/styles/mastodon-material/theme/about.scss
@@ -14,4 +14,37 @@
     }
 }
 
+.landing {
+    .simple_form p.lead {
+        color: $ui-text-color;
+        padding: 16px;
+        margin-bottom: 0;
+    }
+
+    .directory { margin-top: 16px }
+
+    .hero-widget {
+        .account { padding: 16px 0 }
+
+        h4 { color: $ui-text-color }
+
+        &__footer {
+            background: $card-bg-color;
+            padding: 16px;
+            border-radius: 0 0 $card-radius $card-radius;
+        }
+
+        &__counter {
+            color: $primary-text-color;
+            padding: 8px;
+
+            span { color: $ui-text-color }
+        }
+    }
+
+    &__grid { grid-gap: 16px }
+
+    &__brand svg { fill: $ui-text-color }
+}
+
 .information-board__section span:last-child { color: $ui-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/basics.scss b/app/javascript/styles/mastodon-material/theme/basics.scss
index 79d093374..27adf1e86 100644
--- a/app/javascript/styles/mastodon-material/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material/theme/basics.scss
@@ -1,6 +1,7 @@
 body,
 body.embed,
-body.admin { background: $bg-color }
+body.admin,
+body.lighter { background: $bg-color }
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/mastodon-material/theme/button.scss b/app/javascript/styles/mastodon-material/theme/button.scss
index 0fee5ab06..fcb59dbbe 100644
--- a/app/javascript/styles/mastodon-material/theme/button.scss
+++ b/app/javascript/styles/mastodon-material/theme/button.scss
@@ -49,6 +49,9 @@
         margin-left: 8px;
     }
 
+    &:active,
+    &:focus { color: $icon-button-active-color }
+
     &:focus { background-color: transparent }
 
     &:hover {
@@ -137,8 +140,8 @@ label.icon-button {
 }
 
 .simple_form {
-    .block-button, .block-button:last-child
-    .button, .button:last-child
+    .block-button, .block-button:last-child,
+    .button, .button:last-child,
     button, button:last-child {
         display: inline-block;
         border-radius: $button-radius;
@@ -149,7 +152,11 @@ label.icon-button {
         padding: 10px 16px;
         margin-left: auto;
         font-size: 14px;
+        line-height: 15px;
 
         &:hover { background: $contained-button-hover-color }
+
+        &:disabled,
+        &:disabled:hover { background-color: $disabled-button-color }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/columns.scss b/app/javascript/styles/mastodon-material/theme/columns.scss
index 5313038db..c275d29e6 100644
--- a/app/javascript/styles/mastodon-material/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material/theme/columns.scss
@@ -203,7 +203,12 @@
     padding: 16px 0 16px 16px;
     background: $card-bg-color;
 
-    .icon-button { margin: 0 16px }
+    .icon-button {
+        width: 36px !important;
+        height: 36px !important;
+        padding: 8px;
+        margin: 0 16px;
+    }
 }
 
 .columns-area {
@@ -483,6 +488,8 @@
         color: $secondary-text-color;
         margin: 0 16px 0 70px;
         font-size: 16px;
+
+        .fa { color: $icon-button-color }
     }
 
     &__display-name:hover { color: inherit }
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index 24909122a..4e3a69556 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -4,6 +4,8 @@
     &__overlay { background-color: rgba(0,0,0,.7) !important }
 }
 
+.modal-layout { background-color: $bg-color }
+
 .drawer {
     &__header {
         @include shadow-4dp;
@@ -619,6 +621,18 @@
     }
 }
 
+.domain {
+    padding: 16px;
+    border-bottom: 1px solid $border-color;
+
+    .domain__domain-name { color: $primary-text-color }
+
+    &__buttons .icon-button {
+        @include icon-button;
+        padding: 8px;
+    }
+}
+
 .upload-progress {
     color: $ui-text-color;
     
diff --git a/app/javascript/styles/mastodon-material/theme/containers.scss b/app/javascript/styles/mastodon-material/theme/containers.scss
index c4fa3aaea..6891adb1e 100644
--- a/app/javascript/styles/mastodon-material/theme/containers.scss
+++ b/app/javascript/styles/mastodon-material/theme/containers.scss
@@ -8,7 +8,9 @@
         .brand {
             svg { fill: $top-bar-text-color }
 
-            &:hover { background: $tab-indicator-bg-hover-color }
+            &:hover,
+            &:focus,
+            &:active { background: $tab-indicator-bg-hover-color }
         }
 
         .nav-link,
@@ -123,6 +125,21 @@
             }
         }
 
+        &__extra {
+            .public-account-bio .account__header__fields { border-top: 1px solid $border-color }
+
+            &__links {
+                color: $ui-text-color;
+
+                a {
+                    color: $ui-text-color;
+                    padding: 16px;
+
+                    strong { color: $primary-text-color }
+                }
+            }
+        }
+
         &--no-bar .public-account-header {
             &__image,
             &__image img { border-radius: $card-radius }
@@ -161,4 +178,8 @@
     .grid { grid-gap: 16px }
 }
 
+.brand__tagline { color: $ui-text-color }
+
+.logo-container h1 svg { fill: $ui-text-color }
+
 .grid-4 { grid-gap: 16px }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/forms.scss b/app/javascript/styles/mastodon-material/theme/forms.scss
index af55dcdf9..e5e535d8c 100644
--- a/app/javascript/styles/mastodon-material/theme/forms.scss
+++ b/app/javascript/styles/mastodon-material/theme/forms.scss
@@ -36,13 +36,22 @@
         }
     }
 
-    .label_input__wrapper {
-        border-radius: $card-radius;
+    .label_input {
+        &__wrapper {
+            border-radius: $card-radius;
+    
+            &:hover { background: $dropdown-field-bg-hover-color }
+    
+            &:active,
+            &:focus { background: $dropdown-field-bg-active-color }
+        }
 
-        &:hover { background: $dropdown-field-bg-hover-color }
+        &__append {
+            padding: 16px;
+            color: $ui-text-color;
 
-        &:active,
-        &:focus { background: $dropdown-field-bg-active-color }
+            &::after { background-image: none }
+        }
     }
 
     .card { margin-bottom: 16px }
@@ -59,6 +68,8 @@
         }
     }
 
+    .actions { padding: 16px }
+
     .check_boxes .checkbox label {
         color: $primary-text-color;
         padding-top: 8px;
@@ -68,6 +79,8 @@
         padding: 16px;
         margin-bottom: 0;
         color: $ui-text-color;
+
+        &.subtle-hint { margin-top: 16px }
     }
 
     select {
@@ -105,6 +118,14 @@
 
         &::placeholder { color: $tips-text-color }
     }
+
+    input[type=email],
+    input[type=number],
+    input[type=password],
+    input[type=text] {
+        &:focus:invalid:not(:placeholder-shown),
+        &:required:invalid:not(:placeholder-shown) { border-color: $error-color }
+    }
 }
 
 .flash-message {
@@ -124,6 +145,14 @@
     &.translation-prompt { color: $ui-text-color }
 }
 
+.form-footer a { color: $ui-text-color }
+
+.follow-prompt,
+.oauth-prompt {
+    margin-bottom: 32px;
+    color: $ui-text-color;
+}
+
 .input-copy {
     background: $bg-color;
     padding-right: 8px;
diff --git a/app/javascript/styles/mastodon-material/theme/material-icons.scss b/app/javascript/styles/mastodon-material/theme/material-icons.scss
index 28e4b5cdd..3875d349b 100644
--- a/app/javascript/styles/mastodon-material/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/material-icons.scss
@@ -70,7 +70,8 @@
     &.fa-exchange,
     &.fa-cloud-upload,
     &.fa-cloud-download,
-    &.fa-mobile-phone, &.fa-mobile {
+    &.fa-mobile-phone, &.fa-mobile,
+    &.fa-tablet {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -149,6 +150,7 @@
     &.fa-cloud-upload::before { content: "cloud_upload" }
     &.fa-cloud-download::before { content: "cloud_download" }
     &.fa-mobile-phone::before, &.fa-mobile::before { content: "smartphone" }
+    &.fa-tablet::before { content: "tablet" }
 }
 
 // bookmark icon
diff --git a/app/javascript/styles/mastodon-material/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
index ccc145908..87cb693f9 100644
--- a/app/javascript/styles/mastodon-material/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -127,4 +127,14 @@
 
         .sidebar-wrapper { @include shadow-4dp }
     }
+
+    .public-layout .public-account-header {
+        &__bar { background: $card-bg-color }
+
+        &__tabs__name h1 {
+            color: $primary-text-color;
+
+            small { color: $secondary-text-color }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/widgets.scss b/app/javascript/styles/mastodon-material/theme/widgets.scss
index e8841f9f8..050e9b127 100644
--- a/app/javascript/styles/mastodon-material/theme/widgets.scss
+++ b/app/javascript/styles/mastodon-material/theme/widgets.scss
@@ -14,6 +14,8 @@
         padding: 16px;
         color: $primary-text-color;
         border-radius: 0 0 $card-radius $card-radius;
+
+        a { color: $link-text-color }
     }
 }
 
@@ -153,4 +155,9 @@
     
         small { color: $secondary-text-color }
     }
+}
+
+.statuses-grid .detailed-status {
+    @include shadow-1dp;
+    border-radius: $card-radius;
 }
\ No newline at end of file

From 6b590d4a4c95977965c19b685654c0b2d2d2ae9a Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Tue, 30 Mar 2021 16:13:20 +0900
Subject: [PATCH 085/200] fix scroll-bar color

---
 .../styles/mastodon-material/profiles/y-zu-light/color.scss   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
index 63e171c06..7c4349512 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -39,6 +39,10 @@ $border-color: lighten($icon-color, 30%);
 $border-hover-color: darken($border-color, 30%);
 $border-active-color: $primary-color;
 
+$scroll-bar-thumb-color: lighten($icon-color, 30%);
+$scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
+$scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
+
 $tab-indicator-color: $top-bar-icon-color;
 $tab-indicator-active-color: $top-bar-icon-color;
 $text-tab-indicator-color: lighten($top-bar-icon-color, 10%);

From c146a5e2aa4ab35e66fe1924fc6ccc6226aa158e Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Thu, 22 Apr 2021 12:06:06 +0900
Subject: [PATCH 086/200] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=83=93=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico | Bin 9086 -> 9662 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc43c2044b5ab5129202e993aa2cf70af..c18e3bbde9657297c72a71e223719c1cf800f271 100644
GIT binary patch
literal 9662
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
b`q@Z3QHU<uDMIwe!<JyYJA}A(zYzZdQ;k+P

literal 9086
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


From 8330b9d572d326df33fe99d88b1d2a5d874db5e5 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Thu, 22 Apr 2021 12:56:02 +0900
Subject: [PATCH 087/200] =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E7=AD=89=E5=A4=89=E6=9B=B4=EF=BC=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/images/logo.svg     |  18 +++++++++++++++++-
 app/javascript/images/logo_alt.svg |  17 ++++++++++++++++-
 public/android-chrome-192x192.png  | Bin 13534 -> 8518 bytes
 public/apple-touch-icon.png        | Bin 4880 -> 3559 bytes
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
index 034a9c221..82a6025a7 100644
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@@ -1 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 216.4 232" style="enable-background:new 0 0 216.4 232;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#92787D;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M211.8,139.1c-3.2,16.4-28.5,34.3-57.6,37.7c-15.2,1.8-30.1,3.5-46,2.7c-26-1.2-46.6-6.2-46.6-6.2
+	c0,2.5,0.2,4.9,0.5,7.2c3.4,25.7,25.5,27.2,46.4,27.9c21.1,0.7,39.9-5.2,39.9-5.2l0.9,19.1c0,0-14.8,7.9-41.1,9.4
+	c-14.5,0.8-32.5-0.4-53.5-5.9c-45.5-12-53.3-60.6-54.5-109.8c-0.4-14.6-0.1-28.4-0.1-39.9c0-50.3,33-65.1,33-65.1
+	C49.7,3.5,78.2,0.2,107.9,0h0.7c29.7,0.2,58.2,3.5,74.8,11.1c0,0,33,14.8,33,65.1C216.4,76.2,216.8,113.3,211.8,139.1"/>
+<path class="st1" d="M177.5,80.1V141h-24.1V81.9c0-12.5-5.2-18.8-15.7-18.8c-11.6,0-17.4,7.5-17.4,22.4v32.4h-24V85.4
+	c0-14.8-5.8-22.4-17.4-22.4C68.3,63.1,63,69.4,63,81.9V141H38.9V80.1c0-12.5,3.2-22.4,9.5-29.7c6.6-7.3,15.2-11.1,25.8-11.1
+	c12.4,0,21.7,4.7,27.9,14.2l6,10.1l6-10.1c6.2-9.5,15.5-14.2,27.9-14.2c10.7,0,19.3,3.8,25.9,11.1C174.3,57.7,177.5,67.6,177.5,80.1
+	"/>
+</svg>
diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg
index 102d4c787..4c04c93b8 100644
--- a/app/javascript/images/logo_alt.svg
+++ b/app/javascript/images/logo_alt.svg
@@ -1 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.41507 232.00976"><path d="M211.80683 139.0875c-3.1825 16.36625-28.4925 34.2775-57.5625 37.74875-15.16 1.80875-30.0825 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.3925 27.9425 21.115.7225 39.91625-5.20625 39.91625-5.20625l.86875 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23183 213.82 1.40558 165.31125.20808 116.09125c-.36375-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67058 3.45375 78.20308.2425 107.86433 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.97625 14.7525 32.97625 65.0825 0 0 .4125 37.13375-4.6 62.915" fill="#3088d4"/><path d="M65.68743 96.45938c0 9.01375-7.3075 16.32125-16.3225 16.32125-9.01375 0-16.32-7.3075-16.32-16.32125 0-9.01375 7.30625-16.3225 16.32-16.3225 9.015 0 16.3225 7.30875 16.3225 16.3225M124.52893 96.45938c0 9.01375-7.30875 16.32125-16.3225 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.3225 7.30875 16.3225 16.3225M183.36933 96.45938c0 9.01375-7.3075 16.32125-16.32125 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.32125 7.30875 16.32125 16.3225" fill="#fff"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 216.4 232" style="enable-background:new 0 0 216.4 232;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#92787D;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M211.8,139.1c-3.2,16.4-28.5,34.3-57.6,37.7c-15.2,1.8-30.1,3.5-46,2.7c-26-1.2-46.6-6.2-46.6-6.2
+	c0,2.5,0.2,4.9,0.5,7.2c3.4,25.7,25.5,27.2,46.4,27.9c21.1,0.7,39.9-5.2,39.9-5.2l0.9,19.1c0,0-14.8,7.9-41.1,9.4
+	c-14.5,0.8-32.5-0.4-53.5-5.9c-45.5-12-53.3-60.6-54.5-109.8c-0.4-14.6-0.1-28.4-0.1-39.9c0-50.3,33-65.1,33-65.1
+	C49.7,3.5,78.2,0.2,107.9,0h0.7c29.7,0.2,58.2,3.5,74.8,11.1c0,0,33,14.8,33,65.1C216.4,76.2,216.8,113.3,211.8,139.1"/>
+<path class="st1" d="M65.7,96.5c0,9-7.3,16.3-16.3,16.3c-9,0-16.3-7.3-16.3-16.3s7.3-16.3,16.3-16.3C58.4,80.1,65.7,87.4,65.7,96.5
+	 M124.5,96.5c0,9-7.3,16.3-16.3,16.3s-16.3-7.3-16.3-16.3s7.3-16.3,16.3-16.3S124.5,87.4,124.5,96.5 M183.4,96.5
+	c0,9-7.3,16.3-16.3,16.3c-9,0-16.3-7.3-16.3-16.3S158,80.1,167,80.1C176.1,80.1,183.4,87.4,183.4,96.5"/>
+</svg>
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 7a99a19641acd1558c8416b16c16a814fd953491..1aa62f0c32f65f592404c291da90743459ae3c91 100644
GIT binary patch
literal 8518
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

literal 13534
zcmai5bx<5nus-h4!`<Pq;I2s^xNCsm8YICXK+xdsF2REZcXv<F5Zvz|1cDxZzyXin
z`~TIeo!Qx%+MVsKp6dPj>+WbR4Mkiq6&L^j;3_N0X+Mws|8-3C=d<>@BgXT9{$5p4
z4)FBfQP@+S`aFZ>s$}R60ALgU*HHjpb19xDF+7yj<uPDjY%*Nb7o=GY0DzE#vYfQ8
z_v&$vU6S>Z=hm&{&1TylBjcst*qyVG0d!0PRFvdxAb|-)m6_W?!E*IdCSH~%Jc7y?
zoBJgV!_*HVR>#D_;^+q9R_j=B%)CIObuvWWsf-N>X%9xFlJNq?qf_nobX9h>R!{oh
zZg$;FMrLNGPfS!#R%RL+=SP`wUhGcX2kfo8&q&<RSTHkD{!~&BNJ);f{=Y6)LS>ZA
z;rZr1>U7y|&P`4Zlb-2Ba!}OT31fd0Ryg}mN8~_)EYZyXR`>TMKMPw#x)z2}=1@%U
z*>EDg*=8~r-n(TsT~;%`p|Wz*fEO4N=HK7S@-b2zkqkW2Km!Ev{rWX(!t^VUi9u4I
zqq_GJkx1Xw%|rq{E--2>qdBE3t;SbXmMl(FQ<mn7u#5|y^#$RcI`Mg9n<t6-N-hNy
ztD9Kuye^J7{bB5{W!i_$iV1(QsTnWZvEZO9uY|&msuZO}DFbqv+{->Q?{3*9PJBYl
zwm9hoc|EOi-ZoS;1b$?{ZBmI|!eT@X2>OLzD2wYP<U#P67XR;*BnRCnXpgxN7HsUS
z@!t2}Pc6sWoNMTH^$>enm@d)p#zHQ%iB>5Y2#)%|$BR=?jpT*Cq`<}RU!+is058kY
z<ZV`N)c_f=N_ap}jJ~wi86g5CZZTP%<v=XU*i9^}i|W{V9ajU$c5>|QeWA&eeJ_`}
zH*bOV5fHO*EKl?06&8ve`*H$^^|=4DDIf@MiXQ!|<n3;vhJ>UL8UlLCP3ubX7;Y0C
z2>zSarWc~m!2}OIc*h<bIcn?+eJzdR+Y({?n2W*zU=?a{^xWug@w1dN0z0qDb7Tf<
z>wRx|%%%To{&=p4pL=lAE7#}Zy%*Sd#5O>mn(|2LkY{9UwA+#n3{e3v9yp#U!pG_Y
zy&Z1a>7jMT4va~VeLlGgEjidC_?}b~i#=djd;7!IQ+7BLNI&Rj_k*<REUQJcv4K&z
zJ_oU2D5_KUGR;6=arI+u1Cl=m03e+yUKk<0p2#PWdooZyOFn&QA<qkD@5gxaI<TvB
zek{tTti2O`t7_hbt!R%QF+ev^u<wma^%!p(R!F2}X-8Ugs>;4!kQlGoV`Tw`E-wzr
zKxNalvC>nPmdKBtIybwo=m!dDa+M99q=(F@u`3nmVmZ<3`Q5dDJi(H;x`mS4f#P>7
zIgu29BMltV7RRrow}<IguLmX5DD6=LzrjVPQO!C+R8~SQFEnXH-4(aNN$M3lj+0OO
z>EnDwCw2{8IZ*oM|9uHEuf)Ir6i3;_b$d5V+E0{5W&ukVPb$oJ{)`&f2tUC>5PJu%
z*ANjl(+}SG>x!R7Zr=a9{WnYk-FVvl)T>+T-&gDG%7XE9E!#v5rN1=5Aq~)=dqfuw
zI`!eRMAWBzV&q5D8Xw1yMp!^GAX*{ti?Xd5CIm5x$7%lz1O;J(4|(;CEBPS$c#}k`
zY#ILq6A2&?3Zeh`r#lX+iT60#7amX;p7w$t4Um<U9k*yYN7D*^;zLea4)o1EJobPB
z?~NchgN!<b#O}d^1f;ZIeUd2Hki`apgG<XF;B|dtVWVLZJx%45kjwF}9_@_i?bGxF
zeSuI-XPRwui)JhawNE@rd$+;it}A-Y;TWwqur2n0r@{-rR<I<#H_ae~Ye-8I{A=w^
z&{;Glqw|FW>eJnaxZhtR(E@LpRlk|F+4*f^QpfGmb9+aEo(SUZl3<z|!=LdeFEAf1
z`}?Rb{31%X-@D>Fp$780A7DOO!}i|XzGXt(NA~G;6wdMsT{ShK4t4jw_~@O?KegxZ
z@_H4O;VVWM+iGB(xN(A+?BQuSo>dz?>{MU3FLc0|i@LuH;+1XmXo+KyRiu828+u^w
z0s2!*<oYh{#Wq_=6)IJ12qB7{s+9795dmaAPTS&}$<4vN3@8m0`il=0)9eRa1~e2z
zGApDZmlPru^;lOXWL#m-U;U@`IHZpk4T{=3s}YaTx)Qa82%!htengiUf(tY4DOo!X
zW^qbGXnt^D0_+qSov;alx;gptQ}}SK9fKRv!bo)6217701c+)`Iv0o8G0@v$sLEhp
z0)7~9g?|r2Pr;nXA60o-+1X&U`2Az3$`6Axp=R54j&Qi_sJ;A92CAyuco8Zi3xlIU
zx>b3p7)}gzdhW&_xgr`Nr0|Xb7G<z4>S_>XmKrBbUNhf`%Cj8Sw80h4;r=R6DI;mj
z!DN1H8Gw(zwB81(VM{+@^Hkx&8!fC=wsde=rFZ=4&cTzLXXk80QI&bCu4P(_0*eJ#
zbvP#O&T0%kul2eCuGV*oNpc`px-3_<9apBzM|4MJSCWC0dA&IMzW#zjpd)Pn9S|Az
z!|4nNl8p0@6IJVKcltd#&^@T8VJYHZ`Qih^DOj!S-JkKOA4IA~7(QBzY#~kWa`B4x
ze+mH%EYLkXkBiisfB%Yji$`(cfTE{D6<bPx?ZDtn0yHtWJR6?^^YFZrg0zzj=m8}H
zTO<I1GT{0qSoy(BPtw~<;dA!rHagXv+7*%$iT(E+R+b!0{C^crq6;yvzdrRChhb_h
zP`6T%upI(01S)&^M5A!}-?I<<GiXO-l5vRnR744iij#0q*%=R}&*F^AMh0db#&UD^
zPlp!}bl}QwNr4A%=q8}|C*!c?lF)x~;b+ZKqZyvwp9v3hwDDF7r&`l~bPy@B(g5NV
z{X=scb__V|a(nd#10}m+_G&YVaFbf(b%yQW@QcN4SP@(QbSrYgCZ1_W<na;Y)4exM
zgZGzPt%RxI3-8e83{_NR)l)Z9vO9BvCW_0etii2L2ONEUkoYx{=y5yzUG+O0f!5`7
zcN#Hd4nT!PqJ9mxuZ}VW^J(seu79g1kf!M+b^;Z{mJTycPz|QL5B78On(0LNxnvKY
z`uh<E-fpY>v32_N&_oQ|3IW0s!uq~Zdd;*W5JPj`hqE}tQTN=+<3#Nrc*4yee=$6Z
z$MtxjBkE?^05puJxw_->;y~tT0Y(?G!&&kBU~InUUtE5`Sn0C|)TXIsa|#Vo;16DV
zZekONt2%DzYkeS}udx{J$llhVACYPV^{C;d2K<9#F#eWgaDktPGwKr{uf)%VdWdyX
zFg(&3MDj0QR3tKay>&!2$`W_05L%$5jQp`y20x1|<NrHOSPs$)d5x#Bz1Mq+NhhID
zPdEs-fbF3iYBGZBX-lzjK|AcxfpCdbL?ph3+)EKA%9u%wzh_pb`9n-?lwz1``A^Ql
zl7wi>2}n9yh!eIyJfGhm@rXqb52bIV$<7|s?A{aUekhFi138O<3<U*Ffa|&8AgvVm
zFIq!nPn(+1v2TKP`zP<uL{As8P2O{17~6cwjxfu?J{B|zg%IQQ4}5|elVXVFHGHU)
z!tvMfUw-dSUVSEzyi2g7X^e%|(n?2y0{h%l_}LIX5IAVgFr40R4~2%Vt#YC<*|Dwr
zA>RrC^ZQ*NvM_+Af<BzPe}mqJ{rL4+NM&(vV_Uh61fpPkNe|XdPre{?uAo)$_p@ge
zK2a886a;F)9fsQP3uF8Io`$2^XxVCW2FIQjvD6NH_J6r3m2PyvZ)yR``H<BTHfh9}
zm&Op??$wb&$IcI$fIqbE2048}+;p52V5G4TDn9Tr;pLm60sQsUvCy_s#k6DBTUg}D
zps5wgIOhemKGBvfA{ez%8e_9G9A$|Jp|~a3a*Tho8k5*E?pq>@2}S7Iuce%fqqur@
zm~6$f0AKtTDHB+0W6GbgIcreVgcf}HODXn`>xat7oAo?EAS0Mh3xVSO^{nl5e8)8a
z@$wBTZyhYUNz~1$15<=bKSM%y@G2!$F6?Jqxc|7!XoK6HBi(7=eSiOXa&0XFF^=8l
zdNK+Y-x_<*-*5l2I@5^Z*%Vufoc3#j$I2SLw>IY5cY<EeyZQa;-SM7VXYXzlN}L=v
zd57ik9)9zuk+lNQGICsoujxV*0E9-O)B9L720;BO&PVqCo-H@&ySlmIwk>kNk@ZHU
zMS2+FIVUMmg<*0cHZc6&-R(`LRK))4#O+~60iLx~Uf!LC4|UMpL(VMonnLL9uTg;G
zugxmK@!x68NuRm=AG5K=UZoFVoW2gj-w>5Zt9Rqs*)C4Z?brPBm-%-#4WO1ISb4bG
zrJc;ib&R>R#5Ty%QObv5CvQwpOvn}=4e8R?8uA3+&2;;FAkYl~P!ppt(JEO=D^bgV
znRSQ6_?E*g77eaA4YGN+kw}hwaX(yo--);WM@7Y1<BrY>?ajIabq@=i-pG+dHa%e2
zXpjX!n}7pNn@4Wq0e~8T?m%xtyp2@Huj3(s*XaNE{d0&4Me{^I{0|tf66C_XHvDkL
z$~7!)oJgI~2_Q+kA+On`wc+?fXjBSb3P7!M+&8W>V%m!q$9gY+Aue??;ZFg(GzJcQ
zI8n?cd6D%31cOGrbR?o{<6lE;QPAVCTqii8qJ4Kn8s=t$eaK&??S8dh`#2!Yp6)R7
z+a~g}-z~eo|42(sFkfRZ9J2+?GGN3M0x0ut-Ywi$pvsGTI@8UV84S-nL8;GVZ)R{k
zjs>!3pcp5TA(~%~Io8$iEK4!jnUyLL$PA~TzEd^=EAJX*5Qv7V&2_72UTUKtJR~vj
zqBIlk@^pztL90Nzctle@$(8n+a6n<c*h(2d7}jiAT9!0D1v{)GgP+ah59^zCqiqZ|
z(@>4-&uk7pU3cuA4W`SpDJPA`pRh`RinIYg=~VTE))QZ2z4jxZGe-Q|l8oN+Mhd5W
z5v+Gpe+j1dhJVf~jQe%d|0?WEZ{U?<?~PMfp9@-l5>#>FCU9<mq;VR`NF}=Dj~p-P
z3wuH?xc^uoWD^iZ+tmmeUL<d1cKUPP)NTTJTp%|a7M<bsd>8VIulKVvVIRC>uHD0(
zwAM*_)#v-AP}ur`OolYGMJb-edw;6F%kU<|ktpxCd1KBR^%}W7JT)k;AiMW2krHMW
zU(lJVMKN(`VAby%96lTb*6i(O+eW^^G-X`EUD1HmjM-3mzBlFEOAG>$wAWacHbi=#
zM-808b=;tW$5B!fv-9_3vwW@xDkufWRB~4vH#EDYh~_a!-r0ebN~KK+N`(;K^dxLg
z(hKkD>R%Q7%EC6pe|2!}G*{Zqsm6#U(Gn@3R*HI36FS?!^i?(w#diuKj8norXgcTY
znBL5MvJ>sz1{ZwVQl_EP3@*h^e*@4y8BLB+kK#w4Bi2Er?&+T?&X_1x{C4)tR7D9m
zbRc)V+vfhG!xNSsS??Y?5QGbHq{+`4;eGh&liS_?D(Pr5?hqQhG{bPo$!AH>@#Y;1
zw6KwZKpYi~@HK7#0Nyfih}Zr@>=T3xdY%$l@c7U-0CS_};$r*2^~uNE^-Tjml{?0Z
zGkUtdV4bBH^_?QzovIHm+g^QV9A#tL5Ke5%Jq!oXiWDYxLe5wnau<z+!*ZLRp|roD
z!;R(#CTc$UF^#sav$3B8UvOIu9A6#fj@!r>i;~sWG_Krw+s(liI;UwmXkUTJPFf;?
z&X5;8X#V8v2&o}?JZ$1*Ln~ug{|7S<{3rhm`jR{tYD_$*ra%Ea=yppZP5MCpLm4+n
zfk=j%oBxY=l@U;p(fb6<Nvc)e5ZS;rD18j@Qlf>3;Nz$h@uC!2KY6CO|6PTCk{2yz
zdPMW@JgYh7M6_=)zs<#4!d!Yg^~@0gcMjxkHg2S?yFt}lkUzgv>;<Vybl8!1so3xk
z>#<<KA03ed&Aqo3LS5o=Kt8HY?T^|a+(R?3l~BB!&`dG2R5-t*tZ%r8KT@FzLAaFs
zs!w@1Ou}1<YM;)lSQh=({lkdD0-q4LT<OBSkK;rE_Z1ge<DHP~n893AlHacLO@&t%
zEi2uFY$)P^HF2jVTzD1?N6_mPagJVmiuk{-0>MLoPHogf3)#<<U4=s18BoP}TpMu~
z{^XQs`p<P?=;ppB0*)*U)j|+morH0P?QnEpSgtX5^;**TiNk1RISdWGl_+Wc)~7wA
z|DOZhBebgxzQ;Nviv=R$DakuVkjM^U3NzVYsaZ2y%ewYcSWGP$T;PNOXq3M+L5;$;
zeD28T0!(>k`P;aov(JQne59z6R%y0&#-um~r89=*fUr7VwniFLx$(h4LAK9eQf5_S
z6Z!P-0vj`gKt@T4b1ier9E^jv%iZn96Yhs!<~oK_&Tijg06rV^#Gf(ege~NddQ;Il
zqzHfv^`T8$z0tSfHewke^-WTfGPy55Vd=E?Q}5BN`|*YQ;gx-jS@31pc{b(cb-v!P
zh)Cm7fSvK>6%8|CuU|!2sdiMfM~FdEznn;Tx9l%VfXxbj5P_N&ijtI=VG@CCa3BO+
z|87ZGD6Ya|KAYtq8k}6iEK#M%_#YeN?9Nn%f9O44IefN_u0IFAoIg9dl3g?*kVVMg
zO318dcPDm+cW2^*euLgDZIvED5a|pgoeo4Txf&Q1Y%aJ1%?iiwcEd@`rx;3h!?t2y
z(Jj%VRwzmtde1+cT1Nu++cF)#&7nK5m6ObW`;lU+S8MoYOCn?c736qX$ryF(<M)j6
z@x#~<d)+9=hU1quZzx91XE34#W|6Rp9gQ-7*U@YM5Y(@E8WmMTB@vImPqc<NofeFM
z6a^Zjh%4348-ap`*kdmoCwEB$_Wl_gRAnWoSSSPK$Rc)RlY%WLt+|o=&md0rCeDhB
z^ps9XnnF`vV%*l9tgI3IbffPKJ#S2m<G!m*y}cZ<CIyg`%Kw=otHoeguhkM%(?Z93
z)`-OcRyI#%o9tlWLsSJ>&nMl+aAf8Lm3$qLamD?sY$4?idw8Na-wNTQSoVZ50&e``
zY`||6W&r%!)rBe3+=W(T*{%XT?Y5(l^gfkSL>RN|V0Pb3i@(vX$tb@UknDHYSBaL?
z8B6&gMz#z`x08B1*i)NU#OXl2_uA88Mnzm4O{r`bcd7g$y1CNJTusHS_ifDY==8Z9
z*f%A+O&{@CuZ`s6F2IuG^q`+v=Ag&8)ZrtOIsi6Y9edNm5ShESWu;;abb0-CG*1V(
zs{%N%VkTcq*&<*fkeW3FZ`M0;1`qrSz$(*5Rl3BN6!g7%7}f~sJIPdr{KJV#&D1Bb
zk4Wobm-<dg{GW$5VZqqb@emd2L#;T9YOVG#S=&@-S;95gmGHrB$+0pJirM~Ud>~Yj
zE3NyJ`P6h=bf@YIdP;`++1WZX5M#Qw=L>=_+`jkHibp~S3>N*29yUE5T}{<0EydbN
z7{9~Zzh$p!TR8l%QK<s*YG7duhc8*X-C=se!;4xGYjW3VS!SqtWUDK%l^oC3Dk%rg
z<=SF-rC)b^c00>j6OLahV3Gn#@i3@rvJrfD*nZYoK(NcSA!51nBdn>k^}D+db?u*g
zuN=y^nd8~rgC3tR_`%X))x}8-fSS<W$!`Rqe%oK3(uCvmgU%+XIrv?+hsRqN(083G
z4t`4T201{S7f9W?&=e{9Q6&T!v9hL&p23(IN(qF9#+@%G6&_l@=NZJ`f3@JckMMfP
zp5+T5bR0}jsW;4*ll0P%4JzR8o<83w3(^wAvz{+|c={Sw>J;~Z88GK=sLX&V=!30e
zyqv_yXiXCyr~Z!oyJBAsrGDlELr!VDdA}vVlqcw=TncPplXK|Zz<ORrpgaDE9@ep9
z{R!u82*EMqnl|&fJWiynDuNmndDVwb`mt^v9j2E>)bl1u?jYcL8+6j(yVpwO%6#S0
zB-T+>Nb6{Q=Ziup_WgvAkM+G)<T6v7sF}{u!273EN@_tL)`QmRVrTT6h(5Qx?aac5
zPmG&k%lz=uw+*F1#mrH{0702I!I=U8+BA!h^J)E{2b{oTYylS@xwf{jgJibNZBNF6
zbt(OEzTiH0(jZ0LIECN++)LA_UQ<@fLF|>J|4Kd<bFs-|oOs<)L8i|WO|~Dlk$hQ{
za*giJn)(PPXa@tMKJU9SSy!zXu(Q*9U&2u2@B77LO664D5CZubjA)+OdS^JXsI`}N
zix&MtU;|#UHfQHeT4FFqKjveyP>5-Dn1NB1R1BV?a0f9Wxo-v+s-u&wQkhxv=NTsT
z927Ag9O4W=--?qGNHK(oJGN$f()g<;L~ViSvIgT|>B%q$%Rj4-=3QR#=4bdqJ(T`u
zuj#!Wu20;%zZ%dbXdMS`OVAcv@nPBEO8CWPa$`*zi@YWkBm(W}$KB}`Wl(lebp{%r
zSL>Z8f*t+wPEN`Rz9iQ4vqXo4xg5ZJ%oeo~yiJH?`iDHCR1Fs(Q)Ng?qy3DmD18FD
z9G%ZE4aX-J{dmU+3?s<R0=i~qK6|)76}E2~R7i<a4cdEuIdL@3|2=m^4fIT{aU0#|
zk8T(f?*DO~XpMac_{N4G)6pc4@y&f`qdMS1{&2tUDNF10&nW1WP{aVC*x96L0<qHK
zz(^VgDp!FO1ebNqC$52#!quT`=0k;*Il@wC6wFBRkU-6!_A6smqS*B%j=`Ozk9cqC
zhUJ3ZL-+pP7Vb66wxmMo4WD`_F$6}35qD9MeW??~*pe+Ba-Lt5KBIrX)eH6VLk((l
zfkyht;j+c3VG<F@NR6KyC&XDAq(DZdC4T%)L<CD0?aQ(oa^G)a23oy0!9Y}WjJwhx
z*R`Euvnd9*QArCiykBPDs7hz?q8e0uoNPc_-6bh;dIo)e&rY=7GiHX?SdX1C#vHt4
zmwu)_S`LMSP^x`UYPm8B(<)CvLPJ|4yLKT3RPBlGu_B@d_N)Wu_u!C^dkc>1B_&+J
z^k4S(dp`#^^Aj*@X<EyIkQ?8`<Cc{)cO1lQH~JwW68XWKgy}Ga#t$osKe74xy3uV6
z2~>pZ&R!Wl=piad0}cRzbq~43+Cg$;-Arh!bI&@`o1oIh6tb}+8W}QQB8b6tU$n(_
z4$E8Ii}pn!rhD(UUIN{FOY(6>9VI*^ase#M(PBmdnKlyb*K~Re7&>vL4G=m)isTAL
z)e45i^J$PhepO;5`65w&m&Qby|Ix~|Nh^XJC{vjb;9rb(WP7!?!74L%dbMG3&||))
z5kenzpv{vm6hn$`<q`(GsX_#grW?yIXP{wHjvy&%q2**7QSLs!{+>5;D7{l|*Z<_J
z2cQBXTW0tp6ooymgLHxMhpO^QstQx52X+MW=aUXtE;LqG6;lUep_=M<GR!G!7)sRw
zG&e=gLX8hy0Vp&dyM3+DGHimwD$lnXi`RgDhrn#B4O$N|W*y$H!5+HlgD-^L^0@n?
z0SuU`Hu2i>iMGKK1Sp*z?zkD+LAq15fk)_MR{+Ttxg?|Cg;l45(F(z>ALH)rm)O6J
zdhEKQK7Gbyfp;H*p||bbe`F2GAn!ljtZhFXYPrWw$mW^kd$SyLG*(hw204#LQS+rq
zeT#4O6sFw}wH-3LZ9%8>&BXY&ESJG2^meE(pNo-D4Y*}Y9eN>}p~WBOHer?spZ{{u
zu0*h~IMmZ2?)Id)ATFleeGIN=$B!uX{YswU?_DIls$yHkXr-D49Hec!9@R_2tYzWL
zPwD#1E+aLso{y?cw(~2?^vjD4`WP!LYsZe=8T{q}!9AD3Mw0LBsH>QPYHtF^;I^Cy
z?&NQk0&-mdi@#yTQnJB)(iJ`Z%<rS^&-=tbk<j}b($Gwt{JV;vG*pBf{@ADhpsxF|
zMQ$OIMVWpDm0D|>p%C)@b$)nFu1YHIb0DBy3$pAuB!p~w6Rru56JrGGaA-L(bjS1j
z(p#!U?Z+-Q5>Wmrw>tRT0*J<l#DxAjM_z=J^O}rRR5?)OWT6`36?%R^<k$nQ4$qs#
zRCP^3j`|#OM8VXmL_FNL22~&9ti2QhA9o7g;4d{WY&fRvOy!YP*TBc*d=3KRLkkFq
z(KqtPU6u3DnE>)z5TRmi<F2=lh@XPq+q*1c&R~Ib#f?m-=*#BUJU#8=hf75Xf}kuv
zagvJ9L`Y#YtrS<A6~zXDag0@`PuGLE$b!TN+}{bH?0kdM<;|}T%GB*5XBJkp_Zn}R
zfuWxjMLyCXrJBj>jb`D(iQ2MW$?GO&BfQAXrMF<f?%zV~+k>=C+{ZU2`R!Ci4NK_#
z@4dlEm(t$snAqV26T7oi7HvO%+Y>%rC+3d|*44<or2LM=S>Dewp|x+_&choSt|4XX
z714T)#ED`!2H})|Q582xT}Xgo3$oixD;)xTy8TZVx2Mp=zAuy-93TfrXNllyn+D_i
zyn9!l)v5}QI(m{0DOm#$P9tgzQGe;~M?tPicEOZ9);Mg@jI)AX52C=!n%H`6Ljx;8
z2s<_OV|W3TNN^XIM^58wI}oDcLoJa`ko4fpJGAG0UQ8tLX&SR7@5LyExcdo5z~Mys
z*_P&%Y^R~v^V2qUF22HmwN|Y4&;=Kh^J}oAJmI&2d`xPOGfvwGqA-1O&hK#=5yxVN
z+!<$x3-Yryb03r$6NB({+Q`)Gj}d)SyLN_%>p$mOnmn4O?+!3RDn7_8XoU8?$YAbn
z)EZDR+<`A+cILs(C~|x2gLnh(#d|L|V%xQUxsHCYC_RU0J7JjF_ucHAYmJ3FlV?U6
z;r+zfmNSqHSkS9|o6{Nf4QCWP_RYyx^_mZJ3D(Ac{(eG9Ea;3I>%9f{`dOmUl_uq9
zMR@#PNMdTcy_0aVU#RioCCta|uj`43GK@lz3yv^2%cgWq>;HFX^NgBlOjP68*3k`l
zNY3W79lVkAEdIwwxRc~q91_uLuk>rKO$6J|UU#mib~Oz|7_gf64Ndlc&#$HNAYnVB
zY#r%qWP!~u2mnFtOk|N9W-CMHx!pmmn&u;3X8B|Bj21^+>(N{#$D@NQt1}Kvh>9I&
z*PBn#^PwTkUFhG1MVCXU2fqxO8)M{lyp15I_>(*P%&+(ykE@HHZNKxsIP%QxXpcH{
zz-fQ^!=J46xY|XV-w3Z_ES*y^6K)IS(X4)tD}~bPE0QVd^F>-}Kv1j=YWXUa_EUV?
zgHBp$y-~k@eqYFGcVm!XrVH%6hA{((Jw7!=r5Vaaty^=v^7Z#R?V~enin~)Bt6!3Y
zJgTkG#Kbd{F0do0jdnr`_sn}S8yg!j#A+_3g4KPC5K5T-<9gFzC$;PcymPpS^}gGs
zM%=AXd;c2;J9CjYXrnae1vh_ySvw}xONFe`zZmHf@9E$2@)n#vV0yV$@|gp9=$zCq
zYGz9P3KH<q^<V+5yW1KbKIf2x2~iJvT~15$RSnh(+Ck(m%|PM7IAt$bz4#7LGBPK;
z&&Hp5!0zy8>*{u5gtC+=k%k127WeC+TWiXe&|)$y)qHW>Ba3O+JdB-@^YS3RzKN^^
zDEH&bWfx^;e#!0Ih2hRs6j=%;d-CUL?u^LeqkWc614f-)G6qqTV)ml@B8dnxl2iI;
zm8m0NG>N%+1Ko9A(qxaruCv8Q8+jlYf(}{rK)!liww=p#mM}|_a^5sxw@6>e?K}F5
zaPT-O$TlJZz)8*JltdLdSq2F+sr#`$#SJrqYT7Gi8u18IATY`R$^(79WRT~m4LIQB
z%a9I08kJ~4J=Z=n(^uJ<Gn`Fx0dOq_M$I*v^A7kqRFKz&j>i+M4xqiOkK%uA`%Ey<
z<SOkzt?@EQ_#)h_UnLId{7cwjiK;icbbY+z7!SZS#xgPIfE{QPPWJDP2xO>O5(|~k
zNO2@-L&PBIXuDiVjgYX9oUf;8gN~14hFJ=(_RlXHmyZw5nNNXLd3cfpo@%!Ts#S=N
zn<-p%lu<zu+c6!2ZuCVeEslU>6TbwRkX#&8OeN6-G)uEcs7lbq66N1*aQmvDD#lW=
zg9~3m@(ETDri@{djQp+kwUDDeP)3Rk<BDX`m%VRM2=*7ZG9Oy^mtPCRVXCK7JSRL*
z3W_g>f{qgCv`!Yopkc<o{Wz3e#3sdKW5sbQ1N`Mw(X#%9<m>dAtF_PZzLBdox830U
z7cPeZwr?3Ys?N1FIt~MysFI=sa_S#kJGv%x?gJBIFXy3KB@=V#*Km{kR>RK*a8_6f
za(XUy$oMrl+Nz28$1+aw5NfX-sn*cpJ%=NpcrCzfr*B2q{KMjw{!)F!&Q`psZhM7{
z3^}4gFgG5qWAczc&4cgxvUYj#IGhSrUNl&c1-uNABl3Jx(4jjzXe1^?D<+aU=CmUc
z<>0B}<FGTkL_o0J$gz`v^*)qjXBzI++BsZP(DrD!4x{_7GZ!l&ncw+LhEXii#VzB)
zmo}f54TK-TZG&IqYr=+$_?5Eq`-b#jdkSLIuyVZe?`&_3bU+0Mdc7!*BC(sFOd4v!
ze%{Tzy#D?^ZsC;bUvvm~==z3OKge<rU+zlc2{{QS0}p7Sk9j(F@0<*YB?(y2UT#B~
zF#@fWmwBKq=@fPzK2+7NJsV1*nHVk10`@MB8*LMFuvhB5MNZ*?s$f1xgu_si$s%HM
zPBc<P>NH^Pt+=-k=y$-_=@1rILi<!+h1*Jf*Xq=6^kIpHgo2O#G&WQ3XZ#knkD5IA
zBiF#<cBNkgruo6#AsD!U>cA<)U6p*d?*#QYpj4aZ%{d&4hW^7opBha-?SN)HU+w8@
z4^JN>lHgU9L{XC5QVJG(51*{<p|p9e+HTg&^3;WLZ$#V6Efr?0y+T+W?y5h-F#Ve@
zp=N2{iRfYkEB;o3;Zo$5tDO5GTqmbAPLn;s&F3qmJmJB^N484yY_XHQuXp9Zg<|)g
z{gvHX&0_|Mg)yv7V=jPV3aFXKi{n%n0H^hWjctCRPT0j=<e)+~R#o_;$7up8C4JOb
z%&90XWfNvcjj9h25*a=4!crA6tNM&TKYQSHy|YyFczu5t&DLKCJH186Y;UE4CTj9n
zHGBp0?SH|n;6lP>y>^JV0x>qfD1vQf#<cl^ES>ekaLf2k7`lH(#m)=$Z&_S95Rw83
z>=oGgxUr|msuJ;v=G!NyYkLDQBzvEKKC;yT#molOX~a8z#q>nq9!gU6RS`&cRmA>U
znZ?fm`m6>n?9;%D<Nvnd>zNwpQFkP-gcqo75%`BDJdIlf!E=l;%>E)hXlF1-n4$yr
zMGmt$n4Cfv2m(RjVX^nN+TPdiQCf-4BwANZ7!SM)x@;7^j7crB;7jGT2bS5AFIz%h
zmvMFP;qJ&%@(}^O=-veFxThL$p?f26b-d3GsCv)F8GFypi7?;3d##Aoo)JcnJmQQR
zV^tGyG1w{`hXou=dZtl}Y*8Z!KaL*j@N5Ps;@!|qTRKmUI&Kd7GxVDmm<~H`RzzxA
z!A_ILhD=kJx5=SH8t>Qm!F)n(tau7Bm1AG7*V<fNCr6`KF5&1J;K@I<$YaqNSdW(-
zG7sag>pwk8Y=<{y#%!?p-FN<nNCCYG1};kWAZ8Sz!)P0At;?p$U2Ak1g&uxPL5s>j
z-#0s+g6!RUwfr=B9&Sh}bSt~?pUs0F)1$$;rcSIQ-pEPMtcAm06^2T$iA%MGIy9F7
zk8e~{kCN1Dia4dT;Vz#+6}Ix4rghM{t@hx8fGvi}zmdiY379`RiCF(Oit%U47gE|t
z$_>mJuw%f1p^&)sRO+fXF{HRb3{kEQ-2K=~i;x3n3CkCI(D=y4=d2Gq<L68T1{+m2
z>E|V^*wL0!l-7V8WqLS*P^Hl@Qkh7GG+7JhVEQvbd@oO*ZRpk)9?kdQ`VIJ!86&2}
z3*=RYFq_GsX77`Tnu`^;yed(3+H+)d5ElK{h^z=!<~E0}Zut&U8F$R~cIIP}+!y&A
z`;+t()D4PM7xj2&Q0vn<^St{;fy672qbM>SUq*KOIffQq68jwKOSEKcx|lvuAj_dj
zLj%=$4V#ix(*_^!7T)2l&r^K`;&{wX<oMMQ0F71=$e%eDR&e6eF4`um`}Rs6K?{%O
zecMZafW+v}qwVV>XGHLnV;JtM?IybsOQlkam+Z(B(Yo!xr}bDd_fo*necec05>SQ6
zAZMR&>}c3IYj{!T<nbh;&kODQ3+rP81htve_yEEHFVN@iMZn)1&7HdGb(x|g{5M7|
zvSCsbsw-k|Qf1|H@D7(pk@@i^`FNJow4DvYa7q9O-Mi^D9#2(Xm_zwx)_AEa%ogiu
z8-E)5bT^j?7p>cnTUnEgDHQ&8@iRV2G)(LeW99YLp1r!=J_Xk5#<y!QGX4o-8Jr&5
zTx{7q>hi`Dv?UQpOy7P3*z|di&We{X;8yvL=z0}LD(Y;fqBQoE$h44CP#|xI_}Vvs
zY-k_s7Ha}6@=X-3?I$8$UjE08%(`v$nXUf&)9g{>L``Vz5V2CZiGj)yijBpy&)kv{
zdD`uPTU81OA<0tLF_b=eIX>5}pj1l&>(vP=8Zy5RPJ+Bf+XqZi)iRcFQGdt`7BugP
zSbCbm?Y>pQa}iG)l4y&EEl*OIj73-}8>k$A#n{JSh)E|9&BT5NaA@Ke<Ldqw>p*88
zRMBH0T%sHMtJz~uCbZ=h_>#E=go~Qy6<+`)Ae2&xJt#eN2^`nNn#mtvOQ={*LsQUv
z*7;A!Oj0yr?ZXAdM7t|jbhFif=jUJfKxz_B2JkL`(}5+o)0KFpw=>Fp30utT3+@FA
zifF2$FBiyi<@<v2Kdi?Dc3eMw(0qPapIiEA$-t|RujW(%Ci1S;B>tdWGfdaJJF3QO
zs?ofhtZ_`5abq#DlkH^>JTE#bS)N_UF<X1<puuP`3(IhSm%ac;K$I|V|5x(Dquch*
z_6T?V=V<u&bDEHEd+(8Dz*K)^yqYtWjuks*1)yQGBDvx1#=}Oz@A@6`fd@N9BDi9U
zyAqqy>-hTan7^Oi&5n?uWLO3NRQO1-G|s?N7cM4oI*>v4+a8M&JIfXA@2I2NuE{!o
zs^TbNR?hffI<U4FY6P}h3LyegE`_84SNTkg6|O|rOfn056$fy*$T|7GzQqy-+t8;&
zhP8{r4pmu9x($b)ftqu*UcK&bHUxTj5W!%`u?C}izqH1W?-K08zO+TH7sE_dk|b!$
z<8P%kz>nye!Cd5w)%~buM<4jUh3KRJY&ZdAIDnxzQYY65(RP#f-R=9b(STM1w1x-=
z6dz+qruL6lM8uRB35;rgY1k-t4-z|whz-fLqwe;=((TRl;F@AC^{M_A8+_@HT9?o1
zTzAh7I#)U_4kjrsDpz5VlpfW%XVN$aCV|oqw$N0E^c^)>mZ*5L&Mwhd_ja&_+RW!1
zuaMnD_waQbwSB8%yzO}PJ7&VP6j!cr`wPR5w$<;<o3;hXfI*8mQNpOCOp&2_l^9c$
zs37)LFVkY?c3;c46j665KDgLHxEWw=BLbO0!UY|@kV?JYYtxPndOc#~gVDpoQgr<u
z9{;@TP#QA_GY;?(Qw0rXT{uydH{_#c+RGFg1&OMp<)p6Ush(k)jiCAZ>d&AHS_;-+
z#TZrbw>DfYm4*O?EaTIPYX;Nv>kgNyzCdHw>oUNxY+i|*=AQ>@)8GMu3~XXwDBm(5
zASRgOWUpoAy(uN?2t5UgS8KbvzJsH%Zrk}hG9>>sXKR>fMW({Sy{hl(L(z}BY-u_F
zl(YMewgMvQ&f9!wIl4u=@wIj6LTMIwd>PXDdtU8Ttq@kt4Am7Kz!ZAwpWi;maMi;$
z3`x!fq6WMT4;H1|qd%fTILI<Fm!z7W+9!A;mat`<a$ilVqg5DHl>Z&qRbQaAhr3T+
z<qV}Y{QN)*WA$)!ZdiKw!bm||(rkVdeVlIsDVAkWDq$>0^WsK&*0fdCYW2L7KV)Z>
zF+qzIgMTazWm#X@{U^cOw@?)=IYC|S@5lY6gEcU`<vs0X2|%Lf2QN>D<v#7|R7Rf-
zRglLytw}zQR0~P%H<6`MLPz_5nzO5V%?<KzS=+389`QX7s+V`oDq7;U1EMb}oEm1+
zvVd|75FOsSo+?;fZ%|lRz4n5ZO{{7Y?0xbg%%w_3_0ZIaN;?wkI8U#As=LknL-7cY
z7n?jqL2vgBjFlh`@AnJ1^?R^Xk`2X0C6+i`!Nt-MciK`uH41V>qEvyH(=z?4PO$B3
zRn&9xrX{!Qn+AN0lW@et*Unj&aPQosa-kz|I4l?}E7?KWKTT_3S=>jBZsxx8Ck(b#
zd3Abo%*-5?=X}sJGQY9=4|UVGx$I@7T#cm5tLX3qMZ)Nc3y#7C&lq=~>+rs<H*a2D
z0<tD#49(ty;p=_=?!oE^@>k#GXz^|U$Sag25v7iI&Rt#Ngx>s3vTA2WGXBPIosa%4
zRIGu$@XgN^cxHOT=poXWJwTj8*09FRXA<UMK{dkj`@{Q|RPRp#Q=bRSy~4Rz$McW2
z&#OZtr{BCRu2FInN763hM!EZa#s7Yxz@vF|brX3dYKcj!*I)D$P9E?N7A{8`w0>DN
zdFO6fO5n*K=OWU@9lOchXUdK_5g*=1?5z$LY`OYtf3?!F_^ClPwBrTBs`};4_W99L
zyeT8<CP&s4Sowa}Y-_OzDE@SD+75<dzq%y!4wqY|)*CJ-KV&FDOR4OYUR*bH17((j
z{ryTBiX`<#Gs_!n{354grf!|{&V8=S(Fw4!3d1Vh9-CD(yHnbMfFRup*6iC@X&cg2
zUZ*SuAp|nNW@zRx7A5JEl#EdQYKrC-`=CtxgGY|E^)^{%Sp6o;^R7sA5}Y^d4cj&%
zJl^rAV?-$i>8hw&EMouuMECju8=vRdLCn7&iR7)<>a$T3GiTqB+0Xncl9*z8iAVU@
ziDv+@YZ;<n6XOA62#?$tGYYP=w{HD;Q{-@Eb7FmU^VYFX5Q$n0x>k+l3ocjw5xA#D
zbN5_Lu-`=z()>G6Vesx<4QPgQQ$~yZ6ZboB(INA;`f>EIICiRqqFCRY5TU`u3^a$y
z;0xTZ6Y=lwY4eG(_6rBox7EQMXt)e-IFBYz-`q60R9}v`_Z58Esgo?-qkBLYimbjr
zmb4gbL<7jMC23i#uE5>#_0XQFrnQO}cwV1<q@wK96!`^rN4e#1JYUI1woqYViBMVE
z;HIB*{|<P`T=Z!0GCS~Mo0Z<D^oi41`{aIv)i&-r;CB|3csMsD1KaKcLk&qu<A1=`
zeLYF0fjy*SibZMuyv=}Igh5R!`kQGDElu{$P}bE-NRCM7cj2DwolW8kF*b#>YbHc9
zT@s(=bC``#Z;=3fge_ivHSqh<C965&57Uf`MrkYL=Ba9IOokQ-T7<DKqk0h$hJAvh
zgHlA4j0l(+N)8AgZI_px%Kh+&&PMgEF3V}EWwYuV&72!TfpA}Flk=^E=?YU{p7A2?
zF}Oe8Qh!)3^txg}bTmj^cS$*tG^;-nZ`@+>IpK?V{4sIxljPMPZ{L0C)C{|E+I_%P
zwLom<DaP5>2ja)N>QG$|KI5RUcTVZ-ej#<#&~D|Ws7gs82^^s4w;wpg4<E_C=g}5^
z-e2k{yKcg`q6{{gPcmY??sWFpa$M7#*6<+7j7M)m&mjQF*S6{wFr^fv{PsPVd^+3Q
ztqIUzJnyf|r>x>K3kU^leCVf-oW*a%s&f8ChV(sotYmh;Y(cRXio@%VFjlB~KuRrv
zan|jcE7)~H6ctIW2uXhfu{=rTp5mnn$eGQ2Vdj#)FWKc)b?I)ed^)_3C!G{9tY~~I
zGwmn4<wJ;hOSPYPL3kjFp)*BlE7C%@x5mb#?iiwF9S~BhKi9(y9Ndc7yJ_LO>tYwN
or$%(~|6j$<e<eMQ!N{kXwwl>7AfEAaB@#ecUPG={#v<f@0BphVbN~PV

diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b12aa55a3a3fc09638befb2e678e53d31bd4e151..b584148ce64e27b6cd39afeeb5806801fdb63563 100644
GIT binary patch
literal 3559
zcmbW4XE+;-7RTGhDk3d!X;rCRHDi;~rqoL#M(j~qN<$^~s99S|c(qz9CADIdB6iIR
zN{!e>?GZboMyYYV_dd`4a_^UWKb&)(=bZo7^Z%WLG0^)H$jr@r?%X+`j<zP^tXBLT
zOblmPt%pJOtXy={w(vZ6j-~qVIIkU81w0d{>S#iZ{cs!afi9-Q*E;wJm<_8ePSUHz
zB3llI4W_bOCc~%fUi@{WwgL%vBZ50yXN(R}La)E37z3sOuw6sKMfv>)Dv5Ze^mv3)
zcm;eo_@#E+1<5)mE3UY2rvoq>XBOA#fW8;KYSh!@`WL@xQvtndl#tB*AD$T$7158@
z!MjTLV?+a^Z|DSug^Acep&Xy^c#N3=nIwJ-Id|m`c^Wfwnjbwqy#9Y2>)H7_>IF}A
z$`<_U7R=PoMIi2=R^1c&^mCsE_Fo%l@Emo&J8|5PUZGO&ZvSp+>|2;=>4V#*DH)J8
zlHS2tg7Z^U1pTBl6~z7e_>}ZSl9SpITEq1RiSg9QQNbWJwU)jc#l<ZFet`9j6JrL3
zrdPQcIwAzR8<yrVRc>=Dva@jlsR&c47X?XxN{D*Cv<*J1+?mu@twd#t2yr_-@8lYA
zmm*O=8WuGi=@$#jgSqRhTn7JQjj#cG1#y8IKzsY&qI;<H8oV*}MLz{yt(uFvb>8&e
ze!Wc;&ne7vG-lCa1Hc-y3v^V~k;x62JAQ+=G1cVANJ7^Ej1%U7Lg|^$)G$dLkl_jZ
z4?XR(UB+s}XsvHZmdmT-wFu7>0n53R&_(okxy6)Ipi<(lJ`N9-vI!oPcESPyMU$mV
zEhKC;haj@sz}kN?A$N}v#*+`<EVZ97wb)<gz@)P4lCE-t0!AmxUzu8*?|yF|h1{6j
z7n+-;k;V&Esv!mmhArj?lqMTt0?u?92|N}xk<sh5D7~jX-DIXdMjTyP^BzwI*x8&E
zrE?IsX62RvJM@Pn2iz5}TaI&_C9&f=P@``2e0lzR4lfzWKfw^t;VrLakBbC4tVz?_
z+A2@}#ZJ1ND~H{}IQE^&BGc{jGEn>{@-wN~IDE2{6?ghHxQy|THHgBj$HdJd%4O@G
z3sB%6d)cVLSND=5%qDmq$Tk$F+45H1m`gq{M0rSCeOZGmZ+nP7sDJTpf5`>RMXp1H
z3ArYF#cct!3`2<*uc9cgy{Cvo*x}x8T#EBKFlN5*7UDYh2XsK4YIw8R=&B;mPJyG_
z%QXBmvtHxMUM8N&#$A-t!RY6KfgkVs!CReDMYrCLQMwg2lP7<*x8u?8Hy&L(5Fm`A
zdXMOxe;#~zJHlR>7JjNAj*h_*1g>Ag(8lHTVc+&fwDs1^`HL(JuK)I$KO~Ik3{GGZ
z?S9|f9P@OfA3?MtZ^k``AFGXgyCMnIV6C1E`LtmNC_6gd?J3i;ov|#bI~o64hP~AC
zCgDhI<faMJ?|K%lf^OO;n=*v(jA>g-lYek!pleA(G-Di;@3586;dj&Y8;$73_}w4j
z;kKO+SJ$_$CrUT35XFhAjOYsQgi~Q<Gu(_N<nDUXK6iE3&bF*dF4^WUP3jbStl@ce
z<@SAJN0lW>8<%2<m=`^dcH3K{73<5P+`Kie-5s-6d7iUdL&ndcp0K0`;o`la^Uuj6
z94~G;TAk1EyTl!vPqVNB=_A8GyEX`39shnVD6X*zd!~BQ#!%J9b0O4@$^FjOHEin3
zj?G8*J&1|bHLs5>buLS~^A3+6mdt*L9==ZnM<~BTZrvShjqAUcjz=*JBKFe0XxV}~
z>hPk;@2*MDyRKyzgKDFZ<p-HSvLaG&@cZ)G?02q;S(;pX%&Ff`$!v$G7c_|nxm-=V
zI!8T`N1SJxc_-{JtSGGNa(LCr7$q(_QS7>n|8D*#pQE^@+AwTY`3+yB37JDgPsTs^
z<Au7USm69Hh1V)z!8fqya}t6D6{#qvLmLt^{nS~A@5of|Up`Q3I`UYjL`1fTPl(;>
zeoEK-0P<M?82QDYgvBVrL`@7H?;N$3t>WnVWZqP`xW)(iFzw?GhFiWgZ-H-qv>42T
z+uNw0u5pC)7V?@`l~~mOvO2k1qmovQigmcghw`z=k>k0(Zes7L)lrE5X|%LC^4K;p
zrV-Eq8;)&im7WWONdcqSQ+ovyysy&flQK)p!G#?>X!&}Bgg;l;1c5}dBNAeJG*HZ@
zQktD4RwpRM*}O<w8ZMGsHGlJB%B^>8bye2ml=RGilD{jXG68P<x{0+jA&U^)Wyb(+
z@|VhR@T$C;2f%MQlv<YNql7<{FL6~#HYq_m?R*I?81}NjF@@2#*J@1mj;wO>CHxO3
zYPEV@v8+W`7t;Z@zhNO25*})$5NOgZ4zsM1N}3jVO#SMxgsQa17*ofqIg2R!%ZgXt
zcCD^{?422Gj8t*`FwYE#{kuOObAE`)$rFp?^unzal~=~I6V1|M#n7m^NIdbqPgh@G
zY%yEg<@Q-_8>iN?#b2&zI6e>3gQS%LWrAE;^$RHtXh)3J*UKv0%&J-<S29(W-q1v1
zxR@<dUC<X~RsTDn3|)jObfUvVv<_;Bt<C_W|DajiK>xUNWvJM{5qCBB^qX|Cq6|Ge
zZlK|}eGyRiUnDeSU|=X#EFE9kRS(m}FCbm0q8cpl`Y(leIF$nZ@ny-ho8Odva#RCK
zVF%a-J~?()S-9Cw{-u?N$AEP=S!KBYkOyl`haQhyA1%Z)9&Sj5vp@3R-?x;WF2rZM
ztZTgPnA+4Y9!=F?v!l}tc<us#LpcP$$M3O~K|sY@f8Fz1o~kv<wf-y~$qc%v8NE5F
z3VHrw78kMMduFk!OY_X48R#7Kw8z9>E-?Wt^YI{66U&xDJZLY-aiM-TZ(B1btNgZ~
zQ`nXJF0Vd?4)aHkJYfG^zt=tJEQt<!*XpyaZpUR#@#UU2dG5UyHj>uM@8fqu6E(I<
z`$-m3^l_QEE!l%A1Uf$=SIMnhf;6XwOlH@OSjf|%Ao>6>C?l4e*WcWsAV7J9{+}Hd
zQXqAssF<-eKFS-Ko)#;z=ML}ADnop&Mc!>rxz@^>Op>r9@@(`#<X;JcLr<(c%^E!I
zI3;b_bQ{f(f9MJjPYS%tXWs&Q6?0zUKl`ru*(I*Kd&huzZa_Wr1i>>c)ShG;ukqW2
zY=PwxJ<DYw@~?KSv8^xS82`V_enz*4M^>c^UP~2XR?&o$nfgEAC(modwvQ@xy~C!n
zt5p_?EXP;vJM;@DJ73X{YF2U>eAhEj-Y|^GUCYnEXgMJci>hyJv^ogtgyjyc*>PC=
z2EdBWc76~20j7{=5WsW%{TReZJ;VG%+5#~raEVn+N-R;#VbKP|v%xCev6<ild7`bG
zb$j^+9Ih9a{UmqmA=M?O-tEW<0ru3oq#IlFAUTq^q%mr<b^}Fa43?{1a>n0A1};9z
zGY@tet1u*7(nw6$3E^RUMbJw$hK4Q>5TOnr%$i7BxTSxD{w>p*nJCW#+yymm6R3ua
zd1#t7qR;{h=6Hpauw#}yK^mmc@EOVW6M1mi1Irswd*vrE?GJ6Dj)n<hq*4tQK8~IR
z)z!1B=ZpMn2J7!MkZ4w;Qqy7D!`hVE6fe_yvC<f+GhWY|7fVhrN!~HbwYFn;w(Wt;
zO(<+|!z@tVe?%x^_@2>WcMQ2rxmkoMk7~a9*OFNE9P|dt2fkW&l~wR53nL}Pf$ygM
z0MWd>GuG(OQ3{~Kq}bsu@erEa+j5;iWl?0eAF>B#){`z>{o?>)xk@+xbk9)ec(6+l
z2n+f~r7F+8)O_8BsWkCK`xduHvjs_JZmzzrW#KAJ%DjD5^ruwKy{_920h9vilQndh
zj<VV!h0=*<>=$vL$-%cY1~Cdzb2y$Jj>!$J%6!Pz=9IEvXR>NMdC11Q%z{>g-<;`E
zA?7Uou(a@LTlDBOG3#s&QGe45@>X1N2NHZ+{AW`sfV=jn%-9{Q-{Ue!T6%cO*QqJ>
zY>b)Ax=zce|M<{j-=h8ttlORv5$oo-Qjde-=^87wi@ap?A?p30`e2Il`kIQw`s~HY
z%X>p1ag_5lrBM-9<yZw-k*^A7A^JXV_gN|XVwys-?0`B6XJwUH;hh;H(aQlJBeL2@
z)%ZIE!08NzLqZ(vl`Nc^LHotNbOnV>*D#vswY{NvV0l$zM!FwcXtcIR3Te|QhKGCC
zyUEZ>#1~`z?Z``ly@4h&cRBHRxp4w*^m9NEJ=>;N?uM-MG<h$7$Bi%Y{k-yBkQ(QV
zK9<Y$JLmCMR&zkFZ)tw{8Byz-dUf4{b7h##9dK&T-Wi*k1qh=9Srn8MMbwjt7wb89
z+#c7K4aEsB<rFVRstZj_9TI+C-$%YS3gcy)WBS%t^4HwT;8PE$R3q5hrLBw-y%m?|
zZ_bR#2_r`;0`HiI=0aRHrc^zIG}WJc`PJN7T=TSUfxsM>*AKjrUi#oq>d7(G)KCQ7
zoq^-r(T)({69fDCGxW>6-89$M4^NM+O-J2>CWP*=W>sXN=i2Vb^Yj0A4E%p@%*joG
bQ^s{~HV<jD1p2ej?VQd7J<XE)kHh`}o{`<g

literal 4880
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


From fd5085b09647531b806dcfead6268e94bcffb248 Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Sun, 9 May 2021 12:32:53 +0900
Subject: [PATCH 088/200] Update formatter_markdown.rb

---
 app/lib/formatter_markdown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/formatter_markdown.rb b/app/lib/formatter_markdown.rb
index 13399069a..edfee6b25 100644
--- a/app/lib/formatter_markdown.rb
+++ b/app/lib/formatter_markdown.rb
@@ -2,7 +2,7 @@ require 'uri'
 require 'redcarpet'
 require 'redcarpet/render_strip'
 
-class Formatter_Markdown
+class FormatterMarkdown
     def initialize(html)
         @html = html.dup
     end

From 61d0952db66f8db9728ce89d5a2f65958a35b749 Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Sun, 9 May 2021 12:33:22 +0900
Subject: [PATCH 089/200] Update formatter.rb

---
 app/lib/formatter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 843446414..de11bcfab 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -36,7 +36,7 @@ class Formatter
 
     html = raw_content
 
-    mdFormatter = Formatter_Markdown.new(html)
+    mdFormatter = FormatterMarkdown.new(html)
     html = mdFormatter.formatted
 
     html = "RT @#{prepend_reblog} #{html}" if prepend_reblog

From 42f8e5801e1a4d10bae7bf4f5e298a93109d9665 Mon Sep 17 00:00:00 2001
From: Genbu Hase <hasegenbu@gmail.com>
Date: Sun, 8 Apr 2018 16:56:25 +0900
Subject: [PATCH 090/200] [New] Implement a feature of quote

---
 app/javascript/mastodon/actions/compose.js    | 32 ++++++++-
 .../mastodon/components/status_action_bar.js  |  7 ++
 .../mastodon/components/status_content.js     | 17 +++++
 .../mastodon/containers/status_container.js   |  5 ++
 .../compose/components/compose_form.js        |  2 +
 .../compose/components/quote_indicator.js     | 67 +++++++++++++++++++
 .../containers/quote_indicator_container.js   | 24 +++++++
 .../features/status/components/action_bar.js  |  7 ++
 .../features/status/components/card.js        |  4 ++
 .../mastodon/features/status/index.js         |  6 ++
 .../mastodon/locales/defaultMessages.json     | 13 ++++
 app/javascript/mastodon/locales/en.json       |  2 +
 app/javascript/mastodon/locales/ja.json       |  2 +
 app/javascript/mastodon/reducers/compose.js   | 21 ++++++
 .../styles/mastodon/components.scss           | 28 ++++++--
 app/services/fetch_link_card_service.rb       |  4 +-
 16 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/quote_indicator.js
 create mode 100644 app/javascript/mastodon/features/compose/containers/quote_indicator_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 891403969..26e7bfab2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -20,6 +20,8 @@ export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
 export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
 export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
+export const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
+export const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
@@ -100,6 +102,25 @@ export function cancelReplyCompose() {
   };
 };
 
+export function quoteCompose(status, router) {
+  return (dispatch, getState) => {
+    dispatch({
+      type: COMPOSE_QUOTE,
+      status: status,
+    });
+
+    if (!getState().getIn(['compose', 'mounted'])) {
+      router.push('/statuses/new');
+    }
+  };
+};
+
+export function cancelQuoteCompose() {
+  return {
+    type: COMPOSE_QUOTE_CANCEL,
+  };
+};
+
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
@@ -130,13 +151,22 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
+    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
+    if (quoteId) {
+      status = [
+        status,
+        "~~~~~~~~~~",
+        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
+      ].join("\n");
+    }
+
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 9981f2449..804e05717 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,6 +24,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
@@ -61,6 +62,7 @@ class StatusActionBar extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
+    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -129,6 +131,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onBookmark(this.props.status);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -326,6 +332,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
 
         {shareButton}
 
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index bf21a9fd6..5cf7ca802 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -38,6 +38,8 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
+    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
+    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -46,6 +48,12 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
+      if (quote) {
+        if (link.href.match(QuoteUrlFormat)) {
+          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
+        }
+      }
+
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -125,6 +133,15 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  onQuoteClick = (statusId, e) => {
+    let statusUrl = `/statuses/${statusId}`;
+
+    if (this.context.router && e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(statusUrl);
+    }
+  }
+
   handleMouseDown = (e) => {
     this.startXY = [e.clientX, e.clientY];
   }
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 9abdec138..43acf597d 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,6 +4,7 @@ import Status from '../components/status';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../actions/compose';
@@ -99,6 +100,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuote (status, router) {
+    dispatch(quoteCompose(status, router));
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index ba2d20cc7..8f9a8a261 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -4,6 +4,7 @@ import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import QuoteIndicatorContainer from '../containers/quote_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import AutosuggestInput from '../../../components/autosuggest_input';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -209,6 +210,7 @@ class ComposeForm extends ImmutablePureComponent {
         <WarningContainer />
 
         <ReplyIndicatorContainer />
+        <QuoteIndicatorContainer />
 
         <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef}>
           <AutosuggestInput
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
new file mode 100644
index 000000000..515c79fca
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import Avatar from '../../../components/avatar';
+import IconButton from '../../../components/icon_button';
+import DisplayName from '../../../components/display_name';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { isRtl } from '../../../rtl';
+
+const messages = defineMessages({
+  cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+@injectIntl
+export default class QuoteIndicator extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    onCancel: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.onCancel();
+  }
+
+  handleAccountClick = (e) => {
+    if (e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+    }
+  }
+
+  render () {
+    const { status, intl } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    const content = { __html: status.get('contentHtml') };
+    const style   = {
+      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
+    };
+
+    return (
+      <div className='quote-indicator'>
+        <div className='quote-indicator__header'>
+          <div className='quote-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} /></div>
+
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name'>
+            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
+            <DisplayName account={status.get('account')} />
+          </a>
+        </div>
+
+        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
new file mode 100644
index 000000000..eb67f3939
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { cancelQuoteCompose } from '../../../actions/compose';
+import { makeGetStatus } from '../../../selectors';
+import QuoteIndicator from '../components/quote_indicator';
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = state => ({
+    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+  onCancel () {
+    dispatch(cancelQuoteCompose());
+  },
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index ffa2510c0..1da4b52a4 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,6 +18,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -56,6 +57,7 @@ class ActionBar extends React.PureComponent {
     relationship: ImmutablePropTypes.map,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
+    onQuote: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -82,6 +84,10 @@ class ActionBar extends React.PureComponent {
     this.props.onReblog(this.props.status, e);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -277,6 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 90f9ae7ae..317163648 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -60,6 +60,10 @@ const addAutoPlay = html => {
 
 export default class Card extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index df8362a1b..0cd25955b 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -22,6 +22,7 @@ import {
 } from '../../actions/interactions';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../../actions/compose';
@@ -259,6 +260,10 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+    handleQuoteClick = (status) => {
+    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  }
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -566,6 +571,7 @@ class Status extends ImmutablePureComponent {
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
+                  onQuote={this.handleQuoteClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6d1db70ab..f0522d148 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -449,6 +449,10 @@
         "defaultMessage": "This post cannot be boosted",
         "id": "status.cannot_reblog"
       },
+      {
+        "defaultMessage": "Quote",
+        "id": "status.quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
@@ -1229,6 +1233,15 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Cancel",
+        "id": "quote_indicator.cancel"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/quote_indicator.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d67ad6862..7ddd4908b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
+  "quote_indicator.cancel": "Cancel",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -401,6 +402,7 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
+  "status.quote": "Quote",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f138ede89..732ff3026 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
+  "quote_indicator.cancel": "キャンセル",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
@@ -401,6 +402,7 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定されたトゥート",
   "status.read_more": "もっと見る",
+  "status.quote": "引用ブースト",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4c0ba1c36..596e1a68b 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -5,6 +5,8 @@ import {
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
+  COMPOSE_QUOTE_CANCEL,
   COMPOSE_MENTION,
   COMPOSE_SUBMIT_REQUEST,
   COMPOSE_SUBMIT_SUCCESS,
@@ -59,6 +61,8 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  quote_from: null,
+  quote_from_uri: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -102,6 +106,7 @@ function clearAll(state) {
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
+    map.set('quote_from', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
     map.update('media_attachments', list => list.clear());
@@ -292,6 +297,8 @@ export default function compose(state = initialState, action) {
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -307,10 +314,24 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
+  case COMPOSE_QUOTE:
+    return state.withMutations(map => {
+      map.set('in_reply_to', null);
+      map.set('quote_from', action.status.get('id'));
+      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('text', '');
+      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
+      map.set('focusDate', new Date());
+      map.set('preselectDate', new Date());
+      map.set('idempotencyKey', uuid());
+    });
   case COMPOSE_REPLY_CANCEL:
+  case COMPOSE_QUOTE_CANCEL:
   case COMPOSE_RESET:
     return state.withMutations(map => {
       map.set('in_reply_to', null);
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b0216f5ab..0828ff07c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -761,26 +761,37 @@
 }
 
 .reply-indicator {
+  background: $ui-primary-color;
+}
+
+.quote-indicator {
+  background: $success-green;
+}
+
+.reply-indicator,
+.quote-indicator {
   border-radius: 4px;
   margin-bottom: 10px;
-  background: $ui-primary-color;
   padding: 10px;
   min-height: 23px;
   overflow-y: auto;
   flex: 0 2 auto;
 }
 
-.reply-indicator__header {
+.reply-indicator__header,
+.quote-indicator__header {
   margin-bottom: 5px;
   overflow: hidden;
 }
 
-.reply-indicator__cancel {
+.reply-indicator__cancel,
+.quote-indicator__cancel {
   float: right;
   line-height: 24px;
 }
 
-.reply-indicator__display-name {
+.reply-indicator__display-name,
+.quote-indicator__display-name {
   color: $inverted-text-color;
   display: block;
   max-width: 100%;
@@ -790,7 +801,8 @@
   text-decoration: none;
 }
 
-.reply-indicator__display-avatar {
+.reply-indicator__display-avatar,
+.quote-indicator__display-avatar {
   float: left;
   margin-right: 5px;
 }
@@ -804,7 +816,8 @@
 }
 
 .status__content,
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   position: relative;
   font-size: 15px;
   line-height: 20px;
@@ -1254,7 +1267,8 @@
   margin-left: 6px;
 }
 
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   color: $inverted-text-color;
   font-size: 14px;
 
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index fa1636e41..c5cd3096a 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-
+    
     @card.save_with_optional_image!
   end
 

From 794ad9dbc6d09049f857c8035762bcbe55e776f3 Mon Sep 17 00:00:00 2001
From: wakin <8th.mail@gmail.com>
Date: Sun, 29 Sep 2019 13:41:03 +0900
Subject: [PATCH 091/200] remake quote feature

---
 app/controllers/api/v1/statuses_controller.rb |   4 +-
 app/javascript/mastodon/actions/compose.js    |  18 +--
 .../mastodon/actions/importer/normalizer.js   |  26 ++++
 app/javascript/mastodon/actions/statuses.js   |  25 ++++
 .../mastodon/components/media_gallery.js      |   8 +-
 app/javascript/mastodon/components/status.js  | 132 +++++++++++++++++-
 .../mastodon/components/status_content.js     |  17 +--
 .../mastodon/containers/status_container.js   |  10 ++
 .../compose/components/quote_indicator.js     |  14 +-
 .../containers/quote_indicator_container.js   |   2 +-
 .../features/status/components/action_bar.js  |   2 +-
 .../features/status/components/card.js        |   9 +-
 .../status/components/detailed_status.js      |  84 +++++++++++
 .../mastodon/features/status/index.js         |  21 ++-
 .../mastodon/features/video/index.js          |   8 +-
 .../mastodon/locales/defaultMessages.json     |   4 +
 app/javascript/mastodon/locales/ja.json       |   3 +-
 app/javascript/mastodon/reducers/compose.js   |  31 +++-
 app/javascript/mastodon/reducers/search.js    |   2 +
 app/javascript/mastodon/reducers/statuses.js  |  10 ++
 app/javascript/packs/public.js                |  23 +++
 .../styles/mastodon/components.scss           |  64 +++++++++
 app/javascript/styles/mastodon/statuses.scss  |  22 +++
 app/lib/activitypub/activity/create.rb        |   8 ++
 app/lib/activitypub/adapter.rb                |   1 +
 app/lib/formatter.rb                          |  19 +++
 app/models/status.rb                          |   9 +-
 .../activitypub/note_serializer.rb            |   6 +-
 app/serializers/rest/status_serializer.rb     |   1 +
 app/services/fetch_link_card_service.rb       |   6 +-
 app/services/post_status_service.rb           |   1 +
 app/views/statuses/_detailed_status.html.haml |   3 +
 app/views/statuses/_quote_status.html.haml    |  35 +++++
 app/views/statuses/_simple_status.html.haml   |   3 +
 ...20180419235016_add_quote_id_to_statuses.rb |   5 +
 db/schema.rb                                  |   1 +
 lib/sanitize_ext/sanitize_config.rb           |   1 +
 37 files changed, 588 insertions(+), 50 deletions(-)
 create mode 100644 app/views/statuses/_quote_status.html.haml
 create mode 100644 db/migrate/20180419235016_add_quote_id_to_statuses.rb

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 106fc8224..1e23cf300 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -46,7 +46,8 @@ class Api::V1::StatusesController < Api::BaseController
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
                                          idempotency: request.headers['Idempotency-Key'],
-                                         with_rate_limit: true)
+                                         with_rate_limit: true,
+                                         quote_id: status_params[:quote_id].presence)
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
@@ -85,6 +86,7 @@ class Api::V1::StatusesController < Api::BaseController
       :spoiler_text,
       :visibility,
       :scheduled_at,
+      :quote_id,
       media_ids: [],
       poll: [
         :multiple,
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 26e7bfab2..fb4d26cf2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -102,16 +102,14 @@ export function cancelReplyCompose() {
   };
 };
 
-export function quoteCompose(status, router) {
+export function quoteCompose(status, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_QUOTE,
       status: status,
     });
 
-    if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
-    }
+    ensureComposeIsVisible(getState, routerHistory);
   };
 };
 
@@ -151,22 +149,13 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    let status = getState().getIn(['compose', 'text'], '');
+    const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
-    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
-    if (quoteId) {
-      status = [
-        status,
-        "~~~~~~~~~~",
-        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
-      ].join("\n");
-    }
-
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
@@ -177,6 +166,7 @@ export function submitCompose(routerHistory) {
       spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
       visibility: getState().getIn(['compose', 'privacy']),
       poll: getState().getIn(['compose', 'poll'], null),
+      quote_id: getState().getIn(['compose', 'quote_from'], null),
     }, {
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 5002292b9..d274a0226 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -62,6 +62,8 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
     normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
+    normalStatus.quote = normalOldStatus.get('quote');
+    normalStatus.quote_hidden = normalOldStatus.get('quote_hidden');
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the
     // status' contents, to avoid having a CW toggle with seemingly no effect.
@@ -78,6 +80,30 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
     normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+
+    if (status.quote && status.quote.id) {
+      const quote_spoilerText = status.quote.spoiler_text || '';
+      const quote_searchContent = [quote_spoilerText, status.quote.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+
+      const quote_emojiMap = makeEmojiMap(normalStatus.quote);
+
+      const quote_account_emojiMap = makeEmojiMap(status.quote.account);
+      const displayName = normalStatus.quote.account.display_name.length === 0 ? normalStatus.quote.account.username : normalStatus.quote.account.display_name;
+      normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
+      normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
+      let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
+      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
+      Array.from(docElem.querySelectorAll('p,br'), line => {
+        let parentNode = line.parentNode;
+        if (line.nextSibling) {
+          parentNode.insertBefore(document.createTextNode(' '), line.nextSibling);
+        }
+      });
+      let _contentHtml = docElem.textContent;
+      normalStatus.quote.contentHtml  = '<p>'+emojify(_contentHtml.substr(0, 150), quote_emojiMap) + (_contentHtml.substr(150) ? '...' : '')+'</p>';
+      normalStatus.quote.spoilerHtml  = emojify(escapeTextContentForBrowser(quote_spoilerText), quote_emojiMap);
+      normalStatus.quote_hidden       = expandSpoilers ? false : quote_spoilerText.length > 0 || normalStatus.quote.sensitive;
+    }
   }
 
   return normalStatus;
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3fc7c0702..0c520a796 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -30,6 +30,9 @@ export const STATUS_COLLAPSE = 'STATUS_COLLAPSE';
 
 export const REDRAFT = 'REDRAFT';
 
+export const QUOTE_REVEAL = 'QUOTE_REVEAL';
+export const QUOTE_HIDE   = 'QUOTE_HIDE';
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
@@ -272,3 +275,25 @@ export function toggleStatusCollapse(id, isCollapsed) {
     isCollapsed,
   };
 }
+
+export function hideQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_HIDE,
+    ids,
+  };
+};
+
+export function revealQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_REVEAL,
+    ids,
+  };
+};
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2e7ce2e60..5c303a1a0 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -236,10 +236,12 @@ class MediaGallery extends React.PureComponent {
     visible: PropTypes.bool,
     autoplay: PropTypes.bool,
     onToggleVisibility: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
     standalone: false,
+    quote: false,
   };
 
   state = {
@@ -310,7 +312,7 @@ class MediaGallery extends React.PureComponent {
   }
 
   render () {
-    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay } = this.props;
+    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay, quote } = this.props;
     const { visible } = this.state;
 
     const width = this.state.width || defaultWidth;
@@ -332,6 +334,10 @@ class MediaGallery extends React.PureComponent {
     const size     = media.take(4).size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
+    if (quote && style.height) {
+      style.height /= 2;
+    }
+
     if (standalone && this.isFullSizeEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />;
     } else {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f58..3019500ec 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -85,6 +85,7 @@ class Status extends ImmutablePureComponent {
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
     onToggleCollapsed: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -101,6 +102,7 @@ class Status extends ImmutablePureComponent {
       inUse: PropTypes.bool,
       available: PropTypes.bool,
     }),
+    contextType: PropTypes.string,
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -116,6 +118,7 @@ class Status extends ImmutablePureComponent {
 
   state = {
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     statusId: undefined,
   };
 
@@ -123,6 +126,7 @@ class Status extends ImmutablePureComponent {
     if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
       return {
         showMedia: defaultMediaVisibility(nextProps.status),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)),
         statusId: nextProps.status.get('id'),
       };
     } else {
@@ -134,6 +138,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleClick = () => {
     if (this.props.onClick) {
       this.props.onClick();
@@ -164,6 +172,15 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'quote', 'id'], status.getIn(['quote', 'id']))}`);
+  }
+
   handleAccountClick = (e) => {
     if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       const id = e.currentTarget.getAttribute('data-id');
@@ -180,6 +197,10 @@ class Status extends ImmutablePureComponent {
     this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this._properStatus());
+  };
+
   renderLoadingMediaGallery () {
     return <div className='media-gallery' style={{ height: '110px' }} />;
   }
@@ -279,11 +300,17 @@ class Status extends ImmutablePureComponent {
     this.node = c;
   }
 
+  _properQuoteStatus () {
+    const { status } = this.props;
+
+    return status.get('quote');
+  }
+
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText;
+    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -459,6 +486,106 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+        if (this.props.muted) {
+          quote_media = (
+            <AttachmentList
+              compact
+              media={quote_status.get('media_attachments')}
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+              {Component => (
+                <Component
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+                  peaks={[0]}
+                  height={70}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+              {Component => (
+                <Component
+                  preview={attachment.get('preview_url')}
+                  blurhash={attachment.get('blurhash')}
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  width={this.props.cachedMediaWidth}
+                  height={110}
+                  inline
+                  sensitive={quote_status.get('sensitive')}
+                  onOpenVideo={this.handleOpenVideo}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else {
+          quote_media = (
+            <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
+              {Component => (
+                <Component
+                  media={quote_status.get('media_attachments')}
+                  sensitive={quote_status.get('sensitive')}
+                  height={110}
+                  onOpenMedia={this.props.onOpenMedia}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  defaultWidth={this.props.cachedMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        }
+      }
+
+      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
+              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className='status__info'>
+              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
+                <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+                <DisplayName account={quote_status.get('account')} />
+              </a>
+            </div>
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    }
+
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
@@ -483,6 +610,7 @@ class Status extends ImmutablePureComponent {
 
             <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
 
+            {quote}
             {media}
 
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} {...other} />
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5cf7ca802..70081f45f 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -24,6 +24,7 @@ export default class StatusContent extends React.PureComponent {
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
     onCollapsedToggle: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   state = {
@@ -38,8 +39,6 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
-    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
-    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -48,12 +47,6 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
-      if (quote) {
-        if (link.href.match(QuoteUrlFormat)) {
-          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
-        }
-      }
-
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -185,7 +178,7 @@ export default class StatusContent extends React.PureComponent {
   }
 
   render () {
-    const { status } = this.props;
+    const { status, quote } = this.props;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
@@ -238,7 +231,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -248,7 +241,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -264,7 +257,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 43acf597d..8e0730625 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -25,6 +25,8 @@ import {
   hideStatus,
   revealStatus,
   toggleStatusCollapse,
+  hideQuote,
+  revealQuote,
 } from '../actions/statuses';
 import {
   unmuteAccount,
@@ -220,6 +222,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 515c79fca..a48289de2 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -7,13 +7,14 @@ import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { isRtl } from '../../../rtl';
+import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
 });
 
-@injectIntl
-export default class QuoteIndicator extends ImmutablePureComponent {
+export default @injectIntl
+class QuoteIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -30,7 +31,7 @@ export default class QuoteIndicator extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
@@ -60,6 +61,13 @@ export default class QuoteIndicator extends ImmutablePureComponent {
         </div>
 
         <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+
+        {status.get('media_attachments').size > 0 && (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        )}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
index eb67f3939..8a3ad4959 100644
--- a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -7,7 +7,7 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
   const mapStateToProps = state => ({
-    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+    status: getStatus(state, { id: state.getIn(['compose', 'quote_from']) }),
   });
 
   return mapStateToProps;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1da4b52a4..013dfed9a 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -283,7 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 317163648..f4d95b4cb 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -72,6 +72,7 @@ export default class Card extends React.PureComponent {
     defaultWidth: PropTypes.number,
     cacheWidth: PropTypes.func,
     sensitive: PropTypes.bool,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -188,7 +189,7 @@ export default class Card extends React.PureComponent {
   }
 
   render () {
-    const { card, maxDescription, compact } = this.props;
+    const { card, maxDescription, compact, quote } = this.props;
     const { width, embedded, revealed } = this.state;
 
     if (card === null) {
@@ -201,7 +202,11 @@ export default class Card extends React.PureComponent {
     const className   = classnames('status-card', { horizontal, compact, interactive });
     const title       = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
     const ratio       = card.get('width') / card.get('height');
-    const height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+    let height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+
+    if (quote && height) {
+      height /= 2;
+    }
 
     const description = (
       <div className='status-card__content'>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 043a749ed..ae90a622d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -46,6 +46,9 @@ class DetailedStatus extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     onToggleMediaVisibility: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func.isRequired,
+    showQuoteMedia: PropTypes.bool,
+    onToggleQuoteMediaVisibility: PropTypes.func,
   };
 
   state = {
@@ -102,6 +105,19 @@ class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this.props.status);
+  }
+
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['quote', 'id'])}`);
+  }
+
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
@@ -121,6 +137,73 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+
+        if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Audio
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              height={60}
+              preload
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Video
+              preview={attachment.get('preview_url')}
+              blurhash={attachment.get('blurhash')}
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              width={300}
+              height={150}
+              inline
+              onOpenVideo={this.handleOpenVideo}
+              sensitive={quote_status.get('sensitive')}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        } else {
+          quote_media = (
+            <MediaGallery
+              standalone
+              sensitive={quote_status.get('sensitive')}
+              media={quote_status.get('media_attachments')}
+              height={300}
+              onOpenMedia={this.props.onOpenMedia}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        }
+      }
+
+      quote = (
+        <div className='quote-status'>
+          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+          </a>
+
+          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+          {quote_media}
+        </div>
+      );
+    }
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
@@ -247,6 +330,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
 
+          {quote}
           {media}
 
           <div className='detailed-status__meta'>
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 0cd25955b..d25905d8e 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -32,6 +32,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../actions/statuses';
 import {
   unblockAccount,
@@ -181,6 +183,7 @@ class Status extends ImmutablePureComponent {
   state = {
     fullscreen: false,
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     loadedStatusId: undefined,
   };
 
@@ -199,7 +202,8 @@ class Status extends ImmutablePureComponent {
     }
 
     if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
-      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
+      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id'),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)) });
     }
   }
 
@@ -207,6 +211,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleFavouriteClick = (status) => {
     if (status.get('favourited')) {
       this.props.dispatch(unfavourite(status));
@@ -328,6 +336,14 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteToggleHidden = (status) => {
+    if (status.get('quote_hidden')) {
+      this.props.dispatch(revealQuote(status.get('id')));
+    } else {
+      this.props.dispatch(hideQuote(status.get('id')));
+    }
+  }
+
   handleToggleAll = () => {
     const { status, ancestorsIds, descendantsIds } = this.props;
     const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
@@ -562,6 +578,9 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  onQuoteToggleHidden={this.handleQuoteToggleHidden}
+                  showQuoteMedia={this.state.showQuoteMedia}
+                  onToggleQuoteMediaVisibility={this.handleToggleQuoteMediaVisibility}
                 />
 
                 <ActionBar
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 70e3cd6e8..d1857fdd5 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -122,6 +122,7 @@ class Video extends React.PureComponent {
     volume: PropTypes.number,
     muted: PropTypes.bool,
     componetIndex: PropTypes.number,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -523,7 +524,7 @@ class Video extends React.PureComponent {
   }
 
   render () {
-    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash } = this.props;
+    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash, quote } = this.props;
     const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
     const progress = Math.min((currentTime / duration) * 100, 100);
     const playerStyle = {};
@@ -537,6 +538,11 @@ class Video extends React.PureComponent {
       playerStyle.height = height;
     }
 
+    if (quote && height) {
+      height /= 2;
+      playerStyle.height = height;
+    }
+
     let preload;
 
     if (this.props.currentTime || fullscreen || dragging) {
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index f0522d148..7cbb11dc6 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -453,6 +453,10 @@
         "defaultMessage": "Quote",
         "id": "status.quote"
       },
+      {
+        "defaultMessage": "Unlisted quote",
+        "id": "status.unlisted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 732ff3026..50f292f55 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -402,7 +402,8 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定されたトゥート",
   "status.read_more": "もっと見る",
-  "status.quote": "引用ブースト",
+  "status.quote": "引用",
+  "status.unlisted_quote": "未収載の引用",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 596e1a68b..d3ca96a3e 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -62,7 +62,7 @@ const initialState = ImmutableMap({
   preselectDate: null,
   in_reply_to: null,
   quote_from: null,
-  quote_from_uri: null,
+  quote_from_url: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -252,6 +252,17 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const rejectQuoteAltText = html => {
+  const fragment = domParser.parseFromString(html, 'text/html').documentElement;
+
+  const quote_inline = fragment.querySelector('span.quote-inline');
+  if (quote_inline) {
+    quote_inline.remove();
+  }
+
+  return fragment.innerHTML;
+};
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -298,7 +309,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -318,12 +329,20 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', action.status.get('id'));
-      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('quote_from_url', action.status.get('url'));
       map.set('text', '');
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
       map.set('preselectDate', new Date());
       map.set('idempotencyKey', uuid());
+
+      if (action.status.get('spoiler_text').length > 0) {
+        map.set('spoiler', true);
+        map.set('spoiler_text', action.status.get('spoiler_text'));
+      } else {
+        map.set('spoiler', false);
+        map.set('spoiler_text', '');
+      }
     });
   case COMPOSE_REPLY_CANCEL:
   case COMPOSE_QUOTE_CANCEL:
@@ -331,7 +350,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
@@ -420,8 +439,10 @@ export default function compose(state = initialState, action) {
       }));
   case REDRAFT:
     return state.withMutations(map => {
-      map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
+      map.set('text', action.raw_text || unescapeHTML(rejectQuoteAltText(expandMentions(action.status))));
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
+      map.set('quote_from', action.status.getIn(['quote', 'id']));
+      map.set('quote_from_url', action.status.getIn(['quote', 'url']));
       map.set('privacy', action.status.get('visibility'));
       map.set('media_attachments', action.status.get('media_attachments'));
       map.set('focusDate', new Date());
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 875b2d92b..f139a124b 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -9,6 +9,7 @@ import {
   COMPOSE_MENTION,
   COMPOSE_REPLY,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
 } from '../actions/compose';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
@@ -36,6 +37,7 @@ export default function search(state = initialState, action) {
   case COMPOSE_REPLY:
   case COMPOSE_MENTION:
   case COMPOSE_DIRECT:
+  case COMPOSE_QUOTE:
     return state.set('hidden', true);
   case SEARCH_FETCH_SUCCESS:
     return state.set('results', ImmutableMap({
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 53dec9585..7f656ba90 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -13,6 +13,8 @@ import {
   STATUS_REVEAL,
   STATUS_HIDE,
   STATUS_COLLAPSE,
+  QUOTE_REVEAL,
+  QUOTE_HIDE,
 } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
@@ -75,6 +77,14 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_COLLAPSE:
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
+  case QUOTE_REVEAL:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], false));
+    });
+  case QUOTE_HIDE:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], true));
+    });
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
   default:
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8c5c15b8f..f6acf706c 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,6 +291,29 @@ function main() {
       }
     });
   });
+
+  delegate(document, '.quote-status', 'click', ({ target }) => {
+    if (target.closest('.status__content__spoiler-link') ||
+      target.closest('.media-gallery') ||
+      target.closest('.video-player') ||
+      target.closest('.audio-player')) {
+      return false;
+    }
+
+    let url = target.closest('.quote-status').getAttribute('dataurl');
+    if (target.closest('.status__display-name')) {
+      url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.status-card')) {
+      url = target.closest('.status-card').getAttribute('href');
+    }
+
+    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
+      window.location.href = url;
+    } else {
+      window.open(url, 'blank');
+    }
+    return false;
+  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0828ff07c..c329c3206 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1009,6 +1009,70 @@
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 }
 
+.quote-inline {
+  display: none;
+}
+
+.quote-status {
+  border: solid 1px $ui-base-lighter-color;
+  border-radius: 4px;
+  padding: 5px;
+  margin-top: 8px;
+  position: relative;
+
+  & > .unlisted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+
+    & > button {
+      color: $dark-text-color;
+      font-size: 100%;
+      background-color: transparent;
+      border: 0;
+      cursor: pointer;
+      outline: none;
+      padding: 0;
+      appearance: none;
+    }
+  }
+
+  .status__avatar,
+  .detailed-status__display-avatar {
+    height: 18px;
+    width: 18px;
+    position: absolute;
+    top: 5px !important;
+    left: 5px !important;
+    cursor: pointer;
+
+    & > div {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  .display-name__account {
+    color: $ui-base-lighter-color;
+  }
+
+  .display-name {
+    padding-left: 20px;
+  }
+
+  .detailed-status__display-name {
+    margin-bottom: 0px;
+
+    strong,
+    span {
+      display: inline;
+    }
+  }
+}
+
+.muted .quote-status .display-name {
+  color: $ui-base-lighter-color;
+}
+
 .status__prepend-icon-wrapper {
   left: -26px;
   position: absolute;
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 078714325..ad23efae8 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -63,6 +63,28 @@
       }
     }
 
+    .status.quote-status {
+      border: solid 1px $ui-base-lighter-color;
+      border-radius: 4px;
+      padding: 5px;
+      margin-top: 15px;
+      cursor: pointer;
+      width: 100%;
+
+      .status__avatar {
+        height: 18px;
+        width: 18px;
+        position: absolute;
+        top: 5px;
+        left: 5px;
+
+        & > div {
+          width: 18px;
+          height: 18px;
+        }
+      }
+    }
+
     @media screen and (max-width: 740px) {
       .detailed-status,
       .status,
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 9a2960507..8c937cd1f 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,6 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
+        quote: quote_from_url(@object['quoteUrl']),
       }
     end
   end
@@ -500,4 +501,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     poll.reload
     retry
   end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  end
 end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 2d6b87659..e6f8e4d37 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -24,6 +24,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+    quoteUrl: { 'quoteUrl' => 'as:quoteUrl' },
   }.freeze
 
   def self.default_key_transform
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index fd6537526..d94e01c07 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -38,11 +38,24 @@ class Formatter
     html = encode_and_link_urls(html, linkable_accounts)
     html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
+    html = quotify(html, status) if status.quote? && !options[:escape_quotify]
     html = html.delete("\n")
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
+  def format_in_quote(status, **options)
+    html = format(status)
+    return '' if html.empty?
+    doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
+    doc.search('span.invisible').remove
+    html = doc.css('body')[0].inner_html
+    html.sub!(/^<p>(.+)<\/p>$/, '\1')
+    html = Sanitize.clean(html).delete("\n").truncate(150)
+    html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
+    html.html_safe
+  end
+
   def reformat(html)
     sanitize(html, Sanitize::Config::MASTODON_STRICT)
   rescue ArgumentError
@@ -191,6 +204,12 @@ class Formatter
   end
   # rubocop:enable Metrics/BlockNesting
 
+  def quotify(html, status)
+    url = ActivityPub::TagManager.instance.url_for(status.quote)
+    link = encode_and_link_urls(url)
+    html.sub(/(<[^>]+>)\z/, "<span class=\"quote-inline\"><br/>QT: #{link}</span>\\1")
+  end
+
   def rewrite(text, entities)
     text = text.to_s
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 847921ac2..e06048679 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -23,6 +23,7 @@
 #  in_reply_to_account_id :bigint(8)
 #  poll_id                :bigint(8)
 #  deleted_at             :datetime
+#  quote_id               :bigint(8)
 #
 
 class Status < ApplicationRecord
@@ -55,6 +56,7 @@ class Status < ApplicationRecord
 
   belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
   belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
+  belongs_to :quote, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quoted, optional: true
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
@@ -63,6 +65,7 @@ class Status < ApplicationRecord
   has_many :mentions, dependent: :destroy, inverse_of: :status
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status
   has_many :media_attachments, dependent: :nullify
+  has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify
 
   has_and_belongs_to_many :tags
   has_and_belongs_to_many :preview_cards
@@ -169,6 +172,10 @@ class Status < ApplicationRecord
     !reblog_of_id.nil?
   end
 
+  def quote?
+    !quote_id.nil? && quote
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end
@@ -229,7 +236,7 @@ class Status < ApplicationRecord
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
   end
 
   def replies_count
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 6f9e1ca63..c8e6d939d 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,7 +7,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :quote_url
 
   attribute :content
   attribute :content_map, if: :language?
@@ -125,6 +125,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
   end
 
+  def quote_url
+    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+  end
+
   def local?
     object.account.local?
   end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bb6df90b7..67449716e 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -18,6 +18,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
+  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c5cd3096a..2defecd74 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -67,7 +67,7 @@ class FetchLinkCardService < BaseService
       urls = @status.text.scan(URL_PATTERN).map { |array| Addressable::URI.parse(array[1]).normalize }
     else
       html  = Nokogiri::HTML(@status.text)
-      links = html.css('a')
+      links = html.css(':not(.quote-inline) > a')
       urls  = links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
     end
 
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-    
+
     @card.save_with_optional_image!
   end
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 0a383d6a3..854e1d874 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -164,6 +164,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
+      quote_id: @options[:quote_id],
     }.compact
   end
 
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index daf164949..25231d440 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -25,6 +25,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 670, height: 380, detailed: true)
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
new file mode 100644
index 000000000..de5fb6762
--- /dev/null
+++ b/app/views/statuses/_quote_status.html.haml
@@ -0,0 +1,35 @@
+.status.quote-status{ dataurl:  ActivityPub::TagManager.instance.url_for(status) }
+  = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+    .status__avatar
+      %div
+        = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar'
+    %span.display-name
+      %bdi
+        %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true)
+      &nbsp;
+      %span.display-name__account
+        = acct(status.account)
+        = fa_icon('lock') if status.account.locked?
+
+  .status__content.emojify<
+    - if status.spoiler_text?
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+        %button.status__content__spoiler-link= t('statuses.show_more')
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+      = Formatter.instance.format_in_quote(status, custom_emojify: true)
+  
+  - if !status.media_attachments.empty?
+    - if status.media_attachments.first.video?
+      - video = status.media_attachments.first
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - elsif status.media_attachments.first.audio?
+      - audio = status.media_attachments.first
+      = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - else
+      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 728e6b9b0..d134b1008 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -34,6 +34,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "statuses/quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 610, height: 343)
diff --git a/db/migrate/20180419235016_add_quote_id_to_statuses.rb b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
new file mode 100644
index 000000000..d7550b248
--- /dev/null
+++ b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddQuoteIdToStatuses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :statuses, :quote_id, :bigint, null: true, default: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 583bdf317..7a47e6711 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -815,6 +815,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.bigint "in_reply_to_account_id"
     t.bigint "poll_id"
     t.datetime "deleted_at"
+    t.bigint "quote_id"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index a2e1d9d01..de6b132ee 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -31,6 +31,7 @@ class Sanitize
         next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
         next true if /^(mention|hashtag)$/.match?(e) # semantic classes
         next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
+        next true if /^quote-inline$/.match?(e) # quote inline classes
       end
 
       node['class'] = class_list.join(' ')

From 59749d09d9d4338801c29175f92236b0c4e54998 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 21 Feb 2020 21:49:06 +0900
Subject: [PATCH 092/200] Fix quote nesting at once, add quote_id

---
 app/serializers/rest/status_serializer.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 67449716e..12c386600 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -15,10 +15,11 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attribute :content, unless: :source_requested?
   attribute :text, if: :source_requested?
 
+  attribute :quote_id, if: -> { object.quote? }
+
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
-  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
@@ -40,6 +41,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.in_reply_to_account_id&.to_s
   end
 
+  def quote_id
+    object.quote_id.to_s
+  end
+
   def current_user?
     !current_user.nil?
   end
@@ -168,3 +173,13 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 end
+
+class REST::NestedQuoteSerializer < REST::StatusSerializer
+  attribute :quote do
+    nil
+  end
+end
+
+class REST::StatusSerializer < ActiveModel::Serializer
+  belongs_to :quote, serializer: REST::NestedQuoteSerializer
+end

From a825b89bf0c3e2b538d7e58456eb41c513395f05 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 11:36:40 +0900
Subject: [PATCH 093/200] Fix boost target to be quoted if boosted

---
 app/services/post_status_service.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 854e1d874..accfcec21 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -26,10 +26,12 @@ class PostStatusService < BaseService
     @options     = options
     @text        = @options[:text] || ''
     @in_reply_to = @options[:thread]
+    @quote_id    = @options[:quote_id]
 
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
+    preprocess_quote!
     preprocess_attributes!
 
     if scheduled?
@@ -58,6 +60,13 @@ class PostStatusService < BaseService
     raise ActiveRecord::RecordInvalid
   end
 
+  def preprocess_quote!
+    if @quote_id.present?
+      quote = Status.find(@quote_id)
+      @quote_id = quote.reblog_of_id.to_s if quote.reblog?
+    end
+  end
+
   def process_status!
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
@@ -164,7 +173,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
-      quote_id: @options[:quote_id],
+      quote_id: @quote_id,
     }.compact
   end
 

From ac776dbdfb25f22982fc7700040bb7ac6eadd85c Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 12:53:28 +0900
Subject: [PATCH 094/200] Add feature_quote to instance API

---
 app/serializers/rest/instance_serializer.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d39092b56..6683ac48f 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,7 +5,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
   attributes :uri, :title, :short_description, :description, :email,
              :version, :urls, :stats, :thumbnail,
-             :languages, :registrations, :approval_required, :invites_enabled
+             :languages, :registrations, :approval_required, :invites_enabled,
+             :feature_quote
 
   has_one :contact_account, serializer: REST::AccountSerializer
 
@@ -69,6 +70,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     Setting.min_invite_role == 'user'
   end
 
+  def feature_quote
+    true
+  end
+
   private
 
   def instance_presenter

From 67cb007e5e0c94480eb05590a3c19b787f59150f Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 14:19:46 +0900
Subject: [PATCH 095/200] Add confirmation of overwriting of input content when
 quoting

---
 .../mastodon/containers/status_container.js      | 16 +++++++++++++++-
 app/javascript/mastodon/features/status/index.js | 15 +++++++++++++--
 app/javascript/mastodon/locales/en.json          |  2 ++
 app/javascript/mastodon/locales/ja.json          |  2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 8e0730625..ce055cd96 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -53,6 +53,8 @@ const messages = defineMessages({
   redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -103,7 +105,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onQuote (status, router) {
-    dispatch(quoteCompose(status, router));
+    dispatch((_, getState) => {
+      let state = getState();
+
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.quoteMessage),
+          confirm: intl.formatMessage(messages.quoteConfirm),
+          onConfirm: () => dispatch(quoteCompose(status, router)),
+        }));
+      } else {
+        dispatch(quoteCompose(status, router));
+      }
+    });
   },
 
   onFavourite (status) {
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index d25905d8e..ce0a26cb3 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -71,6 +71,8 @@ const messages = defineMessages({
   detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -268,8 +270,17 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-    handleQuoteClick = (status) => {
-    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  handleQuoteClick = (status) => {
+    let { askReplyConfirmation, dispatch, intl } = this.props;
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: () => dispatch(quoteCompose(status, this.context.router.history)),
+      }));
+    } else {
+      dispatch(quoteCompose(status, this.context.router.history));
+    }
   }
 
   handleDeleteClick = (status, history, withRedraft = false) => {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7ddd4908b..69668a201 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.quote.confirm": "Quote",
+  "confirmations.quote.message": "Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 50f292f55..392d92d32 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.explanation": "これにより相手のトゥートと返信は見えなくなりますが、相手はあなたをフォローし続けトゥートを見ることができます。",
   "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
+  "confirmations.quote.confirm": "引用",
+  "confirmations.quote.message": "今引用すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "本当にこのトゥートを削除して下書きに戻しますか？ このトゥートへのお気に入り登録やブーストは失われ、返信は孤立することになります。",
   "confirmations.reply.confirm": "返信",

From 23340f862b18355cc9fbafd05295b36c1d8876a9 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 28 Feb 2020 07:45:54 +0900
Subject: [PATCH 096/200] Fix to reject status quotations other than public and
 unlisted

---
 app/models/status.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/status.rb b/app/models/status.rb
index e06048679..6e088570d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -80,6 +80,7 @@ class Status < ApplicationRecord
   validates_with DisallowedHashtagsValidator
   validates :reblog, uniqueness: { scope: :account }, if: :reblog?
   validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog?
+  validates :quote_visibility, inclusion: { in: %w(public unlisted) }, if: :quote?
 
   accepts_nested_attributes_for :poll
 
@@ -176,6 +177,10 @@ class Status < ApplicationRecord
     !quote_id.nil? && quote
   end
 
+  def quote_visibility
+    quote&.visibility
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end

From fb0a34585e26a63926daeec7ae473ba7ce246459 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 1 Mar 2020 19:31:59 +0900
Subject: [PATCH 097/200] Add index to statuses quote_id

---
 .../20200301102028_add_index_to_statuses_quote_id.rb     | 9 +++++++++
 db/schema.rb                                             | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 db/migrate/20200301102028_add_index_to_statuses_quote_id.rb

diff --git a/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
new file mode 100644
index 000000000..45293db98
--- /dev/null
+++ b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexToStatusesQuoteId < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :quote_id, algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7a47e6711..fff9e49ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -821,6 +821,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["quote_id"], name: "index_statuses_on_quote_id"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
     t.index ["uri"], name: "index_statuses_on_uri", unique: true
   end

From 2a8f4b5e04e86a7c0bcec2fb8879912ba1ab8aab Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 23:56:04 +0900
Subject: [PATCH 098/200] Change not to delete the element specified in
 invisible

---
 app/javascript/mastodon/actions/importer/normalizer.js | 1 -
 app/lib/formatter.rb                                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index d274a0226..1b9d781a7 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -92,7 +92,6 @@ export function normalizeStatus(status, normalOldStatus) {
       normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
       normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
       let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
-      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
       Array.from(docElem.querySelectorAll('p,br'), line => {
         let parentNode = line.parentNode;
         if (line.nextSibling) {
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d94e01c07..85f1de9d6 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -48,7 +48,6 @@ class Formatter
     html = format(status)
     return '' if html.empty?
     doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
-    doc.search('span.invisible').remove
     html = doc.css('body')[0].inner_html
     html.sub!(/^<p>(.+)<\/p>$/, '\1')
     html = Sanitize.clean(html).delete("\n").truncate(150)

From f63fe2bd7ddb74dfd447300e4cbb391319d6e922 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 20:20:08 +0900
Subject: [PATCH 099/200] Compatible with Misskey quote

---
 app/lib/activitypub/activity/create.rb         | 12 ++++++++++--
 app/lib/activitypub/case_transform.rb          |  2 ++
 app/serializers/activitypub/note_serializer.rb | 13 +++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 8c937cd1f..2edeae0d3 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,7 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
-        quote: quote_from_url(@object['quoteUrl']),
+        quote: quote,
       }
     end
   end
@@ -383,7 +383,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def text_from_content
     return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || object_uri].join(' ')) if converted_object_type?
 
-    if @object['content'].present?
+    if @object['quoteUrl'].blank? && @object['_misskey_quote'].present?
+      Formatter.instance.linkify(@object['_misskey_content'])
+    elsif @object['content'].present?
       @object['content']
     elsif content_language_map?
       @object['contentMap'].values.first
@@ -502,10 +504,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     retry
   end
 
+  def quote
+    @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
     quote = ResolveURLService.new.call(url)
     status_from_uri(quote.uri) if quote
+  rescue
+    nil
   end
 end
diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb
index 7f716f862..ef0c6e1f9 100644
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@@ -14,6 +14,8 @@ module ActivityPub::CaseTransform
       when String
         camel_lower_cache[value] ||= if value.start_with?('_:')
                                        '_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower)
+                                     elsif value.start_with?('_')
+                                       value
                                      else
                                        value.underscore.camelize(:lower)
                                      end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index c8e6d939d..43e6e626c 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,8 +7,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation, :quote_url
+             :conversation
 
+  attribute :quote_url, if: -> { object.quote? }
+  attribute :misskey_quote, key: :_misskey_quote, if: -> { object.quote? }
+  attribute :misskey_content, key: :_misskey_content, if: -> { object.quote? }
   attribute :content
   attribute :content_map, if: :language?
 
@@ -126,7 +129,13 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def quote_url
-    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+    ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote?
+  end
+
+  alias misskey_quote quote_url
+
+  def misskey_content
+    object.text if object.quote?
   end
 
   def local?

From f41ffecaf408efe11814b4d97d03734ec102b7ca Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 29 Nov 2019 12:10:59 +0900
Subject: [PATCH 100/200] Apply quote by parsing post body

---
 app/lib/activitypub/activity/create.rb |  8 ++++++++
 app/services/post_status_service.rb    | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2edeae0d3..dbd191103 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -73,6 +73,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @mentions = []
     @params   = {}
 
+    process_quote
     process_status_params
     process_tags
     process_audience
@@ -508,6 +509,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
   end
 
+  def process_quote
+    if quote.nil? && md = @object['content']&.match(/QT:\s*\[<a href=\"([^\"]+).*?\]/)
+      @quote = quote_from_url(md[1])
+      @object['content'] = @object['content'].sub(/QT:\s*\[.*?\]/, '<span class="quote-inline"><br/>\1</span>')
+    end
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index accfcec21..f594b02a2 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -31,8 +31,8 @@ class PostStatusService < BaseService
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
-    preprocess_quote!
     preprocess_attributes!
+    preprocess_quote!
 
     if scheduled?
       schedule_status!
@@ -49,6 +49,19 @@ class PostStatusService < BaseService
 
   private
 
+  def status_from_uri(uri)
+    ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+  end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  rescue
+    nil
+  end
+
   def preprocess_attributes!
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@@ -56,6 +69,10 @@ class PostStatusService < BaseService
     @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+    if @quote_id.nil? && md = @text.match(/QT:\s*\[\s*(https:\/\/.+?)\s*\]/)
+      @quote_id = quote_from_url(md[1])&.id
+      @text.sub!(/QT:\s*\[.*?\]/, '')
+    end
   rescue ArgumentError
     raise ActiveRecord::RecordInvalid
   end

From 85358142adcadf533c6288185535695bb42c6d2e Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 14:09:06 +0900
Subject: [PATCH 101/200] Add "Show poll" link to quoted poll

---
 app/javascript/mastodon/components/poll.js      |  5 ++++-
 .../mastodon/components/status_content.js       | 17 ++++++++++++++---
 app/javascript/mastodon/locales/en.json         |  1 +
 app/javascript/mastodon/locales/ja.json         |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 477f56e13..1126b0121 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -39,6 +39,9 @@ class Poll extends ImmutablePureComponent {
 
   static getDerivedStateFromProps (props, state) {
     const { poll, intl } = props;
+    if (!poll) {
+      return null;
+    }
     const expires_at = poll.get('expires_at');
     const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
     return (expired === state.expired) ? null : { expired };
@@ -59,7 +62,7 @@ class Poll extends ImmutablePureComponent {
   _setupTimer () {
     const { poll, intl } = this.props;
     clearTimeout(this._timer);
-    if (!this.state.expired) {
+    if (!this.state.expired && !!poll) {
       const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 70081f45f..71fbbd7c5 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -183,6 +183,7 @@ export default class StatusContent extends React.PureComponent {
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+    const renderShowPoll = !!status.get('poll');
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
@@ -204,6 +205,16 @@ export default class StatusContent extends React.PureComponent {
       </button>
     );
 
+    const showPollButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick} key='show-poll'>
+        <FormattedMessage id='status.show_poll' defaultMessage='Show poll' /><Icon id='angle-right' fixedWidth />
+      </button>
+    );
+
+    const pollContainer = (
+      <PollContainer pollId={status.get('poll')} />
+    );
+
     if (status.get('spoiler_text').length > 0) {
       let mentionsPlaceholder = '';
 
@@ -231,7 +242,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!hidden && renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -241,7 +252,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -257,7 +268,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 69668a201..6e69d7c4d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -420,6 +420,7 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
+  "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 392d92d32..d593f99f5 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -421,6 +421,7 @@
   "status.show_less_all": "全て隠す",
   "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
+  "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
   "status.unmute_conversation": "会話のミュートを解除",

From 0a13f770141abe75b4b00768331ac796adcac944 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 4 Jun 2020 05:28:05 +0900
Subject: [PATCH 102/200] Fix an avatar icon size of the status quoted on the
 public page

---
 app/javascript/styles/mastodon/statuses.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ad23efae8..ab91b3123 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -78,7 +78,7 @@
         top: 5px;
         left: 5px;
 
-        & > div {
+        & img {
           width: 18px;
           height: 18px;
         }

From 6bd36b238d135713adddd5e56ab26d6dcb510ebd Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 26 Jun 2020 07:26:25 +0900
Subject: [PATCH 103/200] Fix tooltip 'cannot be quoted'

---
 app/javascript/mastodon/components/status_action_bar.js       | 4 ++--
 .../mastodon/features/status/components/action_bar.js         | 3 ++-
 app/javascript/mastodon/locales/en.json                       | 1 +
 app/javascript/mastodon/locales/ja.json                       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 804e05717..a6447b8ab 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -23,6 +23,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -332,8 +333,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
-
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {shareButton}
 
         <div className='status__action-bar-dropdown'>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 013dfed9a..61833f37b 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -17,6 +17,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -283,7 +284,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6e69d7c4d..e4d97fc34 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -386,6 +386,7 @@
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
+  "status.cannot_quote": "This post cannot be quoted",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index d593f99f5..5a4f5d87f 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -386,6 +386,7 @@
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
   "status.cancel_reblog_private": "ブースト解除",
+  "status.cannot_quote": "この投稿は引用できません",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.copy": "トゥートへのリンクをコピー",
   "status.delete": "削除",

From 6ef313740e2161b13000ce6e0d11dba90811e0dd Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 25 Jul 2020 19:16:43 +0900
Subject: [PATCH 104/200] Fix quoted audio

---
 app/javascript/mastodon/components/status.js              | 8 ++++++--
 .../features/status/components/detailed_status.js         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3019500ec..937b618c1 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -508,10 +508,14 @@ class Status extends ImmutablePureComponent {
                 <Component
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
+                  poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+                  backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+                  foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+                  accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
                   duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-                  peaks={[0]}
+                  width={this.props.cachedMediaWidth}
                   height={70}
-                  quote
+                  cacheWidth={this.props.cacheMediaWidth}
                 />
               )}
             </Bundle>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index ae90a622d..242b4aee9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -152,8 +152,11 @@ class DetailedStatus extends ImmutablePureComponent {
               src={attachment.get('url')}
               alt={attachment.get('description')}
               duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+              backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+              foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+              accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
               height={60}
-              preload
             />
           );
         } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {

From 2edd62c796f0c4e257085c25ef7e111626932c43 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Wed, 7 Oct 2020 22:28:02 +0900
Subject: [PATCH 105/200] Fix PictureInPicture to work in quotes

---
 app/javascript/mastodon/components/status.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 937b618c1..39ca49693 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -381,10 +381,10 @@ class Status extends ImmutablePureComponent {
       status  = status.get('reblog');
     }
 
-    if (pictureInPicture.get('inUse')) {
-      media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
-    } else if (status.get('media_attachments').size > 0) {
-      if (this.props.muted) {
+    if (status.get('media_attachments').size > 0) {
+      if (pictureInPicture.get('inUse')) {
+        media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+      } else if (this.props.muted) {
         media = (
           <AttachmentList
             compact
@@ -492,7 +492,9 @@ class Status extends ImmutablePureComponent {
 
       let quote_media = null;
       if (quote_status.get('media_attachments').size > 0) {
-        if (this.props.muted) {
+        if (pictureInPicture.get('inUse')) {
+          quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+        } else if (this.props.muted) {
           quote_media = (
             <AttachmentList
               compact
@@ -516,7 +518,8 @@ class Status extends ImmutablePureComponent {
                   width={this.props.cachedMediaWidth}
                   height={70}
                   cacheWidth={this.props.cacheMediaWidth}
-                />
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                  />
               )}
             </Bundle>
           );
@@ -537,6 +540,7 @@ class Status extends ImmutablePureComponent {
                   sensitive={quote_status.get('sensitive')}
                   onOpenVideo={this.handleOpenVideo}
                   cacheWidth={this.props.cacheMediaWidth}
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
                   onToggleVisibility={this.handleToggleQuoteMediaVisibility}
                   quote

From 8402b7063e07361f086de4e32adcb44008f9641b Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 6 Jun 2020 12:59:45 +0900
Subject: [PATCH 106/200] Fix to hide mute and blocked quotes

---
 .../api/v1/accounts/statuses_controller.rb    |  5 +-
 .../api/v1/bookmarks_controller.rb            |  5 +-
 .../api/v1/favourites_controller.rb           |  5 +-
 app/controllers/api/v1/statuses_controller.rb |  3 +-
 .../api/v1/timelines/home_controller.rb       |  4 +-
 .../api/v1/timelines/list_controller.rb       |  5 +-
 .../api/v1/timelines/public_controller.rb     |  6 +-
 .../api/v1/timelines/tag_controller.rb        |  5 +-
 app/javascript/mastodon/actions/bookmarks.js  |  4 +
 app/javascript/mastodon/actions/favourites.js |  4 +
 .../mastodon/actions/importer/index.js        |  4 +
 .../mastodon/actions/notifications.js         |  2 +-
 app/javascript/mastodon/actions/timelines.js  |  4 +
 app/javascript/mastodon/components/status.js  | 56 ++++++++++--
 .../status/components/detailed_status.js      | 65 +++++++++++--
 .../mastodon/locales/defaultMessages.json     |  4 +
 app/javascript/mastodon/locales/en.json       |  4 +-
 app/javascript/mastodon/locales/ja.json       |  5 +-
 app/javascript/mastodon/selectors/index.js    | 30 +++++-
 app/javascript/mastodon/utils/uniq.js         |  3 +
 .../styles/mastodon/components.scss           | 91 ++++---------------
 app/serializers/rest/status_serializer.rb     | 10 ++
 22 files changed, 219 insertions(+), 105 deletions(-)
 create mode 100644 app/javascript/mastodon/utils/uniq.js

diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 92ccb8061..f301666db 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -7,8 +7,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index aa3fb88f0..f666a1d8d 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::BookmarksController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 21836bc17..651a057d5 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::FavouritesController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 1e23cf300..d8f4db42f 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -30,8 +30,9 @@ class Api::V1::StatusesController < Api::BaseController
 
     @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
     statuses = [@status] + @context.ancestors + @context.descendants
+    accountIds = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
-    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
+    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   def create
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ae6dbcb8b..c07e1a820 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -6,11 +6,13 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id),
            status: account_home_feed.regenerating? ? 206 : 200
   end
 
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index a15eae468..bc13ed5ec 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -9,9 +9,12 @@ class Api::V1::Timelines::ListController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
-           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index d253b744f..1a778012b 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -5,8 +5,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 64a1db58d..c7afd4580 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -5,8 +5,9 @@ class Api::V1::Timelines::TagController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 544ed2ff2..b3e0a2ab4 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
 export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchBookmarkedStatuses() {
     api(getState).get('/api/v1/bookmarks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchBookmarkedStatusesFail(error));
@@ -61,6 +64,7 @@ export function expandBookmarkedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandBookmarkedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 9448b1efe..9b28ac4c4 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchFavouritedStatuses() {
     api(getState).get('/api/v1/favourites').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchFavouritedStatusesFail(error));
@@ -64,6 +67,7 @@ export function expandFavouritedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandFavouritedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index f4372fb31..35032fc70 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -70,6 +70,10 @@ export function importFetchedStatuses(statuses) {
         processStatus(status.reblog);
       }
 
+      if (status.quote && status.quote.id) {
+        processStatus(status.quote);
+      }
+
       if (status.poll && status.poll.id) {
         pushUnique(polls, normalizePoll(status.poll));
       }
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 3464ac995..22f1e0cbb 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -46,7 +46,7 @@ defineMessages({
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
-  const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id);
+  const accountIds = notifications.map(item => item.account.id);
 
   if (accountIds.length > 0) {
     dispatch(fetchRelationships(accountIds));
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 31ae09e4a..d82bf1d0d 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,9 +1,11 @@
+import { fetchRelationships } from './accounts';
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { submitMarkers } from './markers';
 import api, { getLinks } from 'mastodon/api';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import compareId from 'mastodon/compare_id';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
+import { uniq } from '../utils/uniq';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
@@ -39,6 +41,7 @@ export function updateTimeline(timeline, status, accept) {
     }
 
     dispatch(importFetchedStatus(status));
+    dispatch(fetchRelationships([status.reblog ? status.reblog.account.id : status.account.id, status.quote ? status.quote.account.id : null].filter(function(e){return e})));
 
     dispatch({
       type: TIMELINE_UPDATE,
@@ -111,6 +114,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id).concat(response.data.map(item => item.quote ? item.quote.account.id : null)).filter(function(e){return e}))));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
       if (timelineId === 'home') {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 39ca49693..f4d80c00e 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
@@ -23,6 +24,29 @@ import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
 export const textForScreenReader = (intl, status, rebloggedByText = false) => {
   const displayName = status.getIn(['account', 'display_name']);
 
@@ -59,7 +83,8 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default @injectIntl
+export default @connect(mapStateToProps)
+@injectIntl
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -70,6 +95,7 @@ class Status extends ImmutablePureComponent {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.map,
     otherAccounts: ImmutablePropTypes.list,
+    quote_muted: PropTypes.bool,
     onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
@@ -114,6 +140,7 @@ class Status extends ImmutablePureComponent {
     'hidden',
     'unread',
     'pictureInPicture',
+    'quote_muted',
   ];
 
   state = {
@@ -308,9 +335,9 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
+    let statusAvatar, prepend, rebloggedByText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType, quote_muted } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -569,12 +596,21 @@ class Status extends ImmutablePureComponent {
         }
       }
 
-      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
-        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+      if (quote_muted) {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
-              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+              <button onClick={this.handleQuoteClick}>
+                <FormattedMessage id='status.unlisted_quote' defaultMessage='Unlisted quote' />
+              </button>
             </div>
           </div>
         );
@@ -592,6 +628,14 @@ class Status extends ImmutablePureComponent {
           </div>
         );
       }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
+        </div>
+      );
     }
 
     return (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 242b4aee9..2344d8019 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Avatar from '../../../components/avatar';
@@ -6,7 +7,7 @@ import DisplayName from '../../../components/display_name';
 import StatusContent from '../../../components/status_content';
 import MediaGallery from '../../../components/media_gallery';
 import { Link } from 'react-router-dom';
-import { injectIntl, defineMessages, FormattedDate } from 'react-intl';
+import { injectIntl, defineMessages, FormattedDate, FormattedMessage } from 'react-intl';
 import Card from './card';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
@@ -24,7 +25,31 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default  @injectIntl
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
+export default @connect(mapStateToProps)
+@injectIntl
 class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -33,6 +58,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map,
+    quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
@@ -120,6 +146,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
+    const quote_muted = this.props.quote_muted
     const outerStyle = { boxSizing: 'border-box' };
     const { intl, compact, pictureInPicture } = this.props;
 
@@ -194,15 +221,33 @@ class DetailedStatus extends ImmutablePureComponent {
         }
       }
 
-      quote = (
-        <div className='quote-status'>
-          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
-            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
-          </a>
+      if (quote_muted) {
+        quote = (
+          <div className='quote-status'>
+            <div className='status__content muted-quote'>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className='quote-status'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+              <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+              <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+            </a>
 
-          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
-          {quote_media}
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
         </div>
       );
     }
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 7cbb11dc6..321d7507d 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -457,6 +457,10 @@
         "defaultMessage": "Unlisted quote",
         "id": "status.unlisted_quote"
       },
+      {
+        "defaultMessage": "Muted quote",
+        "id": "status.muted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e4d97fc34..8e9eeff8f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -401,11 +401,12 @@
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
+  "status.muted_quote": "Muted quote",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
-  "status.read_more": "Read more",
   "status.quote": "Quote",
+  "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
@@ -424,6 +425,7 @@
   "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
+  "status.unlisted_quote": "Unlisted quote",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "suggestions.dismiss": "Dismiss suggestion",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 5a4f5d87f..b28787275 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -401,12 +401,12 @@
   "status.more": "もっと見る",
   "status.mute": "@{name}さんをミュート",
   "status.mute_conversation": "会話をミュート",
+  "status.muted_quote": "ミュートされた引用",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定されたトゥート",
-  "status.read_more": "もっと見る",
   "status.quote": "引用",
-  "status.unlisted_quote": "未収載の引用",
+  "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
@@ -425,6 +425,7 @@
   "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
+  "status.unlisted_quote": "未収載の引用",
   "status.unmute_conversation": "会話のミュートを解除",
   "status.unpin": "プロフィールへの固定を解除",
   "suggestions.dismiss": "隠す",
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d..f84152199 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -88,22 +88,49 @@ export const makeGetStatus = () => {
     [
       (state, { id }) => state.getIn(['statuses', id]),
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
+      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
 
+      accountBase = accountBase.withMutations(map => {
+        map.set('relationship', relationship);
+        map.set('moved', moved);
+      });
+
       if (statusReblog) {
+        accountReblog = accountReblog.withMutations(map => {
+          map.set('relationship', reblogRelationship);
+          map.set('moved', reblogMoved);
+        });
         statusReblog = statusReblog.set('account', accountReblog);
       } else {
         statusReblog = null;
       }
 
+      if (statusQuote) {
+        accountQuote = accountQuote.withMutations(map => {
+          map.set('relationship', quoteRelationship);
+          map.set('moved', quoteMoved);
+        });
+        statusQuote = statusQuote.set('account', accountQuote);
+      } else {
+        statusQuote = null;
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;
@@ -114,6 +141,7 @@ export const makeGetStatus = () => {
 
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
+        map.set('quote', statusQuote);
         map.set('account', accountBase);
         map.set('filtered', filtered);
       });
diff --git a/app/javascript/mastodon/utils/uniq.js b/app/javascript/mastodon/utils/uniq.js
new file mode 100644
index 000000000..00f1804a1
--- /dev/null
+++ b/app/javascript/mastodon/utils/uniq.js
@@ -0,0 +1,3 @@
+export const uniq = array => {
+  return array.filter((x, i, self) => self.indexOf(x) === i)
+};
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c329c3206..46194812f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1036,6 +1036,12 @@
     }
   }
 
+  & > .muted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+    font-size: 100%;
+  }
+
   .status__avatar,
   .detailed-status__display-avatar {
     height: 18px;
@@ -1531,77 +1537,6 @@ a .account__avatar {
   }
 }
 
-.account__action-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  line-height: 36px;
-  overflow: hidden;
-  flex: 0 0 auto;
-  display: flex;
-}
-
-.account__action-bar-dropdown {
-  padding: 10px;
-
-  .icon-button {
-    vertical-align: middle;
-  }
-
-  .dropdown--active {
-    .dropdown__content.dropdown__right {
-      left: 6px;
-      right: initial;
-    }
-
-    &::after {
-      bottom: initial;
-      margin-left: 11px;
-      margin-top: -7px;
-      right: initial;
-    }
-  }
-}
-
-.account__action-bar-links {
-  display: flex;
-  flex: 1 1 auto;
-  line-height: 18px;
-  text-align: center;
-}
-
-.account__action-bar__tab {
-  text-decoration: none;
-  overflow: hidden;
-  flex: 0 1 100%;
-  border-right: 1px solid lighten($ui-base-color, 8%);
-  padding: 10px 0;
-  border-bottom: 4px solid transparent;
-
-  &.active {
-    border-bottom: 4px solid $ui-highlight-color;
-  }
-
-  & > span {
-    display: block;
-    text-transform: uppercase;
-    font-size: 11px;
-    color: $darker-text-color;
-  }
-
-  strong {
-    display: block;
-    font-size: 15px;
-    font-weight: 500;
-    color: $primary-text-color;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-}
-
 .account-authorize {
   padding: 14px 10px;
 
@@ -1688,6 +1623,15 @@ a.account__display-name {
   margin-right: 10px;
 }
 
+.account__action-bar {
+  position: absolute;
+  height: 24px;
+  width: 48px;
+  top: 60px;
+  left: 10px;
+  z-index: 1;
+}
+
 .status__avatar {
   height: 48px;
   left: 10px;
@@ -2456,6 +2400,11 @@ a.account__display-name {
         margin-right: 15px;
       }
     }
+
+    .account__action-bar {
+      top: 67px;
+      left: 15px;
+    }
   }
 }
 
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 12c386600..f49b365bf 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -178,6 +178,16 @@ class REST::NestedQuoteSerializer < REST::StatusSerializer
   attribute :quote do
     nil
   end
+  attribute :quote_muted, if: :current_user?
+
+  def quote_muted
+    if instance_options && instance_options[:account_relationships]
+      instance_options[:account_relationships].muting[object.account_id] ? true : false || instance_options[:account_relationships].blocking[object.account_id] || instance_options[:account_relationships].blocked_by[object.account_id] || instance_options[:account_relationships].domain_blocking[object.account_id] || false
+    else
+      current_user.account.muting?(object.account) || object.account.blocking?(current_user.account) || current_user.account.blocking?(object.account) || current_user.account.domain_blocking?(object.account.domain) 
+    end
+  end
+
 end
 
 class REST::StatusSerializer < ActiveModel::Serializer

From 0b1b03ffa1768e371359d5986215080d6f3f7bd0 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 27 Dec 2020 21:53:54 +0900
Subject: [PATCH 107/200] Add quote button in PiP

---
 .../picture_in_picture/components/footer.js   | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 1ecb18bf8..c89b86ffe 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button';
 import classNames from 'classnames';
 import { me, boostModal } from 'mastodon/initial_state';
 import { defineMessages, injectIntl } from 'react-intl';
-import { replyCompose } from 'mastodon/actions/compose';
+import { replyCompose, quoteCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { makeGetStatus } from 'mastodon/selectors';
 import { initBoostModal } from 'mastodon/actions/boosts';
@@ -20,9 +20,13 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
@@ -119,6 +123,31 @@ class Footer extends ImmutablePureComponent {
     router.history.push(`/statuses/${status.get('id')}`);
   }
 
+  _performQuote = () => {
+    const { dispatch, status, onClose } = this.props;
+    const { router } = this.context;
+
+    if (onClose) {
+      onClose();
+    }
+
+    dispatch(quoteCompose(status, router.history));
+  };
+
+  handleQuoteClick = () => {
+    const { dispatch, askReplyConfirmation, intl } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: this._performQuote,
+      }));
+    } else {
+      this._performQuote();
+    }
+  }
+
   render () {
     const { status, intl, withOpenButton } = this.props;
 
@@ -152,6 +181,7 @@ class Footer extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        <IconButton className='status__action-bar-button' disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
       </div>
     );

From 7f6d6577df621a72ff095cd1733ddb9031feff69 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 8 Dec 2020 22:58:24 +0900
Subject: [PATCH 108/200] Fix Open handler in quote media

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index f4d80c00e..fe2ee6a0f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -583,7 +583,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.props.onOpenMedia}
+                  onOpenMedia={this.handleOpenMedia}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}

From 42fe8c7279ad356715e3d882c3a4cfb4f989cb4a Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 19 Dec 2020 10:14:10 +0900
Subject: [PATCH 109/200] fix rtl in quote_indicator

---
 .../mastodon/features/compose/components/quote_indicator.js | 6 +-----
 app/views/statuses/_quote_status.html.haml                  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index a48289de2..1d4c6a341 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,7 +6,6 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
 import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
@@ -45,9 +44,6 @@ class QuoteIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
 
     return (
       <div className='quote-indicator'>
@@ -60,7 +56,7 @@ class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+        <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
           <AttachmentList
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index de5fb6762..f2fc02258 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -16,7 +16,7 @@
       %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" }
       = Formatter.instance.format_in_quote(status, custom_emojify: true)
   
   - if !status.media_attachments.empty?

From 6de350fdbcd237777cdca735e2c3b5f71bfeef01 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 31 Dec 2020 08:27:24 +0900
Subject: [PATCH 110/200] Fix expand video on public page for quote

---
 app/views/statuses/_quote_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index f2fc02258..fa0b7b1b1 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -22,7 +22,7 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json, quote: true do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first

From 8f234af62c95a143e638853eea07fe26a81b9c40 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 3 Jan 2021 23:19:41 +0900
Subject: [PATCH 111/200] Fix quoted account link in detailed status

---
 .../mastodon/features/status/components/detailed_status.js   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 2344d8019..8b9f3d711 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -83,8 +83,9 @@ class DetailedStatus extends ImmutablePureComponent {
 
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
+      const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${id}`);
     }
 
     e.stopPropagation();
@@ -232,7 +233,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status'>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>

From e99b8ef4bc69711eeb26ced0ec07d0d7590eaf9d Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 00:28:17 +0900
Subject: [PATCH 112/200] Fix modal footer to react to quoted posts

---
 app/javascript/mastodon/components/status.js  | 31 +++++++++++++------
 .../status/components/detailed_status.js      | 10 ++++--
 .../mastodon/features/status/index.js         | 10 ++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index fe2ee6a0f..b12b02dbd 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -245,10 +245,19 @@ class Status extends ImmutablePureComponent {
     this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    const status = this._properQuoteStatus();
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
+  }
+
   handleOpenMedia = (media, index) => {
     this.props.onOpenMedia(this._properStatus().get('id'), media, index);
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.onOpenMedia(this._properQuoteStatus().get('id'), media, index);
+  }
+
   handleHotkeyOpenMedia = e => {
     const { onOpenMedia, onOpenVideo } = this.props;
     const status = this._properStatus();
@@ -323,14 +332,18 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-  handleRef = c => {
-    this.node = c;
+  _properQuoteStatus () {
+    const status = this._properStatus();
+
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
+      return status.get('quote');
+    } else {
+      return status;
+    }
   }
 
-  _properQuoteStatus () {
-    const { status } = this.props;
-
-    return status.get('quote');
+  handleRef = c => {
+    this.node = c;
   }
 
   render () {
@@ -514,7 +527,7 @@ class Status extends ImmutablePureComponent {
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
     let quote = null;
-    if (status.get('quote', null) !== null) {
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
       let quote_status = status.get('quote');
 
       let quote_media = null;
@@ -565,7 +578,7 @@ class Status extends ImmutablePureComponent {
                   height={110}
                   inline
                   sensitive={quote_status.get('sensitive')}
-                  onOpenVideo={this.handleOpenVideo}
+                  onOpenVideo={this.handleOpenVideoQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
@@ -583,7 +596,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.handleOpenMedia}
+                  onOpenMedia={this.handleOpenMediaQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 8b9f3d711..3856bb47c 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -61,6 +61,8 @@ class DetailedStatus extends ImmutablePureComponent {
     quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
+    onOpenMediaQuote: PropTypes.func.isRequired,
+    onOpenVideoQuote: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
     measureHeight: PropTypes.bool,
     onHeightChange: PropTypes.func,
@@ -95,6 +97,10 @@ class DetailedStatus extends ImmutablePureComponent {
     this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    this.props.onOpenVideoQuote(this.props.status.getIn(['quote', 'media_attachments', 0]), options);
+  }
+
   handleExpandedToggle = () => {
     this.props.onToggleHidden(this.props.status);
   }
@@ -199,7 +205,7 @@ class DetailedStatus extends ImmutablePureComponent {
               width={300}
               height={150}
               inline
-              onOpenVideo={this.handleOpenVideo}
+              onOpenVideo={this.handleOpenVideoQuote}
               sensitive={quote_status.get('sensitive')}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
@@ -213,7 +219,7 @@ class DetailedStatus extends ImmutablePureComponent {
               sensitive={quote_status.get('sensitive')}
               media={quote_status.get('media_attachments')}
               height={300}
-              onOpenMedia={this.props.onOpenMedia}
+              onOpenMedia={this.props.onOpenMediaQuote}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
               quote
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index ce0a26cb3..79bbdefa8 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -313,6 +313,14 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.get('id'), media, options }));
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.dispatch(openModal('MEDIA', { statusId: this.props.status.getIn(['quote', 'id']), media, index }));
+  }
+
+  handleOpenVideoQuote = (media, options) => {
+    this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.getIn(['quote', 'id']), media, options }));
+  }
+
   handleHotkeyOpenMedia = e => {
     const { status } = this.props;
 
@@ -584,6 +592,8 @@ class Status extends ImmutablePureComponent {
                   status={status}
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
+                  onOpenVideoQuote={this.handleOpenVideoQuote}
+                  onOpenMediaQuote={this.handleOpenMediaQuote}
                   onToggleHidden={this.handleToggleHidden}
                   domain={domain}
                   showMedia={this.state.showMedia}

From 6f1d0a918b001cef9e1747867f37881f4bd3ae62 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 04:49:35 +0900
Subject: [PATCH 113/200] Fix missing reblog_of_quote

---
 app/javascript/mastodon/selectors/index.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index f84152199..a274fbfe9 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -92,16 +92,19 @@ export const makeGetStatus = () => {
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, accountReblogQuote, relationship, reblogRelationship, quoteRelationship, reblogQuoteRelationship, moved, reblogMoved, quoteMoved, reblogQuoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
@@ -131,6 +134,14 @@ export const makeGetStatus = () => {
         statusQuote = null;
       }
 
+      if (statusReblog && accountReblogQuote) {
+        accountReblogQuote = accountReblog.withMutations(map => {
+          map.set('relationship', reblogQuoteRelationship);
+          map.set('moved', reblogQuoteMoved);
+        });
+        statusReblog = statusReblog.setIn(['quote', 'account'], accountReblogQuote);
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;

From 1c0da047537b0b396e1850a7715b165579a67999 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 09:45:37 +0900
Subject: [PATCH 114/200] Fix missing frameRate

---
 app/javascript/mastodon/components/status.js                     | 1 +
 .../mastodon/features/status/components/detailed_status.js       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index b12b02dbd..17f0de99f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -571,6 +571,7 @@ class Status extends ImmutablePureComponent {
               {Component => (
                 <Component
                   preview={attachment.get('preview_url')}
+                  frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
                   blurhash={attachment.get('blurhash')}
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3856bb47c..3eca8b092 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -199,6 +199,7 @@ class DetailedStatus extends ImmutablePureComponent {
           quote_media = (
             <Video
               preview={attachment.get('preview_url')}
+              frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={attachment.get('blurhash')}
               src={attachment.get('url')}
               alt={attachment.get('description')}

From d54f3caf2a1bee1c2da6c7a75f0421f87d9103a8 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 13:39:11 +0900
Subject: [PATCH 115/200] Fix not hiding quoted unlisted status in non public
 timeline

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 17f0de99f..a08bb291a 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -618,7 +618,7 @@ class Status extends ImmutablePureComponent {
             </div>
           </div>
         );
-      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+      } else if (quote_status.get('visibility') === 'unlisted' && !!contextType && ['public', 'community', 'hashtag'].includes(contextType.split(':', 2)[0])) {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>

From 60b22fe1da8732ab43b0a03a761653abdb795666 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 7 Jan 2021 15:56:40 +0900
Subject: [PATCH 116/200] Fix quote on public stream

---
 .../mastodon/containers/timeline_container.js   |  4 +++-
 .../status/components/detailed_status.js        |  6 +++---
 .../containers/detailed_status_container.js     | 17 +++++++++++++++++
 app/javascript/packs/public.js                  |  2 ++
 app/javascript/styles/mastodon/statuses.scss    |  4 ++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index ed8095f90..768169458 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,7 +47,9 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            {timeline}
+            <div className='standalone-timeline'>
+              {timeline}
+            </div>
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3eca8b092..9d16a9aa9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -231,7 +231,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
       if (quote_muted) {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <div className='status__content muted-quote'>
               <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
             </div>
@@ -239,7 +239,7 @@ class DetailedStatus extends ImmutablePureComponent {
         );
       } else {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
@@ -252,7 +252,7 @@ class DetailedStatus extends ImmutablePureComponent {
       }
     } else if (quote_muted) {
       quote = (
-        <div className={classNames('quote-status', { muted: this.props.muted })}>
+        <div className={classNames('quote-status', { muted: this.props.muted })} data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
           <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
             <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
           </div>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index bfed16620..8238f654d 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,6 +20,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -136,6 +138,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
+  onOpenMediaQuote (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+
+  onOpenVideoQuote (media, options) {
+    dispatch(openModal('VIDEO', { media, options }));
+  },
+
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -165,6 +175,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index f6acf706c..3a92d891a 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -303,6 +303,8 @@ function main() {
     let url = target.closest('.quote-status').getAttribute('dataurl');
     if (target.closest('.status__display-name')) {
       url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.detailed-status__display-name')) {
+      url = target.closest('.detailed-status__display-name').getAttribute('href');
     } else if (target.closest('.status-card')) {
       url = target.closest('.status-card').getAttribute('href');
     }
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ab91b3123..47dde12fd 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -99,6 +99,10 @@
   }
 }
 
+.standalone-timeline .quote-status {
+  cursor: pointer;
+}
+
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;

From 124153f8e014c977f564ec1813f1ec867a9568b1 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 28 Jan 2021 07:45:40 +0900
Subject: [PATCH 117/200] Add place tab bar at bottom and add short label

	modified:   app/controllers/settings/preferences_controller.rb
	modified:   app/javascript/mastodon/features/compose/index.js
	modified:   app/javascript/mastodon/features/ui/components/columns_area.js
	modified:   app/javascript/mastodon/features/ui/components/tabs_bar.js
	modified:   app/javascript/mastodon/initial_state.js
	modified:   app/javascript/mastodon/locales/en.json
	modified:   app/javascript/mastodon/locales/ja.json
	modified:   app/javascript/styles/mastodon/basics.scss
	modified:   app/javascript/styles/mastodon/components.scss
	modified:   app/lib/user_settings_decorator.rb
	modified:   app/models/user.rb
	modified:   app/serializers/initial_state_serializer.rb
	modified:   app/views/layouts/application.html.haml
	modified:   app/views/layouts/error.html.haml
	modified:   app/views/settings/preferences/other/show.html.haml
	modified:   config/locales/simple_form.en.yml
	modified:   config/locales/simple_form.ja.yml
	modified:   config/settings.yml
---
 .../settings/preferences_controller.rb        |   2 +
 .../mastodon/features/compose/index.js        |  70 ++++++--
 .../features/ui/components/columns_area.js    |  10 +-
 .../features/ui/components/tabs_bar.js        |  20 ++-
 app/javascript/mastodon/initial_state.js      |   2 +
 app/javascript/mastodon/locales/en.json       |  11 +-
 app/javascript/mastodon/locales/ja.json       |   9 +
 app/javascript/styles/mastodon/basics.scss    |   3 +-
 .../styles/mastodon/components.scss           | 156 +++++++++++++++++-
 app/lib/user_settings_decorator.rb            |  46 ++++++
 app/models/user.rb                            |   2 +
 app/serializers/initial_state_serializer.rb   |   3 +
 app/views/layouts/application.html.haml       |   2 +-
 app/views/layouts/error.html.haml             |   2 +-
 .../settings/preferences/other/show.html.haml |  11 ++
 config/locales/simple_form.en.yml             |  17 +-
 config/locales/simple_form.ja.yml             |  13 ++
 config/settings.yml                           |   2 +
 18 files changed, 337 insertions(+), 44 deletions(-)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 32b5d7948..6598e9ea1 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -55,6 +55,8 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_use_pending_items,
       :setting_trends,
       :setting_crop_images,
+      :setting_place_tab_bar_at_bottom,
+      :setting_show_tab_bar_label,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 474527a4b..bff097660 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import ComposeFormContainer from './containers/compose_form_container';
 import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
@@ -14,12 +14,22 @@ import SearchResultsContainer from './containers/search_results_container';
 import { changeComposing } from '../../actions/compose';
 import { openModal } from 'mastodon/actions/modal';
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
-import { mascot } from '../../initial_state';
+import { mascot, show_tab_bar_label } from '../../initial_state';
 import Icon from 'mastodon/components/icon';
 import { logOut } from 'mastodon/utils/log_out';
 import AnnouncementsContainer from './containers/announcements_container';
+import NotificationsCounterIcon from '../ui/components/notifications_counter_icon';
+import classNames from 'classnames';
 
 const messages = defineMessages({
+  short_start: { id: 'navigation_bar.short.getting_started', defaultMessage: 'Started' },
+  short_home_timeline: { id: 'navigation_bar.short.home', defaultMessage: 'Home' },
+  short_notifications: { id: 'navigation_bar.short.notifications', defaultMessage: 'Notif.' },
+  short_public: { id: 'navigation_bar.short.public_timeline', defaultMessage: 'FTL' },
+  short_community: { id: 'navigation_bar.short.community_timeline', defaultMessage: 'LTL' },
+  short_lists: { id: 'navigation_bar.short.lists', defaultMessage: 'Lists' },
+  short_preferences: { id: 'navigation_bar.short.preferences', defaultMessage: 'Pref.' },
+  short_logout: { id: 'navigation_bar.short.logout', defaultMessage: 'Logout' },
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
   home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
@@ -89,30 +99,54 @@ class Compose extends React.PureComponent {
     this.props.dispatch(changeComposing(false));
   }
 
+  tab (id) {
+    const { columns, intl: { formatMessage } } = this.props;
+
+    if (!columns.some(column => column.get('id') === id)) {
+      const tabParams = {
+        'START':         { to: '/getting-started',        title: formatMessage(messages.start),         label: formatMessage(messages.short_start),         icon_id: 'bars' },
+        'HOME':          { to: '/timelines/home',         title: formatMessage(messages.home_timeline), label: formatMessage(messages.short_home_timeline), icon_id: 'home' },
+        'NOTIFICATIONS': { to: '/notifications',          title: formatMessage(messages.notifications), label: formatMessage(messages.short_notifications), icon_id: 'bell' },
+        'COMMUNITY':     { to: '/timelines/public/local', title: formatMessage(messages.community),     label: formatMessage(messages.short_community),     icon_id: 'users' },
+        'PUBLIC':        { to: '/timelines/public',       title: formatMessage(messages.public),        label: formatMessage(messages.short_public),        icon_id: 'globe' },
+        'LIST':          { to: '/lists',                  title: formatMessage(messages.lists),         label: formatMessage(messages.short_lists),         icon_id: 'list-ul' },
+        'PREFERENCES':   { href: '/settings/preferences', title: formatMessage(messages.preferences),   label: formatMessage(messages.short_preferences),   icon_id: 'cog' },
+        'SIGN_OUT':      { href: '/auth/sign_out',        title: formatMessage(messages.logout),        label: formatMessage(messages.short_logout),        icon_id: 'sign-out' },
+      };
+
+      const { href, to, title, label, icon_id } = tabParams[id];
+
+      const icon = (id === 'NOTIFICATIONS') ? <NotificationsCounterIcon /> : <Icon id={icon_id} fixedWidth />;
+
+      if (href) {
+        return (
+          <a href={href} className={classNames('drawer__tab', { 'short-label': show_tab_bar_label })} title={title} aria-label={title}>{icon}<span className='drawer__tab__short-label'>{label}</span></a>
+        );
+      } else {
+        return (
+          <Link to={to} className={classNames('drawer__tab', { 'short-label': show_tab_bar_label })} title={title} aria-label={title}>{icon}<span className='drawer__tab__short-label'>{label}</span></Link>
+        );
+      }
+    }
+    return null;
+  }
+
   render () {
     const { multiColumn, showSearch, isSearchPage, intl } = this.props;
 
     let header = '';
 
     if (multiColumn) {
-      const { columns } = this.props;
+      // const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'COMMUNITY', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
+      const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
+
+      let tabs = defaultTabIds;
+
       header = (
         <nav className='drawer__header'>
-          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' fixedWidth /></Link>
-          {!columns.some(column => column.get('id') === 'HOME') && (
-            <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'COMMUNITY') && (
-            <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'PUBLIC') && (
-            <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' fixedWidth /></Link>
-          )}
-          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' fixedWidth /></a>
-          <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' fixedWidth /></a>
+          {tabs.map(tabId => (
+	    <Fragment key={tabId}>{this.tab(tabId)}</Fragment>
+          ))}
         </nav>
       );
     }
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 039abe432..bfb9561da 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -8,7 +8,7 @@ import ReactSwipeableViews from 'react-swipeable-views';
 import TabsBar, { links, getIndex, getLink } from './tabs_bar';
 import { Link } from 'react-router-dom';
 
-import { disableSwiping } from 'mastodon/initial_state';
+import { disableSwiping, place_tab_bar_at_bottom } from 'mastodon/initial_state';
 
 import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
@@ -34,6 +34,8 @@ import NavigationPanel from './navigation_panel';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import { scrollRight } from '../../../scroll';
 
+import classNames from 'classnames';
+
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
@@ -216,14 +218,14 @@ class ColumnsArea extends ImmutablePureComponent {
     const columnIndex = getIndex(this.context.router.history.location.pathname);
 
     if (singleColumn) {
-      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
+      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className={classNames('floating-action-button', { 'bottom-bar': place_tab_bar_at_bottom })} aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
 
       const content = columnIndex !== -1 ? (
-        <ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
+        <ReactSwipeableViews key='content' className={classNames('swipeable-view__wrapper', { 'bottom-bar': place_tab_bar_at_bottom })} hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
           {links.map(this.renderView)}
         </ReactSwipeableViews>
       ) : (
-        <div key='content' className='columns-area columns-area--mobile'>{children}</div>
+        <div key='content' className={classNames('columns-area columns-area--mobile', { 'bottom-bar': place_tab_bar_at_bottom })}>{children}</div>
       );
 
       return (
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 1911da8ba..e0328dc9e 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -6,14 +6,16 @@ import { debounce } from 'lodash';
 import { isUserTouching } from '../../../is_mobile';
 import Icon from 'mastodon/components/icon';
 import NotificationsCounterIcon from './notifications_counter_icon';
+import { place_tab_bar_at_bottom, show_tab_bar_label } from 'mastodon/initial_state';
+import classNames from 'classnames';
 
 export const links = [
-  <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
-  <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
-  <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
-  <NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
+  <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.home' defaultMessage='Home' /></span></NavLink>,
+  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.notifications' defaultMessage='Notif.' /></span></NavLink>,
+  <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.public_timeline' defaultMessage='FTL' /></span></NavLink>,
+  <NavLink className='tabs-bar__link' exact to='/lists' data-preview-title-id='column.lists' data-preview-icon='list-ul' ><Icon id='list-ul' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.lists' defaultMessage='Lists' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.lists' defaultMessage='List' /></span></NavLink>,
+  <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.search' defaultMessage='Search' /></span></NavLink>,
+  <NavLink className='tabs-bar__link hamburger' to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
 ];
 
 export function getIndex (path) {
@@ -31,7 +33,7 @@ class TabsBar extends React.PureComponent {
   static propTypes = {
     intl: PropTypes.object.isRequired,
     history: PropTypes.object.isRequired,
-  }
+  };
 
   setRef = ref => {
     this.node = ref;
@@ -74,8 +76,8 @@ class TabsBar extends React.PureComponent {
 
     return (
       <div className='tabs-bar__wrapper'>
-        <nav className='tabs-bar' ref={this.setRef}>
-          {links.map(link => React.cloneElement(link, { key: link.props.to, onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
+        <nav className={classNames('tabs-bar', { 'bottom-bar': place_tab_bar_at_bottom })} ref={this.setRef}>
+          {links.map(link => React.cloneElement(link, { key: link.props.to, className: classNames(link.props.className, { 'short-label': show_tab_bar_label }), onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
         </nav>
 
         <div id='tabs-bar__portal' />
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 80d43907d..1e68040d4 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -26,5 +26,7 @@ export const showTrends = getMeta('trends');
 export const title = getMeta('title');
 export const cropImages = getMeta('crop_images');
 export const disableSwiping = getMeta('disable_swiping');
+export const place_tab_bar_at_bottom = getMeta('place_tab_bar_at_bottom');
+export const show_tab_bar_label = getMeta('show_tab_bar_label');
 
 export default initialState;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d67ad6862..b8c56a40c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -291,7 +291,16 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
-  "notification.favourite": "{name} favourited your post",
+  "navigation_bar.short.community_timeline": "LTL",
+  "navigation_bar.short.getting_started": "Started",
+  "navigation_bar.short.home": "Home",
+  "navigation_bar.short.lists": "Lists",
+  "navigation_bar.short.logout": "Logout",
+  "navigation_bar.short.notifications": "Notif.",
+  "navigation_bar.short.preferences": "Pref.",
+  "navigation_bar.short.public_timeline": "FTL",
+  "navigation_bar.short.search": "Search",
+  "notification.favourite": "{name} favourited your toot",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index dcb69fe10..d67e962b8 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -302,6 +302,15 @@
   "navigation_bar.trends": "トレンド",
   "navigation_bar.bookmarks": "ブックマーク",
   "notification.favourite": "{name}さんがあなたのトゥートに╰( ^o^)╮-=ﾆ=一＝三★しました",
+  "navigation_bar.short.community_timeline": "ローカル",
+  "navigation_bar.short.getting_started": "スタート",
+  "navigation_bar.short.home": "ホーム",
+  "navigation_bar.short.lists": "リスト",
+  "navigation_bar.short.logout": "ログアウト",
+  "navigation_bar.short.notifications": "通知",
+  "navigation_bar.short.preferences": "設定",
+  "navigation_bar.short.public_timeline": "連合",
+  "navigation_bar.short.search": "検索",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
   "notification.mention": "{name}さんがあなたに返信しました",
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 9e63b1d31..8a42af487 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -47,6 +47,7 @@ body {
       position: absolute;
       width: 100%;
       height: 100%;
+      padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
     }
 
     &.with-modals--active {
@@ -111,7 +112,7 @@ body {
 
   &.admin {
     background: darken($ui-base-color, 4%);
-    padding: 0;
+    padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
   }
 
   &.error {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6fdb3d600..6b74a6bf1 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2101,8 +2101,32 @@ a.account__display-name {
   .tabs-bar {
     margin-bottom: 0;
 
-    @media screen and (min-width: $no-gap-breakpoint) {
-      margin-bottom: 10px;
+    @media screen and (max-width: 600px + (285px * 2) + (10px * 2)) {
+      &.bottom-bar {
+        position: fixed;
+        bottom: 0;
+        width: calc(100% - 20px);
+        max-width: 580px;
+      }
+    }
+
+    @media screen and (max-width: $no-gap-breakpoint) {
+      &.bottom-bar {
+        width: 100%;
+      }
+    }
+
+    @media screen and (min-width: 600px + (285px * 2) + (10px * 2)) {
+      padding-bottom: 10px;
+    }
+  }
+}
+
+.swipeable-view__wrapper {
+  @media screen and (max-width: 600px + (285px * 2) + (10px * 2)) {
+    &.bottom-bar {
+      padding-bottom: 48px;
+      padding-bottom: calc(env(safe-area-inset-bottom) + 48px);
     }
   }
 }
@@ -2153,6 +2177,7 @@ a.account__display-name {
 
 .drawer__tab {
   display: block;
+  width: 100%;
   flex: 1 1 auto;
   padding: 15px 5px 13px;
   color: $darker-text-color;
@@ -2160,6 +2185,25 @@ a.account__display-name {
   text-align: center;
   font-size: 16px;
   border-bottom: 2px solid transparent;
+
+  .drawer__tab__short-label {
+    display: none;
+  }
+
+  &.short-label {
+    padding: 0;
+
+    i {
+      margin: 10px 5px 0;
+    }
+
+    .drawer__tab__short-label {
+      font-size: 10px;
+      overflow-x: hidden;
+      white-space: nowrap;
+      display: block;
+    }
+  }
 }
 
 .column,
@@ -2209,8 +2253,7 @@ a.account__display-name {
 .tabs-bar__link {
   display: block;
   flex: 1 1 auto;
-  padding: 15px 10px;
-  padding-bottom: 13px;
+  min-width: 40px;
   color: $primary-text-color;
   text-decoration: none;
   text-align: center;
@@ -2239,16 +2282,98 @@ a.account__display-name {
     color: $highlight-text-color;
   }
 
-  span {
+  &.hamburger {
+    flex: 0 0 30px;
+  }
+
+  &__full-label {
     margin-left: 5px;
+    white-space: nowrap;
+    display: none;
+  }
+
+  &__short-label {
     display: none;
   }
 }
 
+@media screen and (max-width: 600px - 1px) {
+  .tabs-bar {
+    .tabs-bar__link {
+      &,
+      &.hamburger,
+      &.hamburger.short-label {
+        padding: 15px 10px 13px;
+      }
+
+      &.hamburger.short-label {
+        i {
+          margin: 0;
+        }
+      }
+
+      &.short-label {
+        padding: 0;
+
+        i {
+          margin: 10px 5px 0;
+        }
+
+        .tabs-bar__link__short-label {
+          font-size: 10px;
+          overflow-x: hidden;
+          white-space: nowrap;
+          display: block;
+        }
+      }
+    }
+  }
+
+  .tabs-bar.bottom-bar {
+    .tabs-bar__link {
+      &,
+      &.hamburger {
+        padding-bottom: calc(env(safe-area-inset-bottom) + 13px);
+      }
+
+      &.short-label,
+      &.hamburger.short-label {
+        padding-bottom: env(safe-area-inset-bottom);
+      }
+    }
+  }
+}
+
 @media screen and (min-width: 600px) {
-  .tabs-bar__link {
-    span {
-      display: inline;
+  .tabs-bar {
+    .tabs-bar__link {
+      &,
+      &.hamburger {
+        padding: 15px 10px 13px;
+      }
+
+      & {
+        &__full-label {
+          display: inline;
+        }
+
+        &__short-label {
+          display: none;
+        }
+
+        i {
+          margin: 0;
+        }
+      }
+    }
+  }
+
+  .tabs-bar.bottom-bar {
+    .tabs-bar__link {
+      &,
+      &.hamburger {
+        padding-bottom: calc(env(safe-area-inset-bottom) + 13px);
+      }
     }
   }
 }
@@ -2259,6 +2384,10 @@ a.account__display-name {
   height: 100%;
   margin: 0 auto;
 
+  &.bottom-bar {
+    padding-bottom: 48px;
+  }
+
   .column,
   .drawer {
     width: 100%;
@@ -2417,6 +2546,10 @@ a.account__display-name {
   text-decoration: none;
   box-shadow: 2px 3px 9px rgba($base-shadow-color, 0.4);
 
+  &.bottom-bar {
+    bottom: calc(env(safe-area-inset-bottom) + 1.3125rem + 48px);
+  }
+
   &:hover,
   &:focus,
   &:active {
@@ -2683,6 +2816,13 @@ a.account__display-name {
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
+  overflow-x: scroll;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 
   a {
     transition: background 100ms ease-in;
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index e37bc6d9f..b5b08d008 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -15,6 +15,7 @@ class UserSettingsDecorator
   private
 
   def process_update
+<<<<<<< HEAD
     user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
     user.settings['interactions']        = merged_interactions if change?('interactions')
     user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')
@@ -39,6 +40,8 @@ class UserSettingsDecorator
     user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
     user.settings['trends']              = trends_preference if change?('setting_trends')
     user.settings['crop_images']         = crop_images_preference if change?('setting_crop_images')
+    user.settings['place_tab_bar_at_bottom']           = place_tab_bar_at_bottom_preference if change?('setting_place_tab_bar_at_bottom')
+    user.settings['show_tab_bar_label']                = show_tab_bar_label_preference if change?('setting_show_tab_bar_label')
   end
 
   def merged_notification_emails
@@ -137,6 +140,49 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_crop_images'
   end
 
+<<<<<<< HEAD
+=======
+  def show_follow_button_on_timeline_preference
+    boolean_cast_setting 'setting_show_follow_button_on_timeline'
+  end
+
+  def show_subscribe_button_on_timeline_preference
+    boolean_cast_setting 'setting_show_subscribe_button_on_timeline'
+  end
+
+  def show_followed_by_preference
+    boolean_cast_setting 'setting_show_followed_by'
+  end
+
+  def follow_button_to_list_adder_preference
+    boolean_cast_setting 'setting_follow_button_to_list_adder'
+  end
+
+  def show_navigation_panel_preference
+    boolean_cast_setting 'setting_show_navigation_panel'
+  end
+
+  def show_quote_button_preference
+    boolean_cast_setting 'setting_show_quote_button'
+  end
+
+  def show_bookmark_button_preference
+    boolean_cast_setting 'setting_show_bookmark_button'
+  end
+
+  def show_target_preference
+    boolean_cast_setting 'setting_show_target'
+  end
+
+  def place_tab_bar_at_bottom_preference
+    boolean_cast_setting 'setting_place_tab_bar_at_bottom'
+  end
+
+  def show_tab_bar_label_preference
+    boolean_cast_setting 'setting_show_tab_bar_label'
+  end
+
+>>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4973c68b6..e876c70f4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -125,6 +125,8 @@ class User < ApplicationRecord
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
            :disable_swiping,
+           :place_tab_bar_at_bottom,:show_tab_bar_label,
+
            to: :settings, prefix: :setting, allow_nil: false
 
   attr_reader :invite_code, :sign_in_token_attempt
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 70263e0c5..e5a65e2df 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -25,6 +25,7 @@ class InitialStateSerializer < ActiveModel::Serializer
     }
 
     if object.current_account
+<<<<<<< HEAD
       store[:me]                = object.current_account.id.to_s
       store[:unfollow_modal]    = object.current_account.user.setting_unfollow_modal
       store[:boost_modal]       = object.current_account.user.setting_boost_modal
@@ -40,6 +41,8 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:is_staff]          = object.current_account.user.staff?
       store[:trends]            = Setting.trends && object.current_account.user.setting_trends
       store[:crop_images]       = object.current_account.user.setting_crop_images
+      store[:place_tab_bar_at_bottom]           = object.current_account.user.setting_place_tab_bar_at_bottom
+      store[:show_tab_bar_label]                = object.current_account.user.setting_show_tab_bar_label
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f5a963e00..d1b27fa72 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
-    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, viewport-fit=cover' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 852a0c69b..c8d9ff352 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -4,7 +4,7 @@
     %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
-    %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
+    %meta{ content: 'width=device-width,initial-scale=1,viewport-fit=cover', name: 'viewport' }/
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 539a70056..3e02404b6 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -31,6 +31,17 @@
   .fields-group
     = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true
 
+  %h4= t 'preferences.fedibird_features'
+
+  .fields-group
+    = f.input :setting_place_tab_bar_at_bottom, as: :boolean, wrapper: :with_label
+
+  .fields-group
+    = f.input :setting_show_tab_bar_label, as: :boolean, wrapper: :with_label
+
+  -# .fields-group
+  -#   = f.input :setting_show_target, as: :boolean, wrapper: :with_label
+
   %h4= t 'preferences.public_timelines'
 
   .fields-group
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index c4388ffc5..9a7ba30a0 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -53,7 +53,20 @@ en:
         setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will be hidden on your profile
         setting_noindex: Affects your public profile and status pages
+<<<<<<< HEAD
         setting_show_application: The application you use to post will be displayed in the detailed view of your posts
+=======
+        setting_place_tab_bar_at_bottom: When using a touch device, you can operate tabs within the reach of your fingers.
+        setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
+        setting_show_bookmark_button: When turned off, the bookmark call will be in Mastodon's standard position (in the menu on the action bar)
+        setting_show_follow_button_on_timeline: You can easily check the follow status and build a follow list quickly
+        setting_show_navigation_panel: Show the navigation panel at the right end of the advanced UI
+        setting_show_quote_button: Selects whether to display the button on the action bar. It does not enable/disable the citation function.
+        setting_show_subscribe_button_on_timeline: You can easily check the status of your subscriptions and quickly build a subscription list
+        setting_show_tab_bar_label: When adding a list etc. to the tab bar, it is recommended to display the label because it is not possible to distinguish by the icon alone
+        setting_show_followed_by: "The color of the follow button changes according to the follow status (gray: no follow relationship, yellow: followed, blue: following, green: mutual follow)"
+        setting_show_target: Enable the function to switch between posting target and follow / subscribe target
+>>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         username: Your username will be unique on %{domain}
@@ -162,8 +175,10 @@ en:
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
         setting_noindex: Opt-out of search engine indexing
+        setting_place_tab_bar_at_bottom: Place the tab bar at the bottom
         setting_reduce_motion: Reduce motion in animations
-        setting_show_application: Disclose application used to send posts
+        setting_show_application: Disclose application used to send toots
+        setting_show_tab_bar_label: Show labels in the tab bar
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
         setting_trends: Show today's trends
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a4e5a2984..307d37db7 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -53,7 +53,19 @@ ja:
         setting_display_media_show_all: メディアを常に表示する
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
+        setting_place_tab_bar_at_bottom: タッチデバイス使用時に、タブの操作を指の届く範囲で行えます
         setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります
+<<<<<<< HEAD
+=======
+        setting_show_bookmark_button: オフにした場合、ブックマークの呼び出しはMastodon標準の位置となります（アクションバーのメニューの中）
+        setting_show_follow_button_on_timeline: フォロー状態を確認し易くなり、素早くフォローリストを構築できます
+        setting_show_navigation_panel: 上級者向け UI の右端にナビゲーションパネルを表示します
+        setting_show_quote_button: アクションバーへボタンを表示するかどうかの設定です。引用機能の有効・無効を切り替えるものではありません
+        setting_show_subscribe_button_on_timeline: 購読状態を確認し易くなり、素早く購読リストを構築できます
+        setting_show_tab_bar_label: リスト等をタブバーに追加する場合、アイコンだけでは区別がつかないので、ラベルを表示することをおすすめします
+        setting_show_followed_by: フォロー状態に応じてフォローボタンの色が変わります（灰色：フォロー関係なし、黄色：フォローされている、青色：フォローしている、緑色：相互フォロー）
+        setting_show_target: 投稿対象と、フォロー・購読の対象を切り替える機能を有効にします
+>>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
         username: あなたのユーザー名は %{domain} の中で重複していない必要があります
@@ -162,6 +174,7 @@ ja:
         setting_expand_spoilers: 閲覧注意としてマークされたトゥートを常に展開する
         setting_hide_network: 繋がりを隠す
         setting_noindex: 検索エンジンによるインデックスを拒否する
+        setting_place_tab_bar_at_bottom: タブバーを下に配置する
         setting_reduce_motion: アニメーションの動きを減らす
         setting_show_application: 送信したアプリを開示する
         setting_system_font_ui: システムのデフォルトフォントを使う
diff --git a/config/settings.yml b/config/settings.yml
index b3a77f6c3..1579ffe1d 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -38,6 +38,8 @@ defaults: &defaults
   trends: true
   trendable_by_default: false
   crop_images: true
+  place_tab_bar_at_bottom: false
+  show_tab_bar_label: false
   notification_emails:
     follow: false
     reblog: false

From 595c1443bfa7ab8ed2864708aac5e8a76485dffd Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Fri, 14 May 2021 10:14:40 +0900
Subject: [PATCH 118/200] fix

---
 app/lib/user_settings_decorator.rb          | 36 ---------------------
 app/serializers/initial_state_serializer.rb |  1 -
 config/locales/simple_form.en.yml           |  4 ---
 3 files changed, 41 deletions(-)

diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index b5b08d008..c44b021e3 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -15,7 +15,6 @@ class UserSettingsDecorator
   private
 
   def process_update
-<<<<<<< HEAD
     user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
     user.settings['interactions']        = merged_interactions if change?('interactions')
     user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')
@@ -140,40 +139,6 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_crop_images'
   end
 
-<<<<<<< HEAD
-=======
-  def show_follow_button_on_timeline_preference
-    boolean_cast_setting 'setting_show_follow_button_on_timeline'
-  end
-
-  def show_subscribe_button_on_timeline_preference
-    boolean_cast_setting 'setting_show_subscribe_button_on_timeline'
-  end
-
-  def show_followed_by_preference
-    boolean_cast_setting 'setting_show_followed_by'
-  end
-
-  def follow_button_to_list_adder_preference
-    boolean_cast_setting 'setting_follow_button_to_list_adder'
-  end
-
-  def show_navigation_panel_preference
-    boolean_cast_setting 'setting_show_navigation_panel'
-  end
-
-  def show_quote_button_preference
-    boolean_cast_setting 'setting_show_quote_button'
-  end
-
-  def show_bookmark_button_preference
-    boolean_cast_setting 'setting_show_bookmark_button'
-  end
-
-  def show_target_preference
-    boolean_cast_setting 'setting_show_target'
-  end
-
   def place_tab_bar_at_bottom_preference
     boolean_cast_setting 'setting_place_tab_bar_at_bottom'
   end
@@ -182,7 +147,6 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_show_tab_bar_label'
   end
 
->>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index e5a65e2df..c0b11ee87 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -25,7 +25,6 @@ class InitialStateSerializer < ActiveModel::Serializer
     }
 
     if object.current_account
-<<<<<<< HEAD
       store[:me]                = object.current_account.id.to_s
       store[:unfollow_modal]    = object.current_account.user.setting_unfollow_modal
       store[:boost_modal]       = object.current_account.user.setting_boost_modal
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 9a7ba30a0..58c321968 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -53,9 +53,6 @@ en:
         setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will be hidden on your profile
         setting_noindex: Affects your public profile and status pages
-<<<<<<< HEAD
-        setting_show_application: The application you use to post will be displayed in the detailed view of your posts
-=======
         setting_place_tab_bar_at_bottom: When using a touch device, you can operate tabs within the reach of your fingers.
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
         setting_show_bookmark_button: When turned off, the bookmark call will be in Mastodon's standard position (in the menu on the action bar)
@@ -66,7 +63,6 @@ en:
         setting_show_tab_bar_label: When adding a list etc. to the tab bar, it is recommended to display the label because it is not possible to distinguish by the icon alone
         setting_show_followed_by: "The color of the follow button changes according to the follow status (gray: no follow relationship, yellow: followed, blue: following, green: mutual follow)"
         setting_show_target: Enable the function to switch between posting target and follow / subscribe target
->>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         username: Your username will be unique on %{domain}

From 1769c457009e65ae516172924f631c3c31861076 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Fri, 14 May 2021 04:22:36 +0200
Subject: [PATCH 119/200] fix

---
 .../mastodon/features/compose/index.js        |  4 +-
 config/locales/simple_form.ja.yml             |  3 -
 typescript                                    | 12 +++
 yarn.lock                                     | 99 +++++++++++--------
 4 files changed, 72 insertions(+), 46 deletions(-)
 create mode 100644 typescript

diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index bff097660..31a3742a0 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -137,8 +137,8 @@ class Compose extends React.PureComponent {
     let header = '';
 
     if (multiColumn) {
-      // const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'COMMUNITY', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
-      const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
+       const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'COMMUNITY', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
+//      const defaultTabIds = ['START', 'HOME', 'NOTIFICATIONS', 'PUBLIC', 'LIST', 'PREFERENCES', 'SIGN_OUT'];
 
       let tabs = defaultTabIds;
 
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 307d37db7..fcd10447e 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -55,8 +55,6 @@ ja:
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_place_tab_bar_at_bottom: タッチデバイス使用時に、タブの操作を指の届く範囲で行えます
         setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります
-<<<<<<< HEAD
-=======
         setting_show_bookmark_button: オフにした場合、ブックマークの呼び出しはMastodon標準の位置となります（アクションバーのメニューの中）
         setting_show_follow_button_on_timeline: フォロー状態を確認し易くなり、素早くフォローリストを構築できます
         setting_show_navigation_panel: 上級者向け UI の右端にナビゲーションパネルを表示します
@@ -65,7 +63,6 @@ ja:
         setting_show_tab_bar_label: リスト等をタブバーに追加する場合、アイコンだけでは区別がつかないので、ラベルを表示することをおすすめします
         setting_show_followed_by: フォロー状態に応じてフォローボタンの色が変わります（灰色：フォロー関係なし、黄色：フォローされている、青色：フォローしている、緑色：相互フォロー）
         setting_show_target: 投稿対象と、フォロー・購読の対象を切り替える機能を有効にします
->>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
         username: あなたのユーザー名は %{domain} の中で重複していない必要があります
diff --git a/typescript b/typescript
new file mode 100644
index 000000000..4337bab44
--- /dev/null
+++ b/typescript
@@ -0,0 +1,12 @@
+Script started on 2021-05-14 03:28:09+0200
+]0;mastodon@vmi368748: ~/livemastodon@vmi368748:~/live$ exitRAILS_ENV=production bundle exec rails assets:precompile
+yarn install v1.22.5
+[1/6] Validating package.json...
+[2/6] Resolving packages...
+⠁ success Already up-to-date.
+Done in 1.95s.
+Everything's up-to-date. Nothing to do
+]0;mastodon@vmi368748: ~/livemastodon@vmi368748:~/live$ exit
+exit
+
+Script done on 2021-05-14 03:28:44+0200
diff --git a/yarn.lock b/yarn.lock
index 35a87c0af..70cb215c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -51,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
+  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
+  dependencies:
+    "@babel/types" "^7.14.2"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
@@ -152,6 +161,15 @@
     "@babel/template" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/helper-function-name@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
+  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.14.2"
+
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
@@ -329,6 +347,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
   integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==
 
+"@babel/parser@^7.14.2", "@babel/parser@^7.7.5":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
+  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@@ -1025,7 +1048,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.3.3":
+"@babel/template@^7.12.13", "@babel/template@^7.3.3", "@babel/template@^7.7.4":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
   integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
@@ -1048,6 +1071,20 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.7.4":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
+  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.4", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.14.1"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
@@ -1056,6 +1093,14 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
+  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -3619,7 +3664,7 @@ csstype@^3.0.2:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
   integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
-  
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -6156,34 +6201,6 @@ istanbul-lib-coverage@^3.0.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
 istanbul-lib-instrument@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
@@ -6197,6 +6214,16 @@ istanbul-lib-instrument@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
@@ -7249,11 +7276,6 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-  
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -8135,7 +8157,7 @@ pgpass@1.x:
   dependencies:
     split2 "^3.1.1"
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -10936,11 +10958,6 @@ unicode-match-property-value-ecmascript@^1.2.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
   integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
-
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"

From 0ee25c768127b5d5b3a3675fd7a33209742eb782 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Fri, 14 May 2021 07:06:51 +0200
Subject: [PATCH 120/200] remove risa and fix

---
 .../compose/containers/compose_form_container.js     |  4 ----
 app/javascript/mastodon/features/compose/index.js    |  3 ++-
 .../mastodon/features/ui/components/tabs_bar.js      |  4 ++--
 typescript                                           | 12 ------------
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 typescript

diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index c4b27ad79..d78b20fc7 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -66,10 +66,6 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertEmojiCompose(position, data, needsSpace));
   },
   
-  onRisaSubmit (textarea) {
-    dispatch(submitRisa(textarea));
-  },
-
   onGojiSubmit (textarea) {
     dispatch(submitGoji(textarea));
   },
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 31a3742a0..a0f53d627 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -35,6 +35,7 @@ const messages = defineMessages({
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
   public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new toot' },
@@ -114,7 +115,7 @@ class Compose extends React.PureComponent {
         'SIGN_OUT':      { href: '/auth/sign_out',        title: formatMessage(messages.logout),        label: formatMessage(messages.short_logout),        icon_id: 'sign-out' },
       };
 
-      const { href, to, title, label, icon_id } = tabParams[id];
+      const { href, to, title, label, icon_id, method } = tabParams[id];
 
       const icon = (id === 'NOTIFICATIONS') ? <NotificationsCounterIcon /> : <Icon id={icon_id} fixedWidth />;
 
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index e0328dc9e..342aeeeff 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -11,9 +11,9 @@ import classNames from 'classnames';
 
 export const links = [
   <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.home' defaultMessage='Home' /></span></NavLink>,
-  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.notifications' defaultMessage='Notif.' /></span></NavLink>,
+  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.notifications' defaultMessage='Notif.' /></span></NavLink>, 
+  <NavLink className='tabs-bar__link' exact to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.local_timeline' defaultMessage='LTL' /></span></NavLink>,
   <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.public_timeline' defaultMessage='FTL' /></span></NavLink>,
-  <NavLink className='tabs-bar__link' exact to='/lists' data-preview-title-id='column.lists' data-preview-icon='list-ul' ><Icon id='list-ul' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.lists' defaultMessage='Lists' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.lists' defaultMessage='List' /></span></NavLink>,
   <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.search' defaultMessage='Search' /></span></NavLink>,
   <NavLink className='tabs-bar__link hamburger' to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
 ];
diff --git a/typescript b/typescript
deleted file mode 100644
index 4337bab44..000000000
--- a/typescript
+++ /dev/null
@@ -1,12 +0,0 @@
-Script started on 2021-05-14 03:28:09+0200
-]0;mastodon@vmi368748: ~/livemastodon@vmi368748:~/live$ exitRAILS_ENV=production bundle exec rails assets:precompile
-yarn install v1.22.5
-[1/6] Validating package.json...
-[2/6] Resolving packages...
-⠁ success Already up-to-date.
-Done in 1.95s.
-Everything's up-to-date. Nothing to do
-]0;mastodon@vmi368748: ~/livemastodon@vmi368748:~/live$ exit
-exit
-
-Script done on 2021-05-14 03:28:44+0200

From 5adea621911543a7c62097d371e34bb28690521d Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Fri, 14 May 2021 07:59:09 +0200
Subject: [PATCH 121/200] fix

---
 app/javascript/mastodon/features/ui/components/tabs_bar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 342aeeeff..4252339ea 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -12,7 +12,7 @@ import classNames from 'classnames';
 export const links = [
   <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.home' defaultMessage='Home' /></span></NavLink>,
   <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.notifications' defaultMessage='Notif.' /></span></NavLink>, 
-  <NavLink className='tabs-bar__link' exact to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.local_timeline' defaultMessage='LTL' /></span></NavLink>,
+  <NavLink className='tabs-bar__link' exact to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.community_timeline' defaultMessage='LTL' /></span></NavLink>,
   <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.public_timeline' defaultMessage='FTL' /></span></NavLink>,
   <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.search' defaultMessage='Search' /></span></NavLink>,
   <NavLink className='tabs-bar__link hamburger' to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,

From f690ffccbc6811579e40e14be1bb332b06dfdd35 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 2 Feb 2021 10:49:05 +0900
Subject: [PATCH 122/200] Fix logout

---
 app/javascript/mastodon/features/compose/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index a0f53d627..e7e0fb423 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -112,7 +112,7 @@ class Compose extends React.PureComponent {
         'PUBLIC':        { to: '/timelines/public',       title: formatMessage(messages.public),        label: formatMessage(messages.short_public),        icon_id: 'globe' },
         'LIST':          { to: '/lists',                  title: formatMessage(messages.lists),         label: formatMessage(messages.short_lists),         icon_id: 'list-ul' },
         'PREFERENCES':   { href: '/settings/preferences', title: formatMessage(messages.preferences),   label: formatMessage(messages.short_preferences),   icon_id: 'cog' },
-        'SIGN_OUT':      { href: '/auth/sign_out',        title: formatMessage(messages.logout),        label: formatMessage(messages.short_logout),        icon_id: 'sign-out' },
+        'SIGN_OUT':      { href: '/auth/sign_out',        title: formatMessage(messages.logout),        label: formatMessage(messages.short_logout),        icon_id: 'sign-out', method: 'delete' },
       };
 
       const { href, to, title, label, icon_id, method } = tabParams[id];
@@ -121,7 +121,7 @@ class Compose extends React.PureComponent {
 
       if (href) {
         return (
-          <a href={href} className={classNames('drawer__tab', { 'short-label': show_tab_bar_label })} title={title} aria-label={title}>{icon}<span className='drawer__tab__short-label'>{label}</span></a>
+          <a href={href} className={classNames('drawer__tab', { 'short-label': show_tab_bar_label })} title={title} aria-label={title} data-method={method}>{icon}<span className='drawer__tab__short-label'>{label}</span></a>
         );
       } else {
         return (

From 37025a8170693d05348271b5dc18bf98d20a3681 Mon Sep 17 00:00:00 2001
From: Genbu Hase <hasegenbu@gmail.com>
Date: Sun, 8 Apr 2018 16:56:25 +0900
Subject: [PATCH 123/200] [New] Implement a feature of quote

---
 app/javascript/mastodon/actions/compose.js    | 32 ++++++++-
 .../mastodon/components/status_action_bar.js  |  7 ++
 .../mastodon/components/status_content.js     | 17 +++++
 .../mastodon/containers/status_container.js   |  5 ++
 .../compose/components/compose_form.js        |  2 +
 .../compose/components/quote_indicator.js     | 67 +++++++++++++++++++
 .../containers/quote_indicator_container.js   | 24 +++++++
 .../features/status/components/action_bar.js  |  7 ++
 .../features/status/components/card.js        |  4 ++
 .../mastodon/features/status/index.js         |  6 ++
 .../mastodon/locales/defaultMessages.json     | 13 ++++
 app/javascript/mastodon/locales/en.json       |  2 +
 app/javascript/mastodon/locales/ja.json       |  2 +
 app/javascript/mastodon/reducers/compose.js   | 21 ++++++
 .../styles/mastodon/components.scss           | 28 ++++++--
 app/services/fetch_link_card_service.rb       |  4 +-
 16 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/quote_indicator.js
 create mode 100644 app/javascript/mastodon/features/compose/containers/quote_indicator_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 891403969..26e7bfab2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -20,6 +20,8 @@ export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
 export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
 export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
+export const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
+export const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
@@ -100,6 +102,25 @@ export function cancelReplyCompose() {
   };
 };
 
+export function quoteCompose(status, router) {
+  return (dispatch, getState) => {
+    dispatch({
+      type: COMPOSE_QUOTE,
+      status: status,
+    });
+
+    if (!getState().getIn(['compose', 'mounted'])) {
+      router.push('/statuses/new');
+    }
+  };
+};
+
+export function cancelQuoteCompose() {
+  return {
+    type: COMPOSE_QUOTE_CANCEL,
+  };
+};
+
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
@@ -130,13 +151,22 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
+    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
+    if (quoteId) {
+      status = [
+        status,
+        "~~~~~~~~~~",
+        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
+      ].join("\n");
+    }
+
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 7dbbb99cc..ba860304c 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,6 +24,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
@@ -61,6 +62,7 @@ class StatusActionBar extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
+    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -137,6 +139,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onBookmark(this.props.status);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -334,6 +340,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
 
         {shareButton}
         <IconButton className='status__action-bar-button' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index bf21a9fd6..5cf7ca802 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -38,6 +38,8 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
+    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
+    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -46,6 +48,12 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
+      if (quote) {
+        if (link.href.match(QuoteUrlFormat)) {
+          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
+        }
+      }
+
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -125,6 +133,15 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  onQuoteClick = (statusId, e) => {
+    let statusUrl = `/statuses/${statusId}`;
+
+    if (this.context.router && e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(statusUrl);
+    }
+  }
+
   handleMouseDown = (e) => {
     this.startXY = [e.clientX, e.clientY];
   }
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 9abdec138..43acf597d 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,6 +4,7 @@ import Status from '../components/status';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../actions/compose';
@@ -99,6 +100,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuote (status, router) {
+    dispatch(quoteCompose(status, router));
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 4456935e3..81eb74c32 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -4,6 +4,7 @@ import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import QuoteIndicatorContainer from '../containers/quote_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import AutosuggestInput from '../../../components/autosuggest_input';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -220,6 +221,7 @@ class ComposeForm extends ImmutablePureComponent {
         <WarningContainer />
 
         <ReplyIndicatorContainer />
+        <QuoteIndicatorContainer />
 
         <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef}>
           <AutosuggestInput
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
new file mode 100644
index 000000000..515c79fca
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import Avatar from '../../../components/avatar';
+import IconButton from '../../../components/icon_button';
+import DisplayName from '../../../components/display_name';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { isRtl } from '../../../rtl';
+
+const messages = defineMessages({
+  cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+@injectIntl
+export default class QuoteIndicator extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    onCancel: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.onCancel();
+  }
+
+  handleAccountClick = (e) => {
+    if (e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+    }
+  }
+
+  render () {
+    const { status, intl } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    const content = { __html: status.get('contentHtml') };
+    const style   = {
+      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
+    };
+
+    return (
+      <div className='quote-indicator'>
+        <div className='quote-indicator__header'>
+          <div className='quote-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} /></div>
+
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name'>
+            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
+            <DisplayName account={status.get('account')} />
+          </a>
+        </div>
+
+        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
new file mode 100644
index 000000000..eb67f3939
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { cancelQuoteCompose } from '../../../actions/compose';
+import { makeGetStatus } from '../../../selectors';
+import QuoteIndicator from '../components/quote_indicator';
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = state => ({
+    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+  onCancel () {
+    dispatch(cancelQuoteCompose());
+  },
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index ffa2510c0..1da4b52a4 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,6 +18,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -56,6 +57,7 @@ class ActionBar extends React.PureComponent {
     relationship: ImmutablePropTypes.map,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
+    onQuote: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -82,6 +84,10 @@ class ActionBar extends React.PureComponent {
     this.props.onReblog(this.props.status, e);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -277,6 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 90f9ae7ae..317163648 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -60,6 +60,10 @@ const addAutoPlay = html => {
 
 export default class Card extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index df8362a1b..0cd25955b 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -22,6 +22,7 @@ import {
 } from '../../actions/interactions';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../../actions/compose';
@@ -259,6 +260,10 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+    handleQuoteClick = (status) => {
+    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  }
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -566,6 +571,7 @@ class Status extends ImmutablePureComponent {
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
+                  onQuote={this.handleQuoteClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6d1db70ab..f0522d148 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -449,6 +449,10 @@
         "defaultMessage": "This post cannot be boosted",
         "id": "status.cannot_reblog"
       },
+      {
+        "defaultMessage": "Quote",
+        "id": "status.quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
@@ -1229,6 +1233,15 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Cancel",
+        "id": "quote_indicator.cancel"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/quote_indicator.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index b8c56a40c..ae1403168 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -359,6 +359,7 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
+  "quote_indicator.cancel": "Cancel",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -410,6 +411,7 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
+  "status.quote": "Quote",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index d67e962b8..0c99c7d5c 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -369,6 +369,7 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
+  "quote_indicator.cancel": "キャンセル",
   "refresh": "更新",
   "qr_modal.description": "QRコードを読み取って簡単にプロフィールにアクセスしましょう。",
   "regeneration_indicator.label": "読み込み中…",
@@ -421,6 +422,7 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定されたトゥート",
   "status.read_more": "もっと見る",
+  "status.quote": "引用ブースト",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4c0ba1c36..596e1a68b 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -5,6 +5,8 @@ import {
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
+  COMPOSE_QUOTE_CANCEL,
   COMPOSE_MENTION,
   COMPOSE_SUBMIT_REQUEST,
   COMPOSE_SUBMIT_SUCCESS,
@@ -59,6 +61,8 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  quote_from: null,
+  quote_from_uri: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -102,6 +106,7 @@ function clearAll(state) {
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
+    map.set('quote_from', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
     map.update('media_attachments', list => list.clear());
@@ -292,6 +297,8 @@ export default function compose(state = initialState, action) {
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -307,10 +314,24 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
+  case COMPOSE_QUOTE:
+    return state.withMutations(map => {
+      map.set('in_reply_to', null);
+      map.set('quote_from', action.status.get('id'));
+      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('text', '');
+      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
+      map.set('focusDate', new Date());
+      map.set('preselectDate', new Date());
+      map.set('idempotencyKey', uuid());
+    });
   case COMPOSE_REPLY_CANCEL:
+  case COMPOSE_QUOTE_CANCEL:
   case COMPOSE_RESET:
     return state.withMutations(map => {
       map.set('in_reply_to', null);
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6b74a6bf1..b5d209896 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -780,26 +780,37 @@
 }
 
 .reply-indicator {
+  background: $ui-primary-color;
+}
+
+.quote-indicator {
+  background: $success-green;
+}
+
+.reply-indicator,
+.quote-indicator {
   border-radius: 4px;
   margin-bottom: 10px;
-  background: $ui-primary-color;
   padding: 10px;
   min-height: 23px;
   overflow-y: auto;
   flex: 0 2 auto;
 }
 
-.reply-indicator__header {
+.reply-indicator__header,
+.quote-indicator__header {
   margin-bottom: 5px;
   overflow: hidden;
 }
 
-.reply-indicator__cancel {
+.reply-indicator__cancel,
+.quote-indicator__cancel {
   float: right;
   line-height: 24px;
 }
 
-.reply-indicator__display-name {
+.reply-indicator__display-name,
+.quote-indicator__display-name {
   color: $inverted-text-color;
   display: block;
   max-width: 100%;
@@ -809,7 +820,8 @@
   text-decoration: none;
 }
 
-.reply-indicator__display-avatar {
+.reply-indicator__display-avatar,
+.quote-indicator__display-avatar {
   float: left;
   margin-right: 5px;
 }
@@ -823,7 +835,8 @@
 }
 
 .status__content,
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   position: relative;
   font-size: 15px;
   line-height: 20px;
@@ -1273,7 +1286,8 @@
   margin-left: 6px;
 }
 
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   color: $inverted-text-color;
   font-size: 14px;
 
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index fa1636e41..c5cd3096a 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-
+    
     @card.save_with_optional_image!
   end
 

From ed58bd36aa851a3ef00ab47c4a29de64683eb54b Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:00:22 +0200
Subject: [PATCH 124/200] fix bookmark

---
 .../mastodon/features/status/components/action_bar.js       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1da4b52a4..7d81bb05e 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -92,10 +92,6 @@ class ActionBar extends React.PureComponent {
     this.props.onFavourite(this.props.status);
   }
 
-  handleBookmarkClick = (e) => {
-    this.props.onBookmark(this.props.status, e);
-  }
-
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -285,8 +281,6 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
-        <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
-
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenuContainer size={18} icon='ellipsis-h' status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
         </div>

From c345a1eeddff4f943b7c263761c60b6368963f6b Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 19 Dec 2020 10:14:10 +0900
Subject: [PATCH 125/200] fix

---
 .../compose/components/quote_indicator.js     | 18 ++++++++--
 app/views/statuses/_quote_status.html.haml    | 35 +++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 app/views/statuses/_quote_status.html.haml

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 515c79fca..4cb844151 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,7 +6,11 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+<<<<<<< HEAD
 import { isRtl } from '../../../rtl';
+=======
+import AttachmentList from 'mastodon/components/attachment_list';
+>>>>>>> 008cc7f1a... fix rtl in quote_indicator
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
@@ -44,9 +48,6 @@ export default class QuoteIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
 
     return (
       <div className='quote-indicator'>
@@ -59,7 +60,18 @@ export default class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
+<<<<<<< HEAD
         <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+=======
+        <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
+
+        {status.get('media_attachments').size > 0 && (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        )}
+>>>>>>> 008cc7f1a... fix rtl in quote_indicator
       </div>
     );
   }
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
new file mode 100644
index 000000000..f2fc02258
--- /dev/null
+++ b/app/views/statuses/_quote_status.html.haml
@@ -0,0 +1,35 @@
+.status.quote-status{ dataurl:  ActivityPub::TagManager.instance.url_for(status) }
+  = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+    .status__avatar
+      %div
+        = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar'
+    %span.display-name
+      %bdi
+        %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true)
+      &nbsp;
+      %span.display-name__account
+        = acct(status.account)
+        = fa_icon('lock') if status.account.locked?
+
+  .status__content.emojify<
+    - if status.spoiler_text?
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+        %button.status__content__spoiler-link= t('statuses.show_more')
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" }
+      = Formatter.instance.format_in_quote(status, custom_emojify: true)
+  
+  - if !status.media_attachments.empty?
+    - if status.media_attachments.first.video?
+      - video = status.media_attachments.first
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - elsif status.media_attachments.first.audio?
+      - audio = status.media_attachments.first
+      = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - else
+      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true

From fb9442dcc689326b82059151241e0087f6e2a573 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 19 Dec 2020 10:14:10 +0900
Subject: [PATCH 126/200] fix rtl in quote_indicator

---
 .../features/compose/components/quote_indicator.js         | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 4cb844151..d09516137 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,11 +6,8 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-<<<<<<< HEAD
 import { isRtl } from '../../../rtl';
-=======
 import AttachmentList from 'mastodon/components/attachment_list';
->>>>>>> 008cc7f1a... fix rtl in quote_indicator
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
@@ -60,9 +57,6 @@ export default class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-<<<<<<< HEAD
-        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
-=======
         <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
@@ -71,7 +65,6 @@ export default class QuoteIndicator extends ImmutablePureComponent {
             media={status.get('media_attachments')}
           />
         )}
->>>>>>> 008cc7f1a... fix rtl in quote_indicator
       </div>
     );
   }

From 70318ba219bd19c3f43c60ccb40384998f2f8f7f Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 28 Sep 2020 12:09:22 +0900
Subject: [PATCH 127/200] Add quote and bookmark button in PiP

---
 .../picture_in_picture/components/footer.js   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 1ecb18bf8..a023c469d 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -5,9 +5,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import IconButton from 'mastodon/components/icon_button';
 import classNames from 'classnames';
-import { me, boostModal } from 'mastodon/initial_state';
+import { me, boostModal, show_quote_button } from 'mastodon/initial_state';
 import { defineMessages, injectIntl } from 'react-intl';
-import { replyCompose } from 'mastodon/actions/compose';
+import { replyCompose, quoteCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { makeGetStatus } from 'mastodon/selectors';
 import { initBoostModal } from 'mastodon/actions/boosts';
@@ -21,6 +21,7 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
@@ -119,12 +120,41 @@ class Footer extends ImmutablePureComponent {
     router.history.push(`/statuses/${status.get('id')}`);
   }
 
+  _performQuote = () => {
+    const { dispatch, status, onClose } = this.props;
+    const { router } = this.context;
+
+    if (onClose) {
+      onClose();
+    }
+
+    dispatch(quoteCompose(status, router.history));
+  };
+
+  handleQuoteClick = () => {
+    const { dispatch, askReplyConfirmation, intl } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: this._performQuote,
+      }));
+    } else {
+      this._performQuote();
+    }
+  }
+
   render () {
     const { status, intl, withOpenButton } = this.props;
 
     const publicStatus  = ['public', 'unlisted'].includes(status.get('visibility'));
     const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
 
+    const expires_at = status.get('expires_at')
+    const expires_date = expires_at && new Date(expires_at)
+    const expired = expires_date && expires_date.getTime() < intl.now()
+
     let replyIcon, replyTitle;
 
     if (status.get('in_reply_to_id', null) === null) {
@@ -152,6 +182,11 @@ class Footer extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+<<<<<<< HEAD
+=======
+        {show_quote_button && <IconButton className='status__action-bar-button' disabled={!publicStatus || expired} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />}
+        <IconButton className='status__action-bar-button bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
+>>>>>>> bbeaf126c... Add quote and bookmark button in PiP
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
       </div>
     );

From bfe472cf3b2588a78383efc598a3bf9bda4e9753 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 25 Jul 2020 16:52:42 +0900
Subject: [PATCH 128/200] Fix account link in quote

---
 app/javascript/mastodon/components/status.js  | 130 ++++++++++++++++++
 .../status/components/detailed_status.js      | 102 +++++++++++++-
 2 files changed, 229 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f58..c5013bf9c 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -459,6 +459,136 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
+    let quote = null;
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+        if (pictureInPicture.get('inUse')) {
+          quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+        } else if (this.props.muted) {
+          quote_media = (
+            <AttachmentList
+              compact
+              media={quote_status.get('media_attachments')}
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+              {Component => (
+                <Component
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+                  backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+                  foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+                  accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+                  duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+                  width={this.props.cachedMediaWidth}
+                  height={70}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                  />
+              )}
+            </Bundle>
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+              {Component => (
+                <Component
+                  preview={attachment.get('preview_url')}
+                  frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
+                  blurhash={attachment.get('blurhash')}
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  width={this.props.cachedMediaWidth}
+                  height={110}
+                  inline
+                  sensitive={quote_status.get('sensitive')}
+                  onOpenVideo={this.handleOpenVideoQuote}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else {
+          quote_media = (
+            <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
+              {Component => (
+                <Component
+                  media={quote_status.get('media_attachments')}
+                  sensitive={quote_status.get('sensitive')}
+                  height={110}
+                  onOpenMedia={this.handleOpenMediaQuote}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  defaultWidth={this.props.cachedMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        }
+      }
+
+      if (quote_muted) {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else if (quote_status.get('visibility') === 'unlisted' && !!contextType && ['public', 'community', 'hashtag'].includes(contextType.split(':', 2)[0])) {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
+              <button onClick={this.handleQuoteClick}>
+                <FormattedMessage id='status.unlisted_quote' defaultMessage='Unlisted quote' />
+              </button>
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className='status__info'>
+              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
+                <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+                <DisplayName account={quote_status.get('account')} />
+              </a>
+            </div>
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
+        </div>
+      );
+    }
+
+    const expires_at = status.get('expires_at')
+    const expires_date = expires_at && new Date(expires_at)
+    const expired = expires_date && expires_date.getTime() < intl.now()
+
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 043a749ed..d97190698 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -54,8 +54,15 @@ class DetailedStatus extends ImmutablePureComponent {
 
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
+      const id = e.currentTarget.getAttribute('data-id');
+      const group = e.currentTarget.getAttribute('data-group') !== 'false';
+
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      if (group) {
+        this.context.router.history.push(`/timelines/groups/${id}`);
+      } else {
+        this.context.router.history.push(`/accounts/${id}`);
+      }
     }
 
     e.stopPropagation();
@@ -121,6 +128,95 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+
+        if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Audio
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+              backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+              foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+              accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+              height={60}
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Video
+              preview={attachment.get('preview_url')}
+              frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
+              blurhash={attachment.get('blurhash')}
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              width={300}
+              height={150}
+              inline
+              onOpenVideo={this.handleOpenVideoQuote}
+              sensitive={quote_status.get('sensitive')}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        } else {
+          quote_media = (
+            <MediaGallery
+              standalone
+              sensitive={quote_status.get('sensitive')}
+              media={quote_status.get('media_attachments')}
+              height={300}
+              onOpenMedia={this.props.onOpenMediaQuote}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        }
+      }
+
+      if (quote_muted) {
+        quote = (
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
+            <div className='status__content muted-quote'>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} className='detailed-status__display-name'>
+              <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+              <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+            </a>
+
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })} data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
+        </div>
+      );
+    }
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
@@ -239,8 +335,8 @@ class DetailedStatus extends ImmutablePureComponent {
 
     return (
       <div style={outerStyle}>
-        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })}>
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact, 'detailed-status-with-expiration': expires_date, 'detailed-status-expired': expired })}>
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} data-group={status.getIn(['account', 'group'])} className='detailed-status__display-name'>
             <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>

From c1a505e654bb8ce275284de57d4f4e0229b7bf94 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 4 Jun 2020 05:10:21 +0900
Subject: [PATCH 129/200] Add a quote URL to the search target string

---
 app/models/status.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 847921ac2..5e1be3cb8 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -229,7 +229,11 @@ class Status < ApplicationRecord
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
+  end
+
+  def index_text
+    @index_text ||= [spoiler_text, Formatter.instance.plaintext(self)].concat(media_attachments.map(&:description)).concat(preloadable_poll ? preloadable_poll.options : []).concat(quote? ? ["QT: [#{quote.url || ActivityPub::TagManager.instance.url_for(quote)}]"] : []).filter(&:present?).join("\n\n")
   end
 
   def replies_count

From 23738ca635e16a0f7a74b43a851ed40b01b078af Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 7 Jan 2021 15:56:40 +0900
Subject: [PATCH 130/200] Fix quote on public stream

---
 .../mastodon/containers/timeline_container.js |  4 ++-
 .../status/components/detailed_status.js      |  2 +-
 .../containers/detailed_status_container.js   | 17 +++++++++++++
 app/javascript/packs/public.js                | 25 +++++++++++++++++++
 app/javascript/styles/mastodon/statuses.scss  |  4 +++
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index ed8095f90..768169458 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,7 +47,9 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            {timeline}
+            <div className='standalone-timeline'>
+              {timeline}
+            </div>
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index d97190698..35f09b90b 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -197,7 +197,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index bfed16620..8238f654d 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,6 +20,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -136,6 +138,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
+  onOpenMediaQuote (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+
+  onOpenVideoQuote (media, options) {
+    dispatch(openModal('VIDEO', { media, options }));
+  },
+
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -165,6 +175,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8c5c15b8f..3a92d891a 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,6 +291,31 @@ function main() {
       }
     });
   });
+
+  delegate(document, '.quote-status', 'click', ({ target }) => {
+    if (target.closest('.status__content__spoiler-link') ||
+      target.closest('.media-gallery') ||
+      target.closest('.video-player') ||
+      target.closest('.audio-player')) {
+      return false;
+    }
+
+    let url = target.closest('.quote-status').getAttribute('dataurl');
+    if (target.closest('.status__display-name')) {
+      url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.detailed-status__display-name')) {
+      url = target.closest('.detailed-status__display-name').getAttribute('href');
+    } else if (target.closest('.status-card')) {
+      url = target.closest('.status-card').getAttribute('href');
+    }
+
+    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
+      window.location.href = url;
+    } else {
+      window.open(url, 'blank');
+    }
+    return false;
+  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 078714325..7e915dd6e 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -77,6 +77,10 @@
   }
 }
 
+.standalone-timeline .quote-status {
+  cursor: pointer;
+}
+
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;

From 04c1ff56807ff3c71b6aa23858eb70943ec373d2 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:27:48 +0200
Subject: [PATCH 131/200] Revert "Fix quote on public stream"

This reverts commit 23738ca635e16a0f7a74b43a851ed40b01b078af.
---
 .../mastodon/containers/timeline_container.js |  4 +--
 .../status/components/detailed_status.js      |  2 +-
 .../containers/detailed_status_container.js   | 17 -------------
 app/javascript/packs/public.js                | 25 -------------------
 app/javascript/styles/mastodon/statuses.scss  |  4 ---
 5 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index 768169458..ed8095f90 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,9 +47,7 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            <div className='standalone-timeline'>
-              {timeline}
-            </div>
+            {timeline}
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 35f09b90b..d97190698 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -197,7 +197,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 8238f654d..bfed16620 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,8 +20,6 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
-  hideQuote,
-  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -138,14 +136,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
-  onOpenMediaQuote (media, index) {
-    dispatch(openModal('MEDIA', { media, index }));
-  },
-
-  onOpenVideoQuote (media, options) {
-    dispatch(openModal('VIDEO', { media, options }));
-  },
-
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -175,13 +165,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onQuoteToggleHidden (status) {
-    if (status.get('quote_hidden')) {
-      dispatch(revealQuote(status.get('id')));
-    } else {
-      dispatch(hideQuote(status.get('id')));
-    }
-  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 3a92d891a..8c5c15b8f 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,31 +291,6 @@ function main() {
       }
     });
   });
-
-  delegate(document, '.quote-status', 'click', ({ target }) => {
-    if (target.closest('.status__content__spoiler-link') ||
-      target.closest('.media-gallery') ||
-      target.closest('.video-player') ||
-      target.closest('.audio-player')) {
-      return false;
-    }
-
-    let url = target.closest('.quote-status').getAttribute('dataurl');
-    if (target.closest('.status__display-name')) {
-      url = target.closest('.status__display-name').getAttribute('href');
-    } else if (target.closest('.detailed-status__display-name')) {
-      url = target.closest('.detailed-status__display-name').getAttribute('href');
-    } else if (target.closest('.status-card')) {
-      url = target.closest('.status-card').getAttribute('href');
-    }
-
-    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
-      window.location.href = url;
-    } else {
-      window.open(url, 'blank');
-    }
-    return false;
-  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 7e915dd6e..078714325 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -77,10 +77,6 @@
   }
 }
 
-.standalone-timeline .quote-status {
-  cursor: pointer;
-}
-
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;

From dcee25381b4e5f6c63456c6f5da19b0be96135a3 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:28:06 +0200
Subject: [PATCH 132/200] Revert "Add a quote URL to the search target string"

This reverts commit c1a505e654bb8ce275284de57d4f4e0229b7bf94.
---
 app/models/status.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 5e1be3cb8..847921ac2 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -229,11 +229,7 @@ class Status < ApplicationRecord
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
-  end
-
-  def index_text
-    @index_text ||= [spoiler_text, Formatter.instance.plaintext(self)].concat(media_attachments.map(&:description)).concat(preloadable_poll ? preloadable_poll.options : []).concat(quote? ? ["QT: [#{quote.url || ActivityPub::TagManager.instance.url_for(quote)}]"] : []).filter(&:present?).join("\n\n")
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
   end
 
   def replies_count

From 611c31103c707dfbedc26b362dbdd186ec7c74d2 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:28:17 +0200
Subject: [PATCH 133/200] Revert "Fix account link in quote"

This reverts commit bfe472cf3b2588a78383efc598a3bf9bda4e9753.
---
 app/javascript/mastodon/components/status.js  | 130 ------------------
 .../status/components/detailed_status.js      | 102 +-------------
 2 files changed, 3 insertions(+), 229 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index c5013bf9c..295e83f58 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -459,136 +459,6 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
-    let quote = null;
-    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
-      let quote_status = status.get('quote');
-
-      let quote_media = null;
-      if (quote_status.get('media_attachments').size > 0) {
-        if (pictureInPicture.get('inUse')) {
-          quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
-        } else if (this.props.muted) {
-          quote_media = (
-            <AttachmentList
-              compact
-              media={quote_status.get('media_attachments')}
-            />
-          );
-        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-          const attachment = quote_status.getIn(['media_attachments', 0]);
-
-          quote_media = (
-            <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
-              {Component => (
-                <Component
-                  src={attachment.get('url')}
-                  alt={attachment.get('description')}
-                  poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
-                  backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
-                  foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
-                  accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
-                  duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-                  width={this.props.cachedMediaWidth}
-                  height={70}
-                  cacheWidth={this.props.cacheMediaWidth}
-                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
-                  />
-              )}
-            </Bundle>
-          );
-        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
-          const attachment = quote_status.getIn(['media_attachments', 0]);
-
-          quote_media = (
-            <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
-              {Component => (
-                <Component
-                  preview={attachment.get('preview_url')}
-                  frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
-                  blurhash={attachment.get('blurhash')}
-                  src={attachment.get('url')}
-                  alt={attachment.get('description')}
-                  width={this.props.cachedMediaWidth}
-                  height={110}
-                  inline
-                  sensitive={quote_status.get('sensitive')}
-                  onOpenVideo={this.handleOpenVideoQuote}
-                  cacheWidth={this.props.cacheMediaWidth}
-                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
-                  visible={this.state.showQuoteMedia}
-                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
-                  quote
-                />
-              )}
-            </Bundle>
-          );
-        } else {
-          quote_media = (
-            <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
-              {Component => (
-                <Component
-                  media={quote_status.get('media_attachments')}
-                  sensitive={quote_status.get('sensitive')}
-                  height={110}
-                  onOpenMedia={this.handleOpenMediaQuote}
-                  cacheWidth={this.props.cacheMediaWidth}
-                  defaultWidth={this.props.cachedMediaWidth}
-                  visible={this.state.showQuoteMedia}
-                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
-                  quote
-                />
-              )}
-            </Bundle>
-          );
-        }
-      }
-
-      if (quote_muted) {
-        quote = (
-          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
-            <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
-              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
-            </div>
-          </div>
-        );
-      } else if (quote_status.get('visibility') === 'unlisted' && !!contextType && ['public', 'community', 'hashtag'].includes(contextType.split(':', 2)[0])) {
-        quote = (
-          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
-            <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
-              <button onClick={this.handleQuoteClick}>
-                <FormattedMessage id='status.unlisted_quote' defaultMessage='Unlisted quote' />
-              </button>
-            </div>
-          </div>
-        );
-      } else {
-        quote = (
-          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
-            <div className='status__info'>
-              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
-                <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
-                <DisplayName account={quote_status.get('account')} />
-              </a>
-            </div>
-            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
-            {quote_media}
-          </div>
-        );
-      }
-    } else if (quote_muted) {
-      quote = (
-        <div className={classNames('quote-status', { muted: this.props.muted })}>
-          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
-            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
-          </div>
-        </div>
-      );
-    }
-
-    const expires_at = status.get('expires_at')
-    const expires_date = expires_at && new Date(expires_at)
-    const expired = expires_date && expires_date.getTime() < intl.now()
-
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index d97190698..043a749ed 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -54,15 +54,8 @@ class DetailedStatus extends ImmutablePureComponent {
 
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
-      const id = e.currentTarget.getAttribute('data-id');
-      const group = e.currentTarget.getAttribute('data-group') !== 'false';
-
       e.preventDefault();
-      if (group) {
-        this.context.router.history.push(`/timelines/groups/${id}`);
-      } else {
-        this.context.router.history.push(`/accounts/${id}`);
-      }
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
 
     e.stopPropagation();
@@ -128,95 +121,6 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
-    let quote = null;
-    if (status.get('quote', null) !== null) {
-      let quote_status = status.get('quote');
-
-      let quote_media = null;
-      if (quote_status.get('media_attachments').size > 0) {
-
-        if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-          const attachment = quote_status.getIn(['media_attachments', 0]);
-
-          quote_media = (
-            <Audio
-              src={attachment.get('url')}
-              alt={attachment.get('description')}
-              duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-              poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
-              backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
-              foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
-              accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
-              height={60}
-            />
-          );
-        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
-          const attachment = quote_status.getIn(['media_attachments', 0]);
-
-          quote_media = (
-            <Video
-              preview={attachment.get('preview_url')}
-              frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
-              blurhash={attachment.get('blurhash')}
-              src={attachment.get('url')}
-              alt={attachment.get('description')}
-              width={300}
-              height={150}
-              inline
-              onOpenVideo={this.handleOpenVideoQuote}
-              sensitive={quote_status.get('sensitive')}
-              visible={this.props.showQuoteMedia}
-              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
-              quote
-            />
-          );
-        } else {
-          quote_media = (
-            <MediaGallery
-              standalone
-              sensitive={quote_status.get('sensitive')}
-              media={quote_status.get('media_attachments')}
-              height={300}
-              onOpenMedia={this.props.onOpenMediaQuote}
-              visible={this.props.showQuoteMedia}
-              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
-              quote
-            />
-          );
-        }
-      }
-
-      if (quote_muted) {
-        quote = (
-          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-            <div className='status__content muted-quote'>
-              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
-            </div>
-          </div>
-        );
-      } else {
-        quote = (
-          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} className='detailed-status__display-name'>
-              <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
-              <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
-            </a>
-
-            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
-            {quote_media}
-          </div>
-        );
-      }
-    } else if (quote_muted) {
-      quote = (
-        <div className={classNames('quote-status', { muted: this.props.muted })} data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
-            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
-          </div>
-        </div>
-      );
-    }
-
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
@@ -335,8 +239,8 @@ class DetailedStatus extends ImmutablePureComponent {
 
     return (
       <div style={outerStyle}>
-        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact, 'detailed-status-with-expiration': expires_date, 'detailed-status-expired': expired })}>
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} data-group={status.getIn(['account', 'group'])} className='detailed-status__display-name'>
+        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })}>
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
             <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>

From 2721e13452b856fd2233d1e65d26d22ce0e56aa2 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:28:29 +0200
Subject: [PATCH 134/200] Revert "Add quote and bookmark button in PiP"

This reverts commit 70318ba219bd19c3f43c60ccb40384998f2f8f7f.
---
 .../picture_in_picture/components/footer.js   | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index a023c469d..1ecb18bf8 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -5,9 +5,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import IconButton from 'mastodon/components/icon_button';
 import classNames from 'classnames';
-import { me, boostModal, show_quote_button } from 'mastodon/initial_state';
+import { me, boostModal } from 'mastodon/initial_state';
 import { defineMessages, injectIntl } from 'react-intl';
-import { replyCompose, quoteCompose } from 'mastodon/actions/compose';
+import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { makeGetStatus } from 'mastodon/selectors';
 import { initBoostModal } from 'mastodon/actions/boosts';
@@ -21,7 +21,6 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
-  bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
@@ -120,41 +119,12 @@ class Footer extends ImmutablePureComponent {
     router.history.push(`/statuses/${status.get('id')}`);
   }
 
-  _performQuote = () => {
-    const { dispatch, status, onClose } = this.props;
-    const { router } = this.context;
-
-    if (onClose) {
-      onClose();
-    }
-
-    dispatch(quoteCompose(status, router.history));
-  };
-
-  handleQuoteClick = () => {
-    const { dispatch, askReplyConfirmation, intl } = this.props;
-
-    if (askReplyConfirmation) {
-      dispatch(openModal('CONFIRM', {
-        message: intl.formatMessage(messages.quoteMessage),
-        confirm: intl.formatMessage(messages.quoteConfirm),
-        onConfirm: this._performQuote,
-      }));
-    } else {
-      this._performQuote();
-    }
-  }
-
   render () {
     const { status, intl, withOpenButton } = this.props;
 
     const publicStatus  = ['public', 'unlisted'].includes(status.get('visibility'));
     const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
 
-    const expires_at = status.get('expires_at')
-    const expires_date = expires_at && new Date(expires_at)
-    const expired = expires_date && expires_date.getTime() < intl.now()
-
     let replyIcon, replyTitle;
 
     if (status.get('in_reply_to_id', null) === null) {
@@ -182,11 +152,6 @@ class Footer extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
-<<<<<<< HEAD
-=======
-        {show_quote_button && <IconButton className='status__action-bar-button' disabled={!publicStatus || expired} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />}
-        <IconButton className='status__action-bar-button bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
->>>>>>> bbeaf126c... Add quote and bookmark button in PiP
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
       </div>
     );

From 259ef00c1a919672e860f3785a3180d8a24b37f9 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:28:43 +0200
Subject: [PATCH 135/200] Revert "fix rtl in quote_indicator"

This reverts commit fb9442dcc689326b82059151241e0087f6e2a573.
---
 .../features/compose/components/quote_indicator.js         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index d09516137..4cb844151 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,8 +6,11 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+<<<<<<< HEAD
 import { isRtl } from '../../../rtl';
+=======
 import AttachmentList from 'mastodon/components/attachment_list';
+>>>>>>> 008cc7f1a... fix rtl in quote_indicator
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
@@ -57,6 +60,9 @@ export default class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
+<<<<<<< HEAD
+        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+=======
         <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
@@ -65,6 +71,7 @@ export default class QuoteIndicator extends ImmutablePureComponent {
             media={status.get('media_attachments')}
           />
         )}
+>>>>>>> 008cc7f1a... fix rtl in quote_indicator
       </div>
     );
   }

From c84f40331e524f1e16835dc5a888de1281f96e39 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:28:55 +0200
Subject: [PATCH 136/200] Revert "fix"

This reverts commit c345a1eeddff4f943b7c263761c60b6368963f6b.
---
 .../compose/components/quote_indicator.js     | 18 ++--------
 app/views/statuses/_quote_status.html.haml    | 35 -------------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 app/views/statuses/_quote_status.html.haml

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 4cb844151..515c79fca 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,11 +6,7 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-<<<<<<< HEAD
 import { isRtl } from '../../../rtl';
-=======
-import AttachmentList from 'mastodon/components/attachment_list';
->>>>>>> 008cc7f1a... fix rtl in quote_indicator
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
@@ -48,6 +44,9 @@ export default class QuoteIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
+    const style   = {
+      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
+    };
 
     return (
       <div className='quote-indicator'>
@@ -60,18 +59,7 @@ export default class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-<<<<<<< HEAD
         <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
-=======
-        <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
-
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
-        )}
->>>>>>> 008cc7f1a... fix rtl in quote_indicator
       </div>
     );
   }
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
deleted file mode 100644
index f2fc02258..000000000
--- a/app/views/statuses/_quote_status.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-.status.quote-status{ dataurl:  ActivityPub::TagManager.instance.url_for(status) }
-  = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
-    .status__avatar
-      %div
-        = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar'
-    %span.display-name
-      %bdi
-        %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true)
-      &nbsp;
-      %span.display-name__account
-        = acct(status.account)
-        = fa_icon('lock') if status.account.locked?
-
-  .status__content.emojify<
-    - if status.spoiler_text?
-      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
-        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
-        %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" }
-      = Formatter.instance.format_in_quote(status, custom_emojify: true)
-  
-  - if !status.media_attachments.empty?
-    - if status.media_attachments.first.video?
-      - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
-        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
-    - elsif status.media_attachments.first.audio?
-      - audio = status.media_attachments.first
-      = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do
-        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
-    - else
-      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do
-        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
-  - elsif status.preview_card
-    = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true

From bd61f7969897923202665bb075cc715cce7f1f3e Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:29:45 +0200
Subject: [PATCH 137/200] Revert "[New] Implement a feature of quote"

This reverts commit 37025a8170693d05348271b5dc18bf98d20a3681.
---
 app/javascript/mastodon/actions/compose.js    | 32 +--------
 .../mastodon/components/status_action_bar.js  |  7 --
 .../mastodon/components/status_content.js     | 17 -----
 .../mastodon/containers/status_container.js   |  5 --
 .../compose/components/compose_form.js        |  2 -
 .../compose/components/quote_indicator.js     | 67 -------------------
 .../containers/quote_indicator_container.js   | 24 -------
 .../features/status/components/action_bar.js  |  7 --
 .../features/status/components/card.js        |  4 --
 .../mastodon/features/status/index.js         |  6 --
 .../mastodon/locales/defaultMessages.json     | 13 ----
 app/javascript/mastodon/locales/en.json       |  2 -
 app/javascript/mastodon/locales/ja.json       |  2 -
 app/javascript/mastodon/reducers/compose.js   | 21 ------
 .../styles/mastodon/components.scss           | 28 ++------
 app/services/fetch_link_card_service.rb       |  4 +-
 16 files changed, 10 insertions(+), 231 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/compose/components/quote_indicator.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/quote_indicator_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 26e7bfab2..891403969 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -20,8 +20,6 @@ export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
 export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
 export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
-export const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
-export const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
@@ -102,25 +100,6 @@ export function cancelReplyCompose() {
   };
 };
 
-export function quoteCompose(status, router) {
-  return (dispatch, getState) => {
-    dispatch({
-      type: COMPOSE_QUOTE,
-      status: status,
-    });
-
-    if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
-    }
-  };
-};
-
-export function cancelQuoteCompose() {
-  return {
-    type: COMPOSE_QUOTE_CANCEL,
-  };
-};
-
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
@@ -151,22 +130,13 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    let status = getState().getIn(['compose', 'text'], '');
+    const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
-    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
-    if (quoteId) {
-      status = [
-        status,
-        "~~~~~~~~~~",
-        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
-      ].join("\n");
-    }
-
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index ba860304c..7dbbb99cc 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,7 +24,6 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
-  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
@@ -62,7 +61,6 @@ class StatusActionBar extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
-    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -139,10 +137,6 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onBookmark(this.props.status);
   }
 
-  handleQuoteClick = () => {
-    this.props.onQuote(this.props.status, this.context.router.history);
-  }
-
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -340,7 +334,6 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
 
         {shareButton}
         <IconButton className='status__action-bar-button' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5cf7ca802..bf21a9fd6 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -38,8 +38,6 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
-    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
-    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -48,12 +46,6 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
-      if (quote) {
-        if (link.href.match(QuoteUrlFormat)) {
-          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
-        }
-      }
-
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -133,15 +125,6 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
-  onQuoteClick = (statusId, e) => {
-    let statusUrl = `/statuses/${statusId}`;
-
-    if (this.context.router && e.button === 0) {
-      e.preventDefault();
-      this.context.router.history.push(statusUrl);
-    }
-  }
-
   handleMouseDown = (e) => {
     this.startXY = [e.clientX, e.clientY];
   }
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 43acf597d..9abdec138 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,7 +4,6 @@ import Status from '../components/status';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
-  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../actions/compose';
@@ -100,10 +99,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onQuote (status, router) {
-    dispatch(quoteCompose(status, router));
-  },
-
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 81eb74c32..4456935e3 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -4,7 +4,6 @@ import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
-import QuoteIndicatorContainer from '../containers/quote_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import AutosuggestInput from '../../../components/autosuggest_input';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -221,7 +220,6 @@ class ComposeForm extends ImmutablePureComponent {
         <WarningContainer />
 
         <ReplyIndicatorContainer />
-        <QuoteIndicatorContainer />
 
         <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef}>
           <AutosuggestInput
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
deleted file mode 100644
index 515c79fca..000000000
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
-import Avatar from '../../../components/avatar';
-import IconButton from '../../../components/icon_button';
-import DisplayName from '../../../components/display_name';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
-
-const messages = defineMessages({
-  cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
-});
-
-@injectIntl
-export default class QuoteIndicator extends ImmutablePureComponent {
-
-  static contextTypes = {
-    router: PropTypes.object,
-  };
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onCancel();
-  }
-
-  handleAccountClick = (e) => {
-    if (e.button === 0) {
-      e.preventDefault();
-      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
-    }
-  }
-
-  render () {
-    const { status, intl } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
-
-    return (
-      <div className='quote-indicator'>
-        <div className='quote-indicator__header'>
-          <div className='quote-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} /></div>
-
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name'>
-            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} />
-          </a>
-        </div>
-
-        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
deleted file mode 100644
index eb67f3939..000000000
--- a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { connect } from 'react-redux';
-import { cancelQuoteCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import QuoteIndicator from '../components/quote_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => ({
-    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelQuoteCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 7d81bb05e..9ae1579be 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,7 +18,6 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
-  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -57,7 +56,6 @@ class ActionBar extends React.PureComponent {
     relationship: ImmutablePropTypes.map,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
-    onQuote: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -84,10 +82,6 @@ class ActionBar extends React.PureComponent {
     this.props.onReblog(this.props.status, e);
   }
 
-  handleQuoteClick = () => {
-    this.props.onQuote(this.props.status, this.context.router.history);
-  }
-
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -279,7 +273,6 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenuContainer size={18} icon='ellipsis-h' status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 317163648..90f9ae7ae 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -60,10 +60,6 @@ const addAutoPlay = html => {
 
 export default class Card extends React.PureComponent {
 
-  static contextTypes = {
-    router: PropTypes.object,
-  };
-
   static propTypes = {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 0cd25955b..df8362a1b 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -22,7 +22,6 @@ import {
 } from '../../actions/interactions';
 import {
   replyCompose,
-  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../../actions/compose';
@@ -260,10 +259,6 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-    handleQuoteClick = (status) => {
-    this.props.dispatch(quoteCompose(status, this.context.router.history));
-  }
-
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -571,7 +566,6 @@ class Status extends ImmutablePureComponent {
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
-                  onQuote={this.handleQuoteClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index f0522d148..6d1db70ab 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -449,10 +449,6 @@
         "defaultMessage": "This post cannot be boosted",
         "id": "status.cannot_reblog"
       },
-      {
-        "defaultMessage": "Quote",
-        "id": "status.quote"
-      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
@@ -1233,15 +1229,6 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Cancel",
-        "id": "quote_indicator.cancel"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/quote_indicator.json"
-  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index ae1403168..b8c56a40c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -359,7 +359,6 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
-  "quote_indicator.cancel": "Cancel",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -411,7 +410,6 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
-  "status.quote": "Quote",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 0c99c7d5c..d67e962b8 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -369,7 +369,6 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
-  "quote_indicator.cancel": "キャンセル",
   "refresh": "更新",
   "qr_modal.description": "QRコードを読み取って簡単にプロフィールにアクセスしましょう。",
   "regeneration_indicator.label": "読み込み中…",
@@ -422,7 +421,6 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定されたトゥート",
   "status.read_more": "もっと見る",
-  "status.quote": "引用ブースト",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 596e1a68b..4c0ba1c36 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -5,8 +5,6 @@ import {
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
-  COMPOSE_QUOTE,
-  COMPOSE_QUOTE_CANCEL,
   COMPOSE_MENTION,
   COMPOSE_SUBMIT_REQUEST,
   COMPOSE_SUBMIT_SUCCESS,
@@ -61,8 +59,6 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
-  quote_from: null,
-  quote_from_uri: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -106,7 +102,6 @@ function clearAll(state) {
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
-    map.set('quote_from', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
     map.update('media_attachments', list => list.clear());
@@ -297,8 +292,6 @@ export default function compose(state = initialState, action) {
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
-      map.set('quote_from', null);
-      map.set('quote_from_uri', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -314,24 +307,10 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
-  case COMPOSE_QUOTE:
-    return state.withMutations(map => {
-      map.set('in_reply_to', null);
-      map.set('quote_from', action.status.get('id'));
-      map.set('quote_from_uri', action.status.get('uri'));
-      map.set('text', '');
-      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
-      map.set('focusDate', new Date());
-      map.set('preselectDate', new Date());
-      map.set('idempotencyKey', uuid());
-    });
   case COMPOSE_REPLY_CANCEL:
-  case COMPOSE_QUOTE_CANCEL:
   case COMPOSE_RESET:
     return state.withMutations(map => {
       map.set('in_reply_to', null);
-      map.set('quote_from', null);
-      map.set('quote_from_uri', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b5d209896..6b74a6bf1 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -780,37 +780,26 @@
 }
 
 .reply-indicator {
-  background: $ui-primary-color;
-}
-
-.quote-indicator {
-  background: $success-green;
-}
-
-.reply-indicator,
-.quote-indicator {
   border-radius: 4px;
   margin-bottom: 10px;
+  background: $ui-primary-color;
   padding: 10px;
   min-height: 23px;
   overflow-y: auto;
   flex: 0 2 auto;
 }
 
-.reply-indicator__header,
-.quote-indicator__header {
+.reply-indicator__header {
   margin-bottom: 5px;
   overflow: hidden;
 }
 
-.reply-indicator__cancel,
-.quote-indicator__cancel {
+.reply-indicator__cancel {
   float: right;
   line-height: 24px;
 }
 
-.reply-indicator__display-name,
-.quote-indicator__display-name {
+.reply-indicator__display-name {
   color: $inverted-text-color;
   display: block;
   max-width: 100%;
@@ -820,8 +809,7 @@
   text-decoration: none;
 }
 
-.reply-indicator__display-avatar,
-.quote-indicator__display-avatar {
+.reply-indicator__display-avatar {
   float: left;
   margin-right: 5px;
 }
@@ -835,8 +823,7 @@
 }
 
 .status__content,
-.reply-indicator__content,
-.quote-indicator__content {
+.reply-indicator__content {
   position: relative;
   font-size: 15px;
   line-height: 20px;
@@ -1286,8 +1273,7 @@
   margin-left: 6px;
 }
 
-.reply-indicator__content,
-.quote-indicator__content {
+.reply-indicator__content {
   color: $inverted-text-color;
   font-size: 14px;
 
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c5cd3096a..fa1636e41 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-    
+
     @card.save_with_optional_image!
   end
 

From c4763e2deb09c47e038e7e41c6e86510a75f8f16 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:35:34 +0200
Subject: [PATCH 138/200] Revert "fix bookmark"

This reverts commit ed58bd36aa851a3ef00ab47c4a29de64683eb54b.
---
 .../mastodon/features/status/components/action_bar.js       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 9ae1579be..ffa2510c0 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -86,6 +86,10 @@ class ActionBar extends React.PureComponent {
     this.props.onFavourite(this.props.status);
   }
 
+  handleBookmarkClick = (e) => {
+    this.props.onBookmark(this.props.status, e);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -274,6 +278,8 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         {shareButton}
+        <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
+
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenuContainer size={18} icon='ellipsis-h' status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
         </div>

From 1ea3cd470f19aa5e47133d95fcee53a133e127bd Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 18:39:09 +0200
Subject: [PATCH 139/200] remove bookmarkbuttom

---
 app/javascript/mastodon/components/status_action_bar.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 4c4b233b1..68ea9d6a2 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -343,7 +343,6 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {shareButton}
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         <div className='status__action-bar-dropdown'>
           <DropdownMenuContainer

From 3f97d2b39c81c5817ebccc7402d27e3292ab7a24 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 19:22:56 +0200
Subject: [PATCH 140/200] add chatroom link

---
 app/javascript/mastodon/features/ui/components/link_footer.js | 1 +
 app/javascript/mastodon/locales/ja.json                       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index 3c4cff9f9..432fd5f14 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -53,6 +53,7 @@ class LinkFooter extends React.PureComponent {
           <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>
           <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
           <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
+	  <li><a href='https://mattermost.pcgf.io/signup_user_complete/?id=i8xgw5ytb78b7ef5qz7zf7ieae' target='_blank'><FormattedMessage id='getting_started.chatroom' defaultMessage='Chatroom' /></a> · </li>
           <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
           <li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
           <li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 1f6d27848..c8520ba0e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -187,6 +187,7 @@
   "follow_request.reject": "拒否",
   "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain} のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
   "generic.saved": "保存しました",
+  "getting_started.chatroom": "チャットルーム",
   "getting_started.developers": "開発",
   "getting_started.directory": "ディレクトリ",
   "getting_started.documentation": "ドキュメント",

From 15b28354e4d2d5fd4e17ad87d8019000e9e72f27 Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Mon, 17 May 2021 02:31:09 +0900
Subject: [PATCH 141/200] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88Material?=
 =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=9E=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../styles/mastodon-material/color/black.scss |  16 +--
 .../color/mastodon-dark.scss                  |  16 +--
 .../color/mastodon-light.scss                 |  16 +--
 .../mastodon-material/color/plus-classic.scss |  16 +--
 .../mastodon-material/color/v1-dark.scss      |  16 +--
 .../mastodon-material/color/v1-light.scss     |  16 +--
 .../mastodon-material/color/v2-dark.scss      |  16 +--
 .../mastodon-material/color/v2-light.scss     |  17 +--
 .../mastodon-material/layout/material-v1.scss |   4 +
 .../mastodon-material/layout/material-v2.scss |   5 +
 .../mastodon-material/plugins/dense.scss      |  14 +-
 .../mastodon-material/plugins/fedibird.scss   |  24 ++++
 .../mastodon-material/plugins/plus.scss       |  11 ++
 .../profiles/y-zu-dark/color.scss             |   9 +-
 .../profiles/y-zu-dark/icon_config.scss       |   2 +
 .../profiles/y-zu-light/color.scss            |   9 +-
 .../profiles/y-zu-light/icon_config.scss      |   3 +
 .../profiles/y-zu-light/plugins.scss          |   1 +
 .../mastodon-material/theme/_mixins.scss      |   1 +
 .../mastodon-material/theme/account.scss      |  32 +++--
 .../styles/mastodon-material/theme/admin.scss | 127 ++++++++++++++++--
 .../theme/base_icon_config.scss               |   2 +
 .../mastodon-material/theme/basics.scss       |   6 +-
 .../mastodon-material/theme/button.scss       |  18 ++-
 .../mastodon-material/theme/columns.scss      |  54 +++++++-
 .../mastodon-material/theme/components.scss   |  34 ++++-
 .../mastodon-material/theme/containers.scss   |  14 +-
 .../mastodon-material/theme/emoji-picker.scss |   8 +-
 .../styles/mastodon-material/theme/forms.scss |  20 ++-
 .../theme/material-icons.scss                 |  37 ++++-
 .../styles/mastodon-material/theme/modal.scss |   9 +-
 .../mastodon-material/theme/responsive.scss   |  54 +++++---
 .../mastodon-material/theme/statuses.scss     |  15 ++-
 .../mastodon-material/theme/tables.scss       |  19 ++-
 .../styles/mastodon-material/theme/theme.scss |   4 +-
 35 files changed, 491 insertions(+), 174 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material/plugins/fedibird.scss

diff --git a/app/javascript/styles/mastodon-material/color/black.scss b/app/javascript/styles/mastodon-material/color/black.scss
index 67c8cd7d5..3e7eca223 100644
--- a/app/javascript/styles/mastodon-material/color/black.scss
+++ b/app/javascript/styles/mastodon-material/color/black.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: lighten($menu-bg-color, 10%);
 $menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
 $card-bg-color: #121212;
 $card-bg-hover-color: lighten($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #000000;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
@@ -124,18 +125,11 @@ $search-bar-color: lighten($top-bar-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#ffffff, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #121212;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/mastodon-dark.scss b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
index 626de6075..d697c5ee5 100644
--- a/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-dark.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: lighten($menu-bg-color, 10%);
 $menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
 $card-bg-color: #313543;
 $card-bg-hover-color: lighten($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #282c37;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
@@ -124,18 +125,11 @@ $search-bar-color: lighten($top-bar-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
-$tab-indicator-color: #d9e1e8;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: #d9e1e8;
+$tab-item-active-color: $primary-color;
 $tab-bg-color: #1f232b;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/mastodon-light.scss b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
index 833dca194..d2e890f04 100644
--- a/app/javascript/styles/mastodon-material/color/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-material/color/mastodon-light.scss
@@ -33,6 +33,7 @@ $menu-bg-active-color: darken($bg-color, 10%);
 $menu-bg-active-hover-color: darken($bg-color, 16%);
 $card-bg-color: #ffffff;
 $card-bg-hover-color: darken($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
@@ -123,18 +124,11 @@ $search-bar-color: #d9e1e8;
 $search-bar-focus-color: $bg-color;
 
 // Tab color
-$tab-indicator-color: #282c37;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: #282c37;
+$tab-item-active-color: $primary-color;
 $tab-bg-color: #e6ebf0;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $tab-indicator-color;
-$text-tab-indicator-active-color: $tab-indicator-active-color;
-$text-tab-bg-color: $tab-bg-color;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
index cc8b89f2f..837b850cb 100644
--- a/app/javascript/styles/mastodon-material/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: darken($menu-bg-color, 10%);
 $menu-bg-active-hover-color: darken($menu-bg-color, 16%);
 $card-bg-color: #ffffff;
 $card-bg-hover-color: darken($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
@@ -123,18 +124,11 @@ $search-bar-color: darken($bg-color, 6%);
 $search-bar-focus-color: $bg-color;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#ffffff, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/v1-dark.scss b/app/javascript/styles/mastodon-material/color/v1-dark.scss
index d0bde6154..d8d65d4f4 100644
--- a/app/javascript/styles/mastodon-material/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-dark.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: lighten($menu-bg-color, 10%);
 $menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
 $card-bg-color: #424242;
 $card-bg-hover-color: lighten($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #424242;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
@@ -123,18 +124,11 @@ $search-bar-color: lighten($bg-color, 6%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#ffffff, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #424242;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/v1-light.scss b/app/javascript/styles/mastodon-material/color/v1-light.scss
index 58bb0ad4e..35e1054ae 100644
--- a/app/javascript/styles/mastodon-material/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-light.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: darken($menu-bg-color, 10%);
 $menu-bg-active-hover-color: darken($menu-bg-color, 16%);
 $card-bg-color: #ffffff;
 $card-bg-hover-color: darken($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #ffffff;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
@@ -124,18 +125,11 @@ $search-bar-color: darken($bg-color, 6%);
 $search-bar-focus-color: $bg-color;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#ffffff, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $top-bar-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize(#000000, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize(#000000, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/v2-dark.scss b/app/javascript/styles/mastodon-material/color/v2-dark.scss
index 842c6f648..feb8669a3 100644
--- a/app/javascript/styles/mastodon-material/color/v2-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-dark.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: lighten($menu-bg-color, 10%);
 $menu-bg-active-hover-color: lighten($menu-bg-color, 16%);
 $card-bg-color: #1e1e1e;
 $card-bg-hover-color: lighten($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: #1e1e1e;
 $list-bg-hover-color: lighten($list-bg-color, 6%);
 $list-bg-active-color: lighten($list-bg-color, 10%);
@@ -124,18 +125,11 @@ $search-bar-color: lighten($top-bar-color, 18%);
 $search-bar-focus-color: #ffffff;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#ffffff, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #1e1e1e;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/color/v2-light.scss b/app/javascript/styles/mastodon-material/color/v2-light.scss
index 10e7a0b91..0e853ed39 100644
--- a/app/javascript/styles/mastodon-material/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-light.scss
@@ -34,6 +34,7 @@ $menu-bg-active-color: darken($menu-bg-color, 10%);
 $menu-bg-active-hover-color: darken($menu-bg-color, 16%);
 $card-bg-color: $bg-color;
 $card-bg-hover-color: darken($card-bg-color, 6%);
+$succeeded-card-bg-color: lighten($verified-color, 36%);
 $list-bg-color: $bg-color;
 $list-bg-hover-color: darken($list-bg-color, 6%);
 $list-bg-active-color: darken($list-bg-color, 10%);
@@ -124,18 +125,12 @@ $search-bar-color: darken($bg-color, 6%);
 $search-bar-focus-color: $bg-color;
 
 // Tab color
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
+$tab-item-color: transparentize(#000000, 0.5);
+$tab-item-active-color: $primary-color;
 $tab-bg-color: $top-bar-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$text-tab-indicator-color: $secondary-text-color;
-$text-tab-indicator-active-color: $ui-text-color;
-$text-tab-bg-color: #ffffff;
-$text-tab-indicator-bg-hover-color: transparentize($text-tab-indicator-active-color, 0.9);
-$text-tab-indicator-bg-focus-color: transparentize($text-tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
+
 
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
diff --git a/app/javascript/styles/mastodon-material/layout/material-v1.scss b/app/javascript/styles/mastodon-material/layout/material-v1.scss
index 661cc55a4..7746e0eb7 100644
--- a/app/javascript/styles/mastodon-material/layout/material-v1.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v1.scss
@@ -30,6 +30,10 @@ $dialog-radius: 2px;
 $menu-radius: 2px;
 
 
+// Table radius settings
+$table-radius: 2px;
+
+
 // Media radius settings
 $media-radius: 0;
 
diff --git a/app/javascript/styles/mastodon-material/layout/material-v2.scss b/app/javascript/styles/mastodon-material/layout/material-v2.scss
index 98a3285c7..cc2c8d298 100644
--- a/app/javascript/styles/mastodon-material/layout/material-v2.scss
+++ b/app/javascript/styles/mastodon-material/layout/material-v2.scss
@@ -33,6 +33,11 @@ $dialog-radius: 8px;
 $menu-radius: 8px;
 
 
+// Table radius settings
+$table-radius: 8px;
+//$table-radius: 2px;
+
+
 // Media radius settings
 $media-radius: 0;
 //$media-radius: 2px;
diff --git a/app/javascript/styles/mastodon-material/plugins/dense.scss b/app/javascript/styles/mastodon-material/plugins/dense.scss
index 070bd9d69..1a9ad31d1 100644
--- a/app/javascript/styles/mastodon-material/plugins/dense.scss
+++ b/app/javascript/styles/mastodon-material/plugins/dense.scss
@@ -55,7 +55,15 @@
         top: 10px;
     }
 
-    &__content { padding-top: 2px }
+    &__content {
+        padding-top: 2px;
+
+        &__spoiler-link,
+        &__read-more-button {
+            height: auto;
+            padding: 4px 8px;
+        }
+    }
 
     &__action-bar-button {
         margin: 0 4px;
@@ -72,6 +80,10 @@
     }
 }
 
+@media screen and (min-width: 630px) {
+    .columns-area--mobile .status { padding: 8px 8px 8px 78px }
+}
+
 .detailed-status {
     padding: 14px;
 
diff --git a/app/javascript/styles/mastodon-material/plugins/fedibird.scss b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
new file mode 100644
index 000000000..2d92ecbf3
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
@@ -0,0 +1,24 @@
+.drawer__tab.short-label {
+    padding: 8px;
+
+    .drawer__tab__short-label {
+        overflow-x: visible;
+        display: none;
+    }
+
+    i { margin: 0 }
+}
+
+.tabs-bar.bottom-bar {
+    @include shadow-4dp;
+    
+    .tabs-bar {
+        &__link.active { border-bottom: none }
+    }
+
+    &__link span { margin-left: 0 }
+}
+
+@media screen and (max-width: 1190px) {
+    .tabs-bar__wrapper .tabs-bar.bottom-bar { width: 100% }
+}
\ 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 36ef1cebb..ad0ed709c 100644
--- a/app/javascript/styles/mastodon-material/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material/plugins/plus.scss
@@ -27,4 +27,15 @@
 
         &.fa-fw::before { vertical-align: middle }
     }
+}
+
+// Fedibird bottom bar in mobile
+.tabs-bar.bottom-bar {
+    background: #212121;
+
+    .tabs-bar__link {
+        color: transparentize(#ffffff, 0.5);
+
+        &.active { color: #ffffff }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
index b273c0652..92ee05675 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/color.scss
@@ -38,12 +38,9 @@ $toggle-track-active-color: lighten($toggle-thumb-active-color, 18%);
 
 $border-active-color: $primary-color;
 
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$tab-indicator-bg-hover-color: transparentize($tab-indicator-active-color, 0.9);
-$tab-indicator-bg-focus-color: transparentize($tab-indicator-active-color, 0.8);
-$icon-tab-indicator-active-color: $primary-color;
-$icon-tab-indicator-hover-color: $icon-hover-color;
+$tab-item-active-color: $primary-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
index f109ac61c..87566d783 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/icon_config.scss
@@ -1,3 +1,5 @@
 // Add your icon customization below
 
+$boost-icon-color: #00ACC1;
+
 $icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
index 7c4349512..7c5023298 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/color.scss
@@ -43,12 +43,9 @@ $scroll-bar-thumb-color: lighten($icon-color, 30%);
 $scroll-bar-thumb-hover-color: darken($scroll-bar-thumb-color, 10%);
 $scroll-bar-thumb-active-color: darken($scroll-bar-thumb-color, 18%);
 
-$tab-indicator-color: $top-bar-icon-color;
-$tab-indicator-active-color: $top-bar-icon-color;
-$text-tab-indicator-color: lighten($top-bar-icon-color, 10%);
-$text-tab-indicator-active-color: $top-bar-icon-color;
-$icon-tab-indicator-active-color: $top-bar-icon-color;
-$icon-tab-indicator-hover-color: $top-bar-icon-hover-color;
+$tab-item-active-color: $primary-color;
+$tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
+$tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
 
 $progress-indicator-color: $primary-color;
 $progress-indicator-track-color: lighten($progress-indicator-color, 30%);
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
index f109ac61c..5004c2d1e 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/icon_config.scss
@@ -1,3 +1,6 @@
 // Add your icon customization below
 
+
+$boosted-icon-color: #009688;
+
 $icon-font-source: self;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
index 292ec7fa6..7a2d83e4d 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
@@ -1,4 +1,5 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 @import '../../plugins/dense';
+@import '../../plugins/fedibird'
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
index 7c45fb0b7..a1520380d 100644
--- a/app/javascript/styles/mastodon-material/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -60,6 +60,7 @@ $shadow-color-3: rgba(0,0,0,.12);
 @mixin button-type($button-type) {
     border-radius: $button-radius;
     display: inline-block;
+    font-weight: 500;
     
     @if $button-type == contained {
         @if $button-shadow { @include shadow-1dp }
diff --git a/app/javascript/styles/mastodon-material/theme/account.scss b/app/javascript/styles/mastodon-material/theme/account.scss
index b045a96cb..c8663156c 100644
--- a/app/javascript/styles/mastodon-material/theme/account.scss
+++ b/app/javascript/styles/mastodon-material/theme/account.scss
@@ -88,7 +88,7 @@
 
                 &__fields {
                     border: 1px solid $border-color;
-                    border-radius: 4px;
+                    border-radius: $table-radius;
 
                     .verified {
                         border: none;
@@ -106,12 +106,20 @@
                         &:last-child { border-bottom: 0 }
                     }
 
+                    dd,
                     dt {
                         color: $primary-text-color;
-                        background: $list-bg-inactive-color;
+                        padding: 16px;
                     }
 
                     dd { color: $primary-text-color }
+
+                    dt { background: $list-bg-inactive-color }
+                }
+
+                &__joined {
+                    padding: 8px;
+                    color: $info-text-color;
                 }
             }
         }
@@ -160,24 +168,24 @@
     }
 
     &__section-headline {
-        background: $text-tab-bg-color;
+        background: $tab-bg-color;
         border-bottom: 1px solid $border-color;
 
         a {
             padding: 16px 0;
-            color: $text-tab-indicator-color;
+            color: $tab-item-color;
 
             &.active {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 4px solid $text-tab-indicator-active-color;
+                color: $tab-item-active-color;
+                border-bottom: 4px solid $tab-item-active-color;
 
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $text-tab-indicator-bg-focus-color }
+                &:focus { background: $tab-bg-focus-color }
             }
 
-            &:hover { background: $text-tab-indicator-bg-hover-color }
+            &:hover { background: $tab-bg-hover-color }
         }
     }
 
@@ -264,4 +272,12 @@
         width: 16px;
         height: 16px;
     }
+}
+
+.nothing-here {
+    background: $card-bg-color;
+    color: $ui-text-color;
+    padding: 16px;
+
+    &--under-tabs { border-radius: 0 0 $card-radius $card-radius }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/admin.scss b/app/javascript/styles/mastodon-material/theme/admin.scss
index dd9509a94..d8b5bf57f 100644
--- a/app/javascript/styles/mastodon-material/theme/admin.scss
+++ b/app/javascript/styles/mastodon-material/theme/admin.scss
@@ -65,7 +65,6 @@
 
         h4 {
             color: $section-text-color;
-            border-top: 1px solid $border-color;
             border-bottom: none;
             padding: 12px 16px;
         }
@@ -83,6 +82,8 @@
 
         .positive-hint { color: $verified-color }
 
+        .neutral-hint { color: $tips-text-color }
+
         .directory__tag h4 { color: $ui-text-color }
 
         &>p {
@@ -118,23 +119,23 @@
     }
 
     a {
-        color: $text-tab-indicator-color;
+        color: $tab-item-color;
         border-bottom: 2px solid transparent;
         padding: 8px;
 
         &.selected {
-            color: $text-tab-indicator-active-color;
-            border-bottom: 2px solid $text-tab-indicator-active-color;
+            color: $tab-item-active-color;
+            border-bottom: 2px solid $tab-item-active-color;
 
             &:hover {
-                color: $text-tab-indicator-active-color;
-                border-bottom: 2px solid $text-tab-indicator-active-color;
+                color: $tab-item-active-color;
+                border-bottom: 2px solid $tab-item-active-color;
             }
         }
 
         &:hover {
-            color: $text-tab-indicator-color;
-            background: $text-tab-indicator-bg-hover-color;
+            color: $tab-item-color;
+            background: $tab-bg-hover-color;
             border-bottom: 2px solid transparent;
         }
     }
@@ -148,4 +149,112 @@ body {
     
         a { color: $link-text-color }
     }
-}
\ No newline at end of file
+
+    .neutral-hint { color: $tips-text-color }
+}
+
+.report-card {
+    @include shadow-1dp;
+    background: $card-bg-color;
+    border-radius: $card-radius;
+    margin-bottom: 16px;
+
+    &__profile {
+        padding: 16px;
+
+        &__stats {
+            color: $info-text-color;
+
+            .red { color: $error-color }
+        }
+    }
+
+    &__summary__item {
+        border-top: 1px solid $border-color;
+
+        &:hover { background: $card-bg-color }
+
+        &__assigned,
+        &__reported-by { color: $ui-text-color }
+
+        &__content {
+            a {
+                padding: 16px;
+                color: $primary-text-color;
+            }
+
+            &__icon {
+                color: $icon-color;
+                margin-right: 8px;
+            }
+        }
+    }
+}
+
+
+.log-entry {
+    padding: 16px 0;
+    background: $list-bg-color;
+    border-bottom: 1px solid $border-color;
+
+    &:first-child { border-radius: $table-radius $table-radius 0 0 }
+
+    &:last-child { border-radius: 0 0 $table-radius $table-radius }
+
+    &__header {
+        color: $ui-text-color;
+        padding: 0 16px;
+    }
+
+    &__avatar { margin-right: 16px }
+
+    &__timestamp { color: $info-text-color }
+
+    .target,
+    .username,
+    a { color: $primary-text-color }
+}
+
+.dashboard {
+    &__counters {
+        &__num,
+        &__text {
+            color: $secondary-text-color;
+            margin-bottom: 16px;
+        }
+
+        &__label { color: $ui-text-color }
+
+        &>div {
+            padding: 0 8px;
+            margin-bottom: 16px;
+
+            &>div,
+            &>a {
+                @include shadow-1dp;
+                padding: 16px;
+                background: $card-bg-color;
+                border-radius: $card-radius;
+
+                &:active,
+                &:focus,
+                &:hover { background: $card-bg-hover-color }
+            }
+        }
+    }
+
+    &__widgets {
+        &>div {
+            margin-bottom: 16px;
+
+            &>div { padding: 0 8px }
+        }
+
+        a:not(.name-tag) { color: $ui-text-color }
+    }
+}
+
+.inline-name-tag,
+.name-tag,
+a.inline-name-tag,
+a.name-tag { color: $ui-text-color }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/base_icon_config.scss b/app/javascript/styles/mastodon-material/theme/base_icon_config.scss
index 2081d8828..e8c895904 100644
--- a/app/javascript/styles/mastodon-material/theme/base_icon_config.scss
+++ b/app/javascript/styles/mastodon-material/theme/base_icon_config.scss
@@ -8,6 +8,8 @@ $favorite-icon-color: #ffd600;  // Star
 //$favorite-icon-color: #db4437;  // +1
 //$favorite-icon-color: #ffffff;  // inverted +1 (for plus plugin)
 
+$boosted-icon-color: $primary-color;
+
 
 // Reply icon settings
 $reply-icon: "reply";
diff --git a/app/javascript/styles/mastodon-material/theme/basics.scss b/app/javascript/styles/mastodon-material/theme/basics.scss
index 27adf1e86..9045db11f 100644
--- a/app/javascript/styles/mastodon-material/theme/basics.scss
+++ b/app/javascript/styles/mastodon-material/theme/basics.scss
@@ -1,7 +1,11 @@
 body,
 body.embed,
 body.admin,
-body.lighter { background: $bg-color }
+body.lighter,
+body.error {
+    background: $bg-color;
+    color: $ui-text-color;
+}
 
 .focusable:focus { background: transparent }
 
diff --git a/app/javascript/styles/mastodon-material/theme/button.scss b/app/javascript/styles/mastodon-material/theme/button.scss
index fcb59dbbe..2caa05ab9 100644
--- a/app/javascript/styles/mastodon-material/theme/button.scss
+++ b/app/javascript/styles/mastodon-material/theme/button.scss
@@ -119,7 +119,23 @@ label.icon-button {
 
     &.button--block { margin: 8px 0 }
 
-    &.button-secondary { @include button-type($button-on-status) }
+    &.button-secondary {
+        @include button-type($button-on-status);
+
+        &:disabled {
+            color: $disabled-button-color;
+            border: 1px solid $disabled-button-color;
+            opacity: 1;
+
+            &:hover,
+            &:focus,
+            &:active { @include button-type($button-on-status) }
+        }
+
+        &:hover,
+        &:focus,
+        &:active { @include button-type($button-on-status) }
+    }
 
     &.confirmation-modal__cancel-button {
         box-shadow: none;
diff --git a/app/javascript/styles/mastodon-material/theme/columns.scss b/app/javascript/styles/mastodon-material/theme/columns.scss
index c275d29e6..ca3f2d6f7 100644
--- a/app/javascript/styles/mastodon-material/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material/theme/columns.scss
@@ -193,6 +193,7 @@
     background: $top-bar-color;
     color: $top-bar-icon-color;
     padding: 16px;
+    height: 48px;
 
     span { visibility: hidden }  // hide "back" string
 
@@ -214,6 +215,8 @@
 .columns-area {
     @include bg-image;
     background-size: contain;
+
+    &__panels__pane { overflow: visible }
 }
 
 .setting-text {
@@ -229,8 +232,13 @@
     background: $card-bg-color;
     font-size: 16px;
     contain: initial;  // padding fix
+
+    a { color: $link-text-color }
 }
 
+.error-column a,
+.follow_requests-unlocked_explanation a { color: $link-text-color }
+
 .conversation {
     border-bottom: 1px solid $border-color;
     padding: 12px;
@@ -323,6 +331,8 @@
         a { color: $ui-text-color }
 
         p a { color: $link-text-color }
+
+        ul { margin-bottom: 16px }
     }
 
     &__trends {
@@ -419,6 +429,37 @@
     }
 }
 
+.announcements-list {
+    border: 1px solid $border-color;
+
+    &__item {
+        padding: 16px 0;
+        background: $list-bg-color;
+        border-radius: $table-radius;
+        border-bottom: 1px solid $border-color;
+
+        &__title {
+            padding: 0 16px;
+            color: $primary-text-color;
+            margin-bottom: 8px;
+
+            &:active,
+            &:focus,
+            &:hover { color: $primary-text-color }
+        }
+
+        &__meta {
+            padding: 0 16px;
+            color: $info-text-color;
+        }
+
+        &:hover { background: $list-bg-hover-color }
+
+        &:active,
+        &:focus { background: $list-bg-active-color }
+    }
+}
+
 .reactions-bar {
     margin-top: 16px;
     width: auto;
@@ -464,23 +505,24 @@
     
         button {
             background: $tab-bg-color;
-            color: $tab-indicator-color;
+            color: $tab-item-color;
             font-size: 16px;
+            border-bottom: 2px solid transparent;
+            padding: 12px 0 10px;
 
             span { font-size: 14px }
     
             &.active {
-                color: $tab-indicator-active-color;
-                border-bottom: 4px solid $tab-indicator-active-color;
-                padding: 12px 0 8px;
+                color: $tab-item-active-color;
+                border-bottom: 2px solid $tab-item-active-color;
     
                 &::before,
                 &:after { border: none }
 
-                &:focus { background: $tab-indicator-bg-focus-color }
+                &:focus { background: $tab-bg-focus-color }
             }
 
-            &:hover { background: $tab-indicator-bg-hover-color }
+            &:hover { background: $tab-bg-hover-color }
         }
     }
 
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index 4e3a69556..d3aa51a2d 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -190,6 +190,8 @@
 }
 
 .compose-form {
+    padding: 16px;
+
     .autosuggest-textarea {
         &__textarea {
             @include text-area-border($compose-area-border);
@@ -316,6 +318,18 @@
     }
 }
 
+.compose-panel {
+    overflow: visible;
+    border-radius: $card-radius;
+
+    .compose-form {
+        @include shadow-1dp;
+        background: $card-bg-color;
+        padding-bottom: 16px;
+        margin-bottom: 0;
+    }
+}
+
 .no-reduce-motion .spoiler-input { transition-duration: .2s, .2s }
 
 
@@ -343,10 +357,21 @@
 
         &.checkbox {
             border-radius: 2px;
-            border: 2px solid $control-border-color;
+            border: 2px solid $control-border-active-color;
             padding: 8px;
             margin: 8px 10px;
             background: none;
+
+            &.active {
+                height: 50%;
+                padding: 5px 0;
+                transform: rotate(-45deg);
+                border: 2px solid $control-border-active-color;
+                border-top-style: none;
+                border-right-style: none;
+
+                &:hover { background: none }
+            }
         }
     }
 
@@ -360,6 +385,8 @@
     }
 
     &__option {
+        padding: 4px;
+
         input[type=text] {
             color: $primary-text-color;
             background: $text-field-bg-color;
@@ -367,6 +394,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { line-height: 36px }
     }
 
     &__chart {
@@ -383,6 +412,8 @@
     }
 
     &__link { color: $ui-text-color }
+
+    &__number { line-height: 36px }
 }
 
 .privacy-dropdown {
@@ -573,6 +604,7 @@
     &__list {
         @include material-transition;
         margin: 16px 0;
+        width: auto;
     }
 }
 
diff --git a/app/javascript/styles/mastodon-material/theme/containers.scss b/app/javascript/styles/mastodon-material/theme/containers.scss
index 6891adb1e..cef368f09 100644
--- a/app/javascript/styles/mastodon-material/theme/containers.scss
+++ b/app/javascript/styles/mastodon-material/theme/containers.scss
@@ -10,7 +10,7 @@
 
             &:hover,
             &:focus,
-            &:active { background: $tab-indicator-bg-hover-color }
+            &:active { background: $tab-bg-hover-color }
         }
 
         .nav-link,
@@ -19,7 +19,7 @@
 
             &:hover {
                 color: $top-bar-text-color;
-                background: $tab-indicator-bg-hover-color;
+                background: $tab-bg-hover-color;
                 text-decoration: none;
             }
         }
@@ -29,7 +29,7 @@
             margin: 0;
             border-radius: 0;
 
-            &:hover { background: $tab-indicator-bg-hover-color }
+            &:hover { background: $tab-bg-hover-color }
         }
 
         .detailed-status__meta { margin-top: 16px }
@@ -77,7 +77,7 @@
             background: linear-gradient(0deg, transparent, transparent 60px, rgba(0, 0, 0, 0.5) 60px, rgba(0, 0, 0, 0.2) 80%, transparent);
 
             &::before {
-                background: $text-tab-bg-color;
+                background: $tab-bg-color;
                 border-radius: 0 0 $card-radius $card-radius;
             }
 
@@ -107,7 +107,7 @@
                     border-right: none;
 
                     &.active {
-                        &::after { border-bottom: 4px solid $text-tab-indicator-active-color }
+                        &::after { border-bottom: 4px solid $tab-item-active-color }
                     }
 
                     &::after {
@@ -115,7 +115,7 @@
                         opacity: 1;
                     }
 
-                    &:hover { background: $text-tab-indicator-bg-hover-color }
+                    &:hover { background: $tab-bg-hover-color }
 
                     .counter-number {
                         color: $ui-text-color;
@@ -178,6 +178,8 @@
     .grid { grid-gap: 16px }
 }
 
+.account-header .name { color: $ui-text-color }
+
 .brand__tagline { color: $ui-text-color }
 
 .logo-container h1 svg { fill: $ui-text-color }
diff --git a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
index d6959dbcc..9f8eeffaf 100644
--- a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
@@ -43,14 +43,14 @@
     }
 
     &-anchor {
-        color: $text-tab-indicator-color;
+        color: $tab-item-color;
         padding: 10px 4px;
 
-        &-bar { background-color: $icon-tab-indicator-active-color }
+        &-bar { background-color: $tab-item-active-color }
 
-        &-selected { color: $icon-tab-indicator-hover-color }
+        &-selected { color: $tab-item-color }
 
-        &:hover { color: $icon-tab-indicator-hover-color }
+        &:hover { color: $tab-item-color }
     }
 
     &-search {
diff --git a/app/javascript/styles/mastodon-material/theme/forms.scss b/app/javascript/styles/mastodon-material/theme/forms.scss
index e5e535d8c..7ca756c70 100644
--- a/app/javascript/styles/mastodon-material/theme/forms.scss
+++ b/app/javascript/styles/mastodon-material/theme/forms.scss
@@ -68,7 +68,10 @@
         }
     }
 
-    .actions { padding: 16px }
+    .actions {
+        padding: 16px;
+        margin-top: 0;
+    }
 
     .check_boxes .checkbox label {
         color: $primary-text-color;
@@ -109,12 +112,13 @@
     input[type=url],
     textarea {
         @include text-area-border($other-text-area-border);
-        color: $text-field-color;
-        background: $text-field-bg-color;
         padding: 16px;
 
         &:active,
-        &:focus { background: $text-field-bg-color }
+        &:focus {
+            background: $text-field-bg-color;
+            padding: 16px 16px 15px;
+        }
 
         &::placeholder { color: $tips-text-color }
     }
@@ -143,6 +147,12 @@
     }
 
     &.translation-prompt { color: $ui-text-color }
+
+    &.notice {
+        border: none;
+        background: $succeeded-card-bg-color;
+        color: $verified-color;
+    }
 }
 
 .form-footer a { color: $ui-text-color }
@@ -151,6 +161,8 @@
 .oauth-prompt {
     margin-bottom: 32px;
     color: $ui-text-color;
+
+    strong { color: $primary-text-color }
 }
 
 .input-copy {
diff --git a/app/javascript/styles/mastodon-material/theme/material-icons.scss b/app/javascript/styles/mastodon-material/theme/material-icons.scss
index 3875d349b..e070f98f9 100644
--- a/app/javascript/styles/mastodon-material/theme/material-icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/material-icons.scss
@@ -71,7 +71,19 @@
     &.fa-cloud-upload,
     &.fa-cloud-download,
     &.fa-mobile-phone, &.fa-mobile,
-    &.fa-tablet {
+    &.fa-tablet,
+    &.fa-gavel, &.fa-legal,
+    &.fa-comment,
+    &.fa-camera,
+    &.fa-flag,
+    &.fa-circle,
+    &.fa-dashboard, &.fa-tachometer,
+    &.fa-cloud,
+    &.fa-ban,
+    &.fa-power-off,
+    &.fa-copy, &.fa-files-o,
+    &.fa-smile-o,
+    &.fa-database {
         @include icon-font-style;
         line-height: 1;
         letter-spacing: normal;
@@ -151,6 +163,18 @@
     &.fa-cloud-download::before { content: "cloud_download" }
     &.fa-mobile-phone::before, &.fa-mobile::before { content: "smartphone" }
     &.fa-tablet::before { content: "tablet" }
+    &.fa-gavel::before, &.fa-legal::before { content: "admin_panel_settings" }
+    &.fa-comment::before { content: "comment" }
+    &.fa-camera::before { content: "photo_camera" }
+    &.fa-flag::before { content: "flag" }
+    &.fa-circle::before { content: "circle" }
+    &.fa-dashboard::before, &.fa-tachometer::before { content: "dashboard" }
+    &.fa-cloud::before { content: "cloud" }
+    &.fa-ban::before { content: "block" }
+    &.fa-power-off::before { content: "power_settings_new" }
+    &.fa-copy::before, &.fa-files-o::before { content: "content_copy" }
+    &.fa-smile-o::before { content: "emoji_emotions" }
+    &.fa-database::before { content: "storage" }
 }
 
 // bookmark icon
@@ -183,14 +207,14 @@ button.icon-button i.fa-retweet {
     height: 20px;
     width: 20px;
     transition: none;
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($boosted-icon-color)}" stroke-width="0"/></svg>');
 }
 
-.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>') }
+.media-modal__overlay .picture-in-picture__footer button.icon-button i.fa-retweet /* in media view */ { background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{$media-icon-color}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($boosted-icon-color)}" stroke-width="0"/></svg>') }
 
 button.icon-button i.fa-retweet:hover,
 button.icon-button:hover i.fa-retweet /* v3.3.0 or above */ {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($icon-button-active-color)}" stroke-width="0"/></svg>');
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="svg4" version="1.1" viewBox="0 0 24 48" height="40px" width="20px"><path d="M 7,7 H 17 V 10 l 4,-4 -4,-4 v 3 H 5 V 11 h 2 z M 17,17 H 7 V 14 L 3,18 7,22 V 19 H 19 v -6 h -2 z" fill="#{svg-color($icon-button-hover-color)}" stroke-width="0"/><path d="m 7,31 h 10 v 3 l 4,-4 -4,-4 v 3 H 5 v 6 H 7 Z M 17,41 H 7 v -3 l -4,4 4,4 v -3 h 12 v -6 h -2 z" fill="#{svg-color($boosted-icon-color)}" stroke-width="0"/></svg>');
 }
 
 button.icon-button.disabled i.fa-retweet,
@@ -286,4 +310,7 @@ button.table-action-link i.fa {
 }
 
 // sidebar icon in settings
-.admin-wrapper .sidebar ul a i.fa { vertical-align: text-bottom }
\ No newline at end of file
+.admin-wrapper .sidebar ul a i.fa { vertical-align: text-bottom }
+
+
+.back-link a .fa { vertical-align: middle }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/modal.scss b/app/javascript/styles/mastodon-material/theme/modal.scss
index 6efb8bb3c..9a07977ce 100644
--- a/app/javascript/styles/mastodon-material/theme/modal.scss
+++ b/app/javascript/styles/mastodon-material/theme/modal.scss
@@ -43,7 +43,14 @@
         color: $ui-text-color;
         font-size: 16px;
 
-        &:hover {
+        &.active,
+        &.active button,
+        &:active,
+        &:active button,
+        &:focus,
+        &:focus button,
+        &:hover,
+        &:hover button {
             background: $card-bg-hover-color;
             color: $ui-text-color;
         }
diff --git a/app/javascript/styles/mastodon-material/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
index 87cb693f9..90c3af01e 100644
--- a/app/javascript/styles/mastodon-material/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -3,12 +3,12 @@
 
     &__link {
         padding: 16px 16px 12px 16px;
-        color: $top-bar-icon-color;
+        color: $tab-item-color;
         border-bottom: 4px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-indicator-active-color;
-            color: $tab-indicator-active-color;
+            border-bottom: 4px solid $tab-item-active-color;
+            color: $tab-item-active-color;
         }
 
         .fa { font-size: 20px }
@@ -61,11 +61,24 @@
 
         .fa-times-circle.active { left: unset }
     }
+
+    .directory {
+        &__list {
+            grid-gap: 16px;
+            margin: 16px;
+        }
+
+        &__card { margin-bottom: 16px }
+    }
 }
 
 // small size screen
 @media screen and (max-width: 415px) {
-    .public-layout { padding-top: 64px }
+    .public-layout {
+        padding-top: 64px;
+
+        .header { margin: 0 }
+    }
 }
 
 // middle size screen
@@ -91,26 +104,29 @@
 }
 
 //single column mode
-@media screen and (min-width: 631px) {
-    .column:first-child,
-    .drawer:first-child { padding-left: 8px }
-
-    .column:last-child,
-    .drawer:last-child { padding-right: 8px }
-
+@media screen and (min-width: 630px) {
     .tabs-bar__link {
         &:hover {
-            background: $tab-indicator-bg-hover-color;
+            background: $tab-bg-hover-color;
             border-bottom-color: transparent;
         }
 
         &:active,
         &:focus {
-            background: $tab-indicator-bg-focus-color;
+            background: $tab-bg-focus-color;
             border-bottom-color: $tab-bg-color;
         }
 
-        &.active { border-bottom-color: $tab-indicator-active-color }
+        &.active { border-bottom-color: $tab-item-active-color }
+    }
+
+    .columns-area--mobile .status {
+        padding: 16px 16px 16px 80px;
+
+        &__prepend {
+            margin-left: 80px;
+            padding-top: 16px;
+        }
     }
 }
 
@@ -131,10 +147,14 @@
     .public-layout .public-account-header {
         &__bar { background: $card-bg-color }
 
-        &__tabs__name h1 {
-            color: $primary-text-color;
+        &__tabs {
+            margin-left: 16px;
 
-            small { color: $secondary-text-color }
+            &__name h1 {
+                color: $primary-text-color;
+    
+                small { color: $secondary-text-color }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
index 00b587298..7fd2daa1f 100644
--- a/app/javascript/styles/mastodon-material/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -39,14 +39,18 @@
 
         &__spoiler-link {
             border: 0;
-            margin: 0 4px;
+            font-size: 15px;
+            height: 36px;
+            padding: 0 16px;
+            margin: 8px;
             color: $text-button-color;
         }
 
         &__read-more-button {
             @include button-type($button-on-status);
-            padding: 4px 6px;
-            margin: 4px;
+            height: 36px;
+            padding: 0 16px;
+            margin: 8px 0;
 
             &:hover { text-decoration: none }
         }
@@ -155,6 +159,11 @@
         a { bottom: auto }
     }
 
+    &__host {
+        margin-top: 6px;
+        color: $secondary-text-color;
+    }
+
     &.compact {
         border-color: $border-color;
         outline: none;
diff --git a/app/javascript/styles/mastodon-material/theme/tables.scss b/app/javascript/styles/mastodon-material/theme/tables.scss
index 3e39d086b..17feb642a 100644
--- a/app/javascript/styles/mastodon-material/theme/tables.scss
+++ b/app/javascript/styles/mastodon-material/theme/tables.scss
@@ -1,12 +1,12 @@
 .batch-table {
     border: 1px solid $border-color;
-    border-radius: 4px;
+    border-radius: $table-radius;
 
     &__toolbar {
         border: none;
         border-bottom: 1px solid $border-color;
         background: $list-bg-color;
-        border-radius: 4px 4px 0 0;
+        border-radius: $table-radius $table-radius 0 0;
 
         &__actions { padding-right: 16px }
     }
@@ -16,6 +16,12 @@
         border-bottom: 1px solid $border-color;
         background: $list-bg-color;
 
+        &__content {
+            padding-top: 16px;
+
+            &__extra { color: $info-text-color }
+        }
+
         &:nth-child(2n) {
             background: $list-bg-color;
 
@@ -24,11 +30,13 @@
 
         &:last-child {
             border-bottom: none;
-            border-radius: 0 0 4px 4px;
+            border-radius: 0 0 $table-radius $table-radius;
         }
 
         &:hover { background: $list-bg-hover-color }
     }
+    
+    .nothing-here { border: none }
 }
 
 a.table-action-link,
@@ -50,11 +58,12 @@ button.table-action-link {
 
 .table-wrapper {
     margin-bottom: 24px;
-    border-radius: 2px;
+    border: 1px solid $border-color;
+    border-radius: $table-radius;
 }
 
 .table {
-    border: 1px solid $border-color;
+    border-radius: $table-radius;
 
     td,
     th {
diff --git a/app/javascript/styles/mastodon-material/theme/theme.scss b/app/javascript/styles/mastodon-material/theme/theme.scss
index a9421cd43..c66c07979 100644
--- a/app/javascript/styles/mastodon-material/theme/theme.scss
+++ b/app/javascript/styles/mastodon-material/theme/theme.scss
@@ -1,6 +1,6 @@
 /*
-* Mastodon Material 0.3.0
+* Mastodon Material 1.0.0
 * Copyright (C) 2021 Rintan, Genbu Project
 */
 
-@import 'about', 'account', 'admin', 'basics', 'button', 'columns', 'components', 'containers', 'control', 'emoji-picker', 'icons', 'forms', 'media', 'modal', 'responsive', 'statuses', 'tables', 'variables', 'widgets';
\ No newline at end of file
+@import 'about', 'account', 'admin', 'basics', 'button', 'columns', 'components', 'containers', 'control', 'emoji-picker', 'forms', 'icons', 'media', 'modal', 'responsive', 'statuses', 'tables', 'variables', 'widgets';
\ No newline at end of file

From 94ba7b284ae0834605a0cc25dfea047e09f3a4e0 Mon Sep 17 00:00:00 2001
From: Genbu Hase <hasegenbu@gmail.com>
Date: Sun, 8 Apr 2018 16:56:25 +0900
Subject: [PATCH 142/200] [New] Implement a feature of quote

---
 app/javascript/mastodon/actions/compose.js    | 32 ++++++++-
 .../mastodon/components/status_action_bar.js  |  7 ++
 .../mastodon/components/status_content.js     | 17 +++++
 .../mastodon/containers/status_container.js   |  5 ++
 .../compose/components/compose_form.js        |  2 +
 .../compose/components/quote_indicator.js     | 67 +++++++++++++++++++
 .../containers/quote_indicator_container.js   | 24 +++++++
 .../features/status/components/action_bar.js  |  7 ++
 .../features/status/components/card.js        |  4 ++
 .../mastodon/features/status/index.js         |  6 ++
 .../mastodon/locales/defaultMessages.json     | 13 ++++
 app/javascript/mastodon/locales/en.json       |  2 +
 app/javascript/mastodon/locales/ja.json       |  2 +
 app/javascript/mastodon/reducers/compose.js   | 21 ++++++
 .../styles/mastodon/components.scss           | 28 ++++++--
 app/services/fetch_link_card_service.rb       |  4 +-
 16 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/quote_indicator.js
 create mode 100644 app/javascript/mastodon/features/compose/containers/quote_indicator_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 891403969..26e7bfab2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -20,6 +20,8 @@ export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
 export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
 export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
+export const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
+export const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
@@ -100,6 +102,25 @@ export function cancelReplyCompose() {
   };
 };
 
+export function quoteCompose(status, router) {
+  return (dispatch, getState) => {
+    dispatch({
+      type: COMPOSE_QUOTE,
+      status: status,
+    });
+
+    if (!getState().getIn(['compose', 'mounted'])) {
+      router.push('/statuses/new');
+    }
+  };
+};
+
+export function cancelQuoteCompose() {
+  return {
+    type: COMPOSE_QUOTE_CANCEL,
+  };
+};
+
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
@@ -130,13 +151,22 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
+    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
+    if (quoteId) {
+      status = [
+        status,
+        "~~~~~~~~~~",
+        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
+      ].join("\n");
+    }
+
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 9981f2449..804e05717 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,6 +24,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
@@ -61,6 +62,7 @@ class StatusActionBar extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
+    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -129,6 +131,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onBookmark(this.props.status);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -326,6 +332,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
 
         {shareButton}
 
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index bf21a9fd6..5cf7ca802 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -38,6 +38,8 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
+    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
+    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -46,6 +48,12 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
+      if (quote) {
+        if (link.href.match(QuoteUrlFormat)) {
+          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
+        }
+      }
+
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -125,6 +133,15 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  onQuoteClick = (statusId, e) => {
+    let statusUrl = `/statuses/${statusId}`;
+
+    if (this.context.router && e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(statusUrl);
+    }
+  }
+
   handleMouseDown = (e) => {
     this.startXY = [e.clientX, e.clientY];
   }
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 9abdec138..43acf597d 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,6 +4,7 @@ import Status from '../components/status';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../actions/compose';
@@ -99,6 +100,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuote (status, router) {
+    dispatch(quoteCompose(status, router));
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index ba2d20cc7..8f9a8a261 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -4,6 +4,7 @@ import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import QuoteIndicatorContainer from '../containers/quote_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import AutosuggestInput from '../../../components/autosuggest_input';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -209,6 +210,7 @@ class ComposeForm extends ImmutablePureComponent {
         <WarningContainer />
 
         <ReplyIndicatorContainer />
+        <QuoteIndicatorContainer />
 
         <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef}>
           <AutosuggestInput
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
new file mode 100644
index 000000000..515c79fca
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import Avatar from '../../../components/avatar';
+import IconButton from '../../../components/icon_button';
+import DisplayName from '../../../components/display_name';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { isRtl } from '../../../rtl';
+
+const messages = defineMessages({
+  cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+@injectIntl
+export default class QuoteIndicator extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    onCancel: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.onCancel();
+  }
+
+  handleAccountClick = (e) => {
+    if (e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+    }
+  }
+
+  render () {
+    const { status, intl } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    const content = { __html: status.get('contentHtml') };
+    const style   = {
+      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
+    };
+
+    return (
+      <div className='quote-indicator'>
+        <div className='quote-indicator__header'>
+          <div className='quote-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} /></div>
+
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name'>
+            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
+            <DisplayName account={status.get('account')} />
+          </a>
+        </div>
+
+        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
new file mode 100644
index 000000000..eb67f3939
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { cancelQuoteCompose } from '../../../actions/compose';
+import { makeGetStatus } from '../../../selectors';
+import QuoteIndicator from '../components/quote_indicator';
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = state => ({
+    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+  onCancel () {
+    dispatch(cancelQuoteCompose());
+  },
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index ffa2510c0..1da4b52a4 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,6 +18,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -56,6 +57,7 @@ class ActionBar extends React.PureComponent {
     relationship: ImmutablePropTypes.map,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
+    onQuote: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -82,6 +84,10 @@ class ActionBar extends React.PureComponent {
     this.props.onReblog(this.props.status, e);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -277,6 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 90f9ae7ae..317163648 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -60,6 +60,10 @@ const addAutoPlay = html => {
 
 export default class Card extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index df8362a1b..0cd25955b 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -22,6 +22,7 @@ import {
 } from '../../actions/interactions';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../../actions/compose';
@@ -259,6 +260,10 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+    handleQuoteClick = (status) => {
+    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  }
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -566,6 +571,7 @@ class Status extends ImmutablePureComponent {
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
+                  onQuote={this.handleQuoteClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6d1db70ab..f0522d148 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -449,6 +449,10 @@
         "defaultMessage": "This post cannot be boosted",
         "id": "status.cannot_reblog"
       },
+      {
+        "defaultMessage": "Quote",
+        "id": "status.quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
@@ -1229,6 +1233,15 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Cancel",
+        "id": "quote_indicator.cancel"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/quote_indicator.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d67ad6862..7ddd4908b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
+  "quote_indicator.cancel": "Cancel",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -401,6 +402,7 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
+  "status.quote": "Quote",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ae0e0f5da..d979a08fd 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
+  "quote_indicator.cancel": "キャンセル",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
@@ -401,6 +402,7 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
   "status.read_more": "もっと見る",
+  "status.quote": "引用ブースト",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4c0ba1c36..596e1a68b 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -5,6 +5,8 @@ import {
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
+  COMPOSE_QUOTE_CANCEL,
   COMPOSE_MENTION,
   COMPOSE_SUBMIT_REQUEST,
   COMPOSE_SUBMIT_SUCCESS,
@@ -59,6 +61,8 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  quote_from: null,
+  quote_from_uri: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -102,6 +106,7 @@ function clearAll(state) {
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
+    map.set('quote_from', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
     map.update('media_attachments', list => list.clear());
@@ -292,6 +297,8 @@ export default function compose(state = initialState, action) {
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -307,10 +314,24 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
+  case COMPOSE_QUOTE:
+    return state.withMutations(map => {
+      map.set('in_reply_to', null);
+      map.set('quote_from', action.status.get('id'));
+      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('text', '');
+      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
+      map.set('focusDate', new Date());
+      map.set('preselectDate', new Date());
+      map.set('idempotencyKey', uuid());
+    });
   case COMPOSE_REPLY_CANCEL:
+  case COMPOSE_QUOTE_CANCEL:
   case COMPOSE_RESET:
     return state.withMutations(map => {
       map.set('in_reply_to', null);
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 7ca027e81..00bdd4d33 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -761,26 +761,37 @@
 }
 
 .reply-indicator {
+  background: $ui-primary-color;
+}
+
+.quote-indicator {
+  background: $success-green;
+}
+
+.reply-indicator,
+.quote-indicator {
   border-radius: 4px;
   margin-bottom: 10px;
-  background: $ui-primary-color;
   padding: 10px;
   min-height: 23px;
   overflow-y: auto;
   flex: 0 2 auto;
 }
 
-.reply-indicator__header {
+.reply-indicator__header,
+.quote-indicator__header {
   margin-bottom: 5px;
   overflow: hidden;
 }
 
-.reply-indicator__cancel {
+.reply-indicator__cancel,
+.quote-indicator__cancel {
   float: right;
   line-height: 24px;
 }
 
-.reply-indicator__display-name {
+.reply-indicator__display-name,
+.quote-indicator__display-name {
   color: $inverted-text-color;
   display: block;
   max-width: 100%;
@@ -790,7 +801,8 @@
   text-decoration: none;
 }
 
-.reply-indicator__display-avatar {
+.reply-indicator__display-avatar,
+.quote-indicator__display-avatar {
   float: left;
   margin-right: 5px;
 }
@@ -804,7 +816,8 @@
 }
 
 .status__content,
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   position: relative;
   font-size: 15px;
   line-height: 20px;
@@ -1254,7 +1267,8 @@
   margin-left: 6px;
 }
 
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   color: $inverted-text-color;
   font-size: 14px;
 
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index fa1636e41..c5cd3096a 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-
+    
     @card.save_with_optional_image!
   end
 

From 97ebc10c3c25908d5285f396216edadd44e44c1e Mon Sep 17 00:00:00 2001
From: wakin <8th.mail@gmail.com>
Date: Sun, 29 Sep 2019 13:41:03 +0900
Subject: [PATCH 143/200] remake quote feature

---
 app/controllers/api/v1/statuses_controller.rb |   4 +-
 app/javascript/mastodon/actions/compose.js    |  18 +--
 .../mastodon/actions/importer/normalizer.js   |  26 ++++
 app/javascript/mastodon/actions/statuses.js   |  25 ++++
 .../mastodon/components/media_gallery.js      |   8 +-
 app/javascript/mastodon/components/status.js  | 132 +++++++++++++++++-
 .../mastodon/components/status_content.js     |  17 +--
 .../mastodon/containers/status_container.js   |  10 ++
 .../compose/components/quote_indicator.js     |  14 +-
 .../containers/quote_indicator_container.js   |   2 +-
 .../features/status/components/action_bar.js  |   2 +-
 .../features/status/components/card.js        |   9 +-
 .../status/components/detailed_status.js      |  84 +++++++++++
 .../mastodon/features/status/index.js         |  21 ++-
 .../mastodon/features/video/index.js          |   8 +-
 .../mastodon/locales/defaultMessages.json     |   4 +
 app/javascript/mastodon/locales/ja.json       |   3 +-
 app/javascript/mastodon/reducers/compose.js   |  31 +++-
 app/javascript/mastodon/reducers/search.js    |   2 +
 app/javascript/mastodon/reducers/statuses.js  |  10 ++
 app/javascript/packs/public.js                |  23 +++
 .../styles/mastodon/components.scss           |  64 +++++++++
 app/javascript/styles/mastodon/statuses.scss  |  22 +++
 app/lib/activitypub/activity/create.rb        |   8 ++
 app/lib/activitypub/adapter.rb                |   1 +
 app/lib/formatter.rb                          |  19 +++
 app/models/status.rb                          |   9 +-
 .../activitypub/note_serializer.rb            |   6 +-
 app/serializers/rest/status_serializer.rb     |   1 +
 app/services/fetch_link_card_service.rb       |   6 +-
 app/services/post_status_service.rb           |   1 +
 app/views/statuses/_detailed_status.html.haml |   3 +
 app/views/statuses/_quote_status.html.haml    |  35 +++++
 app/views/statuses/_simple_status.html.haml   |   3 +
 ...20180419235016_add_quote_id_to_statuses.rb |   5 +
 db/schema.rb                                  |   1 +
 lib/sanitize_ext/sanitize_config.rb           |   1 +
 37 files changed, 588 insertions(+), 50 deletions(-)
 create mode 100644 app/views/statuses/_quote_status.html.haml
 create mode 100644 db/migrate/20180419235016_add_quote_id_to_statuses.rb

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 106fc8224..1e23cf300 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -46,7 +46,8 @@ class Api::V1::StatusesController < Api::BaseController
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
                                          idempotency: request.headers['Idempotency-Key'],
-                                         with_rate_limit: true)
+                                         with_rate_limit: true,
+                                         quote_id: status_params[:quote_id].presence)
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
@@ -85,6 +86,7 @@ class Api::V1::StatusesController < Api::BaseController
       :spoiler_text,
       :visibility,
       :scheduled_at,
+      :quote_id,
       media_ids: [],
       poll: [
         :multiple,
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 26e7bfab2..fb4d26cf2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -102,16 +102,14 @@ export function cancelReplyCompose() {
   };
 };
 
-export function quoteCompose(status, router) {
+export function quoteCompose(status, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_QUOTE,
       status: status,
     });
 
-    if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
-    }
+    ensureComposeIsVisible(getState, routerHistory);
   };
 };
 
@@ -151,22 +149,13 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    let status = getState().getIn(['compose', 'text'], '');
+    const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
-    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
-    if (quoteId) {
-      status = [
-        status,
-        "~~~~~~~~~~",
-        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
-      ].join("\n");
-    }
-
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
@@ -177,6 +166,7 @@ export function submitCompose(routerHistory) {
       spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
       visibility: getState().getIn(['compose', 'privacy']),
       poll: getState().getIn(['compose', 'poll'], null),
+      quote_id: getState().getIn(['compose', 'quote_from'], null),
     }, {
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 5002292b9..d274a0226 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -62,6 +62,8 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
     normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
+    normalStatus.quote = normalOldStatus.get('quote');
+    normalStatus.quote_hidden = normalOldStatus.get('quote_hidden');
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the
     // status' contents, to avoid having a CW toggle with seemingly no effect.
@@ -78,6 +80,30 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
     normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+
+    if (status.quote && status.quote.id) {
+      const quote_spoilerText = status.quote.spoiler_text || '';
+      const quote_searchContent = [quote_spoilerText, status.quote.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+
+      const quote_emojiMap = makeEmojiMap(normalStatus.quote);
+
+      const quote_account_emojiMap = makeEmojiMap(status.quote.account);
+      const displayName = normalStatus.quote.account.display_name.length === 0 ? normalStatus.quote.account.username : normalStatus.quote.account.display_name;
+      normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
+      normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
+      let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
+      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
+      Array.from(docElem.querySelectorAll('p,br'), line => {
+        let parentNode = line.parentNode;
+        if (line.nextSibling) {
+          parentNode.insertBefore(document.createTextNode(' '), line.nextSibling);
+        }
+      });
+      let _contentHtml = docElem.textContent;
+      normalStatus.quote.contentHtml  = '<p>'+emojify(_contentHtml.substr(0, 150), quote_emojiMap) + (_contentHtml.substr(150) ? '...' : '')+'</p>';
+      normalStatus.quote.spoilerHtml  = emojify(escapeTextContentForBrowser(quote_spoilerText), quote_emojiMap);
+      normalStatus.quote_hidden       = expandSpoilers ? false : quote_spoilerText.length > 0 || normalStatus.quote.sensitive;
+    }
   }
 
   return normalStatus;
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3fc7c0702..0c520a796 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -30,6 +30,9 @@ export const STATUS_COLLAPSE = 'STATUS_COLLAPSE';
 
 export const REDRAFT = 'REDRAFT';
 
+export const QUOTE_REVEAL = 'QUOTE_REVEAL';
+export const QUOTE_HIDE   = 'QUOTE_HIDE';
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
@@ -272,3 +275,25 @@ export function toggleStatusCollapse(id, isCollapsed) {
     isCollapsed,
   };
 }
+
+export function hideQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_HIDE,
+    ids,
+  };
+};
+
+export function revealQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_REVEAL,
+    ids,
+  };
+};
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2e7ce2e60..5c303a1a0 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -236,10 +236,12 @@ class MediaGallery extends React.PureComponent {
     visible: PropTypes.bool,
     autoplay: PropTypes.bool,
     onToggleVisibility: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
     standalone: false,
+    quote: false,
   };
 
   state = {
@@ -310,7 +312,7 @@ class MediaGallery extends React.PureComponent {
   }
 
   render () {
-    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay } = this.props;
+    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay, quote } = this.props;
     const { visible } = this.state;
 
     const width = this.state.width || defaultWidth;
@@ -332,6 +334,10 @@ class MediaGallery extends React.PureComponent {
     const size     = media.take(4).size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
+    if (quote && style.height) {
+      style.height /= 2;
+    }
+
     if (standalone && this.isFullSizeEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />;
     } else {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f58..3019500ec 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -85,6 +85,7 @@ class Status extends ImmutablePureComponent {
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
     onToggleCollapsed: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -101,6 +102,7 @@ class Status extends ImmutablePureComponent {
       inUse: PropTypes.bool,
       available: PropTypes.bool,
     }),
+    contextType: PropTypes.string,
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -116,6 +118,7 @@ class Status extends ImmutablePureComponent {
 
   state = {
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     statusId: undefined,
   };
 
@@ -123,6 +126,7 @@ class Status extends ImmutablePureComponent {
     if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
       return {
         showMedia: defaultMediaVisibility(nextProps.status),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)),
         statusId: nextProps.status.get('id'),
       };
     } else {
@@ -134,6 +138,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleClick = () => {
     if (this.props.onClick) {
       this.props.onClick();
@@ -164,6 +172,15 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'quote', 'id'], status.getIn(['quote', 'id']))}`);
+  }
+
   handleAccountClick = (e) => {
     if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       const id = e.currentTarget.getAttribute('data-id');
@@ -180,6 +197,10 @@ class Status extends ImmutablePureComponent {
     this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this._properStatus());
+  };
+
   renderLoadingMediaGallery () {
     return <div className='media-gallery' style={{ height: '110px' }} />;
   }
@@ -279,11 +300,17 @@ class Status extends ImmutablePureComponent {
     this.node = c;
   }
 
+  _properQuoteStatus () {
+    const { status } = this.props;
+
+    return status.get('quote');
+  }
+
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText;
+    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -459,6 +486,106 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+        if (this.props.muted) {
+          quote_media = (
+            <AttachmentList
+              compact
+              media={quote_status.get('media_attachments')}
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+              {Component => (
+                <Component
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+                  peaks={[0]}
+                  height={70}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+              {Component => (
+                <Component
+                  preview={attachment.get('preview_url')}
+                  blurhash={attachment.get('blurhash')}
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  width={this.props.cachedMediaWidth}
+                  height={110}
+                  inline
+                  sensitive={quote_status.get('sensitive')}
+                  onOpenVideo={this.handleOpenVideo}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else {
+          quote_media = (
+            <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
+              {Component => (
+                <Component
+                  media={quote_status.get('media_attachments')}
+                  sensitive={quote_status.get('sensitive')}
+                  height={110}
+                  onOpenMedia={this.props.onOpenMedia}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  defaultWidth={this.props.cachedMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        }
+      }
+
+      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
+              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className='status__info'>
+              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
+                <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+                <DisplayName account={quote_status.get('account')} />
+              </a>
+            </div>
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    }
+
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
@@ -483,6 +610,7 @@ class Status extends ImmutablePureComponent {
 
             <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
 
+            {quote}
             {media}
 
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} {...other} />
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5cf7ca802..70081f45f 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -24,6 +24,7 @@ export default class StatusContent extends React.PureComponent {
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
     onCollapsedToggle: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   state = {
@@ -38,8 +39,6 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
-    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
-    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -48,12 +47,6 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
-      if (quote) {
-        if (link.href.match(QuoteUrlFormat)) {
-          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
-        }
-      }
-
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -185,7 +178,7 @@ export default class StatusContent extends React.PureComponent {
   }
 
   render () {
-    const { status } = this.props;
+    const { status, quote } = this.props;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
@@ -238,7 +231,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -248,7 +241,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -264,7 +257,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 43acf597d..8e0730625 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -25,6 +25,8 @@ import {
   hideStatus,
   revealStatus,
   toggleStatusCollapse,
+  hideQuote,
+  revealQuote,
 } from '../actions/statuses';
 import {
   unmuteAccount,
@@ -220,6 +222,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 515c79fca..a48289de2 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -7,13 +7,14 @@ import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { isRtl } from '../../../rtl';
+import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
 });
 
-@injectIntl
-export default class QuoteIndicator extends ImmutablePureComponent {
+export default @injectIntl
+class QuoteIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -30,7 +31,7 @@ export default class QuoteIndicator extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
@@ -60,6 +61,13 @@ export default class QuoteIndicator extends ImmutablePureComponent {
         </div>
 
         <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+
+        {status.get('media_attachments').size > 0 && (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        )}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
index eb67f3939..8a3ad4959 100644
--- a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -7,7 +7,7 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
   const mapStateToProps = state => ({
-    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+    status: getStatus(state, { id: state.getIn(['compose', 'quote_from']) }),
   });
 
   return mapStateToProps;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1da4b52a4..013dfed9a 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -283,7 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 317163648..f4d95b4cb 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -72,6 +72,7 @@ export default class Card extends React.PureComponent {
     defaultWidth: PropTypes.number,
     cacheWidth: PropTypes.func,
     sensitive: PropTypes.bool,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -188,7 +189,7 @@ export default class Card extends React.PureComponent {
   }
 
   render () {
-    const { card, maxDescription, compact } = this.props;
+    const { card, maxDescription, compact, quote } = this.props;
     const { width, embedded, revealed } = this.state;
 
     if (card === null) {
@@ -201,7 +202,11 @@ export default class Card extends React.PureComponent {
     const className   = classnames('status-card', { horizontal, compact, interactive });
     const title       = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
     const ratio       = card.get('width') / card.get('height');
-    const height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+    let height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+
+    if (quote && height) {
+      height /= 2;
+    }
 
     const description = (
       <div className='status-card__content'>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 043a749ed..ae90a622d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -46,6 +46,9 @@ class DetailedStatus extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     onToggleMediaVisibility: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func.isRequired,
+    showQuoteMedia: PropTypes.bool,
+    onToggleQuoteMediaVisibility: PropTypes.func,
   };
 
   state = {
@@ -102,6 +105,19 @@ class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this.props.status);
+  }
+
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['quote', 'id'])}`);
+  }
+
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
@@ -121,6 +137,73 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+
+        if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Audio
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              height={60}
+              preload
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Video
+              preview={attachment.get('preview_url')}
+              blurhash={attachment.get('blurhash')}
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              width={300}
+              height={150}
+              inline
+              onOpenVideo={this.handleOpenVideo}
+              sensitive={quote_status.get('sensitive')}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        } else {
+          quote_media = (
+            <MediaGallery
+              standalone
+              sensitive={quote_status.get('sensitive')}
+              media={quote_status.get('media_attachments')}
+              height={300}
+              onOpenMedia={this.props.onOpenMedia}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        }
+      }
+
+      quote = (
+        <div className='quote-status'>
+          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+          </a>
+
+          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+          {quote_media}
+        </div>
+      );
+    }
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
@@ -247,6 +330,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
 
+          {quote}
           {media}
 
           <div className='detailed-status__meta'>
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 0cd25955b..d25905d8e 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -32,6 +32,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../actions/statuses';
 import {
   unblockAccount,
@@ -181,6 +183,7 @@ class Status extends ImmutablePureComponent {
   state = {
     fullscreen: false,
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     loadedStatusId: undefined,
   };
 
@@ -199,7 +202,8 @@ class Status extends ImmutablePureComponent {
     }
 
     if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
-      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
+      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id'),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)) });
     }
   }
 
@@ -207,6 +211,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleFavouriteClick = (status) => {
     if (status.get('favourited')) {
       this.props.dispatch(unfavourite(status));
@@ -328,6 +336,14 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteToggleHidden = (status) => {
+    if (status.get('quote_hidden')) {
+      this.props.dispatch(revealQuote(status.get('id')));
+    } else {
+      this.props.dispatch(hideQuote(status.get('id')));
+    }
+  }
+
   handleToggleAll = () => {
     const { status, ancestorsIds, descendantsIds } = this.props;
     const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
@@ -562,6 +578,9 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  onQuoteToggleHidden={this.handleQuoteToggleHidden}
+                  showQuoteMedia={this.state.showQuoteMedia}
+                  onToggleQuoteMediaVisibility={this.handleToggleQuoteMediaVisibility}
                 />
 
                 <ActionBar
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 70e3cd6e8..d1857fdd5 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -122,6 +122,7 @@ class Video extends React.PureComponent {
     volume: PropTypes.number,
     muted: PropTypes.bool,
     componetIndex: PropTypes.number,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -523,7 +524,7 @@ class Video extends React.PureComponent {
   }
 
   render () {
-    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash } = this.props;
+    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash, quote } = this.props;
     const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
     const progress = Math.min((currentTime / duration) * 100, 100);
     const playerStyle = {};
@@ -537,6 +538,11 @@ class Video extends React.PureComponent {
       playerStyle.height = height;
     }
 
+    if (quote && height) {
+      height /= 2;
+      playerStyle.height = height;
+    }
+
     let preload;
 
     if (this.props.currentTime || fullscreen || dragging) {
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index f0522d148..7cbb11dc6 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -453,6 +453,10 @@
         "defaultMessage": "Quote",
         "id": "status.quote"
       },
+      {
+        "defaultMessage": "Unlisted quote",
+        "id": "status.unlisted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index d979a08fd..c39b92e04 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -402,7 +402,8 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
   "status.read_more": "もっと見る",
-  "status.quote": "引用ブースト",
+  "status.quote": "引用",
+  "status.unlisted_quote": "未収載の引用",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 596e1a68b..d3ca96a3e 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -62,7 +62,7 @@ const initialState = ImmutableMap({
   preselectDate: null,
   in_reply_to: null,
   quote_from: null,
-  quote_from_uri: null,
+  quote_from_url: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -252,6 +252,17 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const rejectQuoteAltText = html => {
+  const fragment = domParser.parseFromString(html, 'text/html').documentElement;
+
+  const quote_inline = fragment.querySelector('span.quote-inline');
+  if (quote_inline) {
+    quote_inline.remove();
+  }
+
+  return fragment.innerHTML;
+};
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -298,7 +309,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -318,12 +329,20 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', action.status.get('id'));
-      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('quote_from_url', action.status.get('url'));
       map.set('text', '');
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
       map.set('preselectDate', new Date());
       map.set('idempotencyKey', uuid());
+
+      if (action.status.get('spoiler_text').length > 0) {
+        map.set('spoiler', true);
+        map.set('spoiler_text', action.status.get('spoiler_text'));
+      } else {
+        map.set('spoiler', false);
+        map.set('spoiler_text', '');
+      }
     });
   case COMPOSE_REPLY_CANCEL:
   case COMPOSE_QUOTE_CANCEL:
@@ -331,7 +350,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
@@ -420,8 +439,10 @@ export default function compose(state = initialState, action) {
       }));
   case REDRAFT:
     return state.withMutations(map => {
-      map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
+      map.set('text', action.raw_text || unescapeHTML(rejectQuoteAltText(expandMentions(action.status))));
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
+      map.set('quote_from', action.status.getIn(['quote', 'id']));
+      map.set('quote_from_url', action.status.getIn(['quote', 'url']));
       map.set('privacy', action.status.get('visibility'));
       map.set('media_attachments', action.status.get('media_attachments'));
       map.set('focusDate', new Date());
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 875b2d92b..f139a124b 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -9,6 +9,7 @@ import {
   COMPOSE_MENTION,
   COMPOSE_REPLY,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
 } from '../actions/compose';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
@@ -36,6 +37,7 @@ export default function search(state = initialState, action) {
   case COMPOSE_REPLY:
   case COMPOSE_MENTION:
   case COMPOSE_DIRECT:
+  case COMPOSE_QUOTE:
     return state.set('hidden', true);
   case SEARCH_FETCH_SUCCESS:
     return state.set('results', ImmutableMap({
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 53dec9585..7f656ba90 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -13,6 +13,8 @@ import {
   STATUS_REVEAL,
   STATUS_HIDE,
   STATUS_COLLAPSE,
+  QUOTE_REVEAL,
+  QUOTE_HIDE,
 } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
@@ -75,6 +77,14 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_COLLAPSE:
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
+  case QUOTE_REVEAL:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], false));
+    });
+  case QUOTE_HIDE:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], true));
+    });
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
   default:
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8c5c15b8f..f6acf706c 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,6 +291,29 @@ function main() {
       }
     });
   });
+
+  delegate(document, '.quote-status', 'click', ({ target }) => {
+    if (target.closest('.status__content__spoiler-link') ||
+      target.closest('.media-gallery') ||
+      target.closest('.video-player') ||
+      target.closest('.audio-player')) {
+      return false;
+    }
+
+    let url = target.closest('.quote-status').getAttribute('dataurl');
+    if (target.closest('.status__display-name')) {
+      url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.status-card')) {
+      url = target.closest('.status-card').getAttribute('href');
+    }
+
+    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
+      window.location.href = url;
+    } else {
+      window.open(url, 'blank');
+    }
+    return false;
+  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 00bdd4d33..8e965d080 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1009,6 +1009,70 @@
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 }
 
+.quote-inline {
+  display: none;
+}
+
+.quote-status {
+  border: solid 1px $ui-base-lighter-color;
+  border-radius: 4px;
+  padding: 5px;
+  margin-top: 8px;
+  position: relative;
+
+  & > .unlisted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+
+    & > button {
+      color: $dark-text-color;
+      font-size: 100%;
+      background-color: transparent;
+      border: 0;
+      cursor: pointer;
+      outline: none;
+      padding: 0;
+      appearance: none;
+    }
+  }
+
+  .status__avatar,
+  .detailed-status__display-avatar {
+    height: 18px;
+    width: 18px;
+    position: absolute;
+    top: 5px !important;
+    left: 5px !important;
+    cursor: pointer;
+
+    & > div {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  .display-name__account {
+    color: $ui-base-lighter-color;
+  }
+
+  .display-name {
+    padding-left: 20px;
+  }
+
+  .detailed-status__display-name {
+    margin-bottom: 0px;
+
+    strong,
+    span {
+      display: inline;
+    }
+  }
+}
+
+.muted .quote-status .display-name {
+  color: $ui-base-lighter-color;
+}
+
 .status__prepend-icon-wrapper {
   left: -26px;
   position: absolute;
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 078714325..ad23efae8 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -63,6 +63,28 @@
       }
     }
 
+    .status.quote-status {
+      border: solid 1px $ui-base-lighter-color;
+      border-radius: 4px;
+      padding: 5px;
+      margin-top: 15px;
+      cursor: pointer;
+      width: 100%;
+
+      .status__avatar {
+        height: 18px;
+        width: 18px;
+        position: absolute;
+        top: 5px;
+        left: 5px;
+
+        & > div {
+          width: 18px;
+          height: 18px;
+        }
+      }
+    }
+
     @media screen and (max-width: 740px) {
       .detailed-status,
       .status,
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 9a2960507..8c937cd1f 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,6 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
+        quote: quote_from_url(@object['quoteUrl']),
       }
     end
   end
@@ -500,4 +501,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     poll.reload
     retry
   end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  end
 end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 2d6b87659..e6f8e4d37 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -24,6 +24,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+    quoteUrl: { 'quoteUrl' => 'as:quoteUrl' },
   }.freeze
 
   def self.default_key_transform
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index fd6537526..d94e01c07 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -38,11 +38,24 @@ class Formatter
     html = encode_and_link_urls(html, linkable_accounts)
     html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
+    html = quotify(html, status) if status.quote? && !options[:escape_quotify]
     html = html.delete("\n")
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
+  def format_in_quote(status, **options)
+    html = format(status)
+    return '' if html.empty?
+    doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
+    doc.search('span.invisible').remove
+    html = doc.css('body')[0].inner_html
+    html.sub!(/^<p>(.+)<\/p>$/, '\1')
+    html = Sanitize.clean(html).delete("\n").truncate(150)
+    html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
+    html.html_safe
+  end
+
   def reformat(html)
     sanitize(html, Sanitize::Config::MASTODON_STRICT)
   rescue ArgumentError
@@ -191,6 +204,12 @@ class Formatter
   end
   # rubocop:enable Metrics/BlockNesting
 
+  def quotify(html, status)
+    url = ActivityPub::TagManager.instance.url_for(status.quote)
+    link = encode_and_link_urls(url)
+    html.sub(/(<[^>]+>)\z/, "<span class=\"quote-inline\"><br/>QT: #{link}</span>\\1")
+  end
+
   def rewrite(text, entities)
     text = text.to_s
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 847921ac2..e06048679 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -23,6 +23,7 @@
 #  in_reply_to_account_id :bigint(8)
 #  poll_id                :bigint(8)
 #  deleted_at             :datetime
+#  quote_id               :bigint(8)
 #
 
 class Status < ApplicationRecord
@@ -55,6 +56,7 @@ class Status < ApplicationRecord
 
   belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
   belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
+  belongs_to :quote, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quoted, optional: true
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
@@ -63,6 +65,7 @@ class Status < ApplicationRecord
   has_many :mentions, dependent: :destroy, inverse_of: :status
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status
   has_many :media_attachments, dependent: :nullify
+  has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify
 
   has_and_belongs_to_many :tags
   has_and_belongs_to_many :preview_cards
@@ -169,6 +172,10 @@ class Status < ApplicationRecord
     !reblog_of_id.nil?
   end
 
+  def quote?
+    !quote_id.nil? && quote
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end
@@ -229,7 +236,7 @@ class Status < ApplicationRecord
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
   end
 
   def replies_count
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 7c52b634d..c26d01caf 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,7 +7,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :quote_url
 
   attribute :content
   attribute :content_map, if: :language?
@@ -125,6 +125,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
   end
 
+  def quote_url
+    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+  end
+
   def local?
     object.account.local?
   end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bb6df90b7..67449716e 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -18,6 +18,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
+  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c5cd3096a..2defecd74 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -67,7 +67,7 @@ class FetchLinkCardService < BaseService
       urls = @status.text.scan(URL_PATTERN).map { |array| Addressable::URI.parse(array[1]).normalize }
     else
       html  = Nokogiri::HTML(@status.text)
-      links = html.css('a')
+      links = html.css(':not(.quote-inline) > a')
       urls  = links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
     end
 
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-    
+
     @card.save_with_optional_image!
   end
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 0a383d6a3..854e1d874 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -164,6 +164,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
+      quote_id: @options[:quote_id],
     }.compact
   end
 
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index daf164949..25231d440 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -25,6 +25,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 670, height: 380, detailed: true)
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
new file mode 100644
index 000000000..de5fb6762
--- /dev/null
+++ b/app/views/statuses/_quote_status.html.haml
@@ -0,0 +1,35 @@
+.status.quote-status{ dataurl:  ActivityPub::TagManager.instance.url_for(status) }
+  = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+    .status__avatar
+      %div
+        = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar'
+    %span.display-name
+      %bdi
+        %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true)
+      &nbsp;
+      %span.display-name__account
+        = acct(status.account)
+        = fa_icon('lock') if status.account.locked?
+
+  .status__content.emojify<
+    - if status.spoiler_text?
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+        %button.status__content__spoiler-link= t('statuses.show_more')
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+      = Formatter.instance.format_in_quote(status, custom_emojify: true)
+  
+  - if !status.media_attachments.empty?
+    - if status.media_attachments.first.video?
+      - video = status.media_attachments.first
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - elsif status.media_attachments.first.audio?
+      - audio = status.media_attachments.first
+      = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - else
+      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 728e6b9b0..d134b1008 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -34,6 +34,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "statuses/quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 610, height: 343)
diff --git a/db/migrate/20180419235016_add_quote_id_to_statuses.rb b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
new file mode 100644
index 000000000..d7550b248
--- /dev/null
+++ b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddQuoteIdToStatuses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :statuses, :quote_id, :bigint, null: true, default: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 583bdf317..7a47e6711 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -815,6 +815,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.bigint "in_reply_to_account_id"
     t.bigint "poll_id"
     t.datetime "deleted_at"
+    t.bigint "quote_id"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index a2e1d9d01..de6b132ee 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -31,6 +31,7 @@ class Sanitize
         next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
         next true if /^(mention|hashtag)$/.match?(e) # semantic classes
         next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
+        next true if /^quote-inline$/.match?(e) # quote inline classes
       end
 
       node['class'] = class_list.join(' ')

From ee18bd69702d5e9457fa8eb823e97bb56f9dd1c0 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 21 Feb 2020 21:49:06 +0900
Subject: [PATCH 144/200] Fix quote nesting at once, add quote_id

---
 app/serializers/rest/status_serializer.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 67449716e..12c386600 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -15,10 +15,11 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attribute :content, unless: :source_requested?
   attribute :text, if: :source_requested?
 
+  attribute :quote_id, if: -> { object.quote? }
+
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
-  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
@@ -40,6 +41,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.in_reply_to_account_id&.to_s
   end
 
+  def quote_id
+    object.quote_id.to_s
+  end
+
   def current_user?
     !current_user.nil?
   end
@@ -168,3 +173,13 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 end
+
+class REST::NestedQuoteSerializer < REST::StatusSerializer
+  attribute :quote do
+    nil
+  end
+end
+
+class REST::StatusSerializer < ActiveModel::Serializer
+  belongs_to :quote, serializer: REST::NestedQuoteSerializer
+end

From 98f48c8f13bf4e5cc17069b2ce7345fadbdb9016 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 11:36:40 +0900
Subject: [PATCH 145/200] Fix boost target to be quoted if boosted

---
 app/services/post_status_service.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 854e1d874..accfcec21 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -26,10 +26,12 @@ class PostStatusService < BaseService
     @options     = options
     @text        = @options[:text] || ''
     @in_reply_to = @options[:thread]
+    @quote_id    = @options[:quote_id]
 
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
+    preprocess_quote!
     preprocess_attributes!
 
     if scheduled?
@@ -58,6 +60,13 @@ class PostStatusService < BaseService
     raise ActiveRecord::RecordInvalid
   end
 
+  def preprocess_quote!
+    if @quote_id.present?
+      quote = Status.find(@quote_id)
+      @quote_id = quote.reblog_of_id.to_s if quote.reblog?
+    end
+  end
+
   def process_status!
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
@@ -164,7 +173,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
-      quote_id: @options[:quote_id],
+      quote_id: @quote_id,
     }.compact
   end
 

From a47b6ffc65705bb7983f095b75c7d82c82bd1fb7 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 12:53:28 +0900
Subject: [PATCH 146/200] Add feature_quote to instance API

---
 app/serializers/rest/instance_serializer.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d39092b56..6683ac48f 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,7 +5,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
   attributes :uri, :title, :short_description, :description, :email,
              :version, :urls, :stats, :thumbnail,
-             :languages, :registrations, :approval_required, :invites_enabled
+             :languages, :registrations, :approval_required, :invites_enabled,
+             :feature_quote
 
   has_one :contact_account, serializer: REST::AccountSerializer
 
@@ -69,6 +70,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     Setting.min_invite_role == 'user'
   end
 
+  def feature_quote
+    true
+  end
+
   private
 
   def instance_presenter

From a2ad6ca6b0d83a3bba57783aaafc5cac3e91bf44 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 14:19:46 +0900
Subject: [PATCH 147/200] Add confirmation of overwriting of input content when
 quoting

---
 .../mastodon/containers/status_container.js      | 16 +++++++++++++++-
 app/javascript/mastodon/features/status/index.js | 15 +++++++++++++--
 app/javascript/mastodon/locales/en.json          |  2 ++
 app/javascript/mastodon/locales/ja.json          |  2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 8e0730625..ce055cd96 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -53,6 +53,8 @@ const messages = defineMessages({
   redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -103,7 +105,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onQuote (status, router) {
-    dispatch(quoteCompose(status, router));
+    dispatch((_, getState) => {
+      let state = getState();
+
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.quoteMessage),
+          confirm: intl.formatMessage(messages.quoteConfirm),
+          onConfirm: () => dispatch(quoteCompose(status, router)),
+        }));
+      } else {
+        dispatch(quoteCompose(status, router));
+      }
+    });
   },
 
   onFavourite (status) {
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index d25905d8e..ce0a26cb3 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -71,6 +71,8 @@ const messages = defineMessages({
   detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -268,8 +270,17 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-    handleQuoteClick = (status) => {
-    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  handleQuoteClick = (status) => {
+    let { askReplyConfirmation, dispatch, intl } = this.props;
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: () => dispatch(quoteCompose(status, this.context.router.history)),
+      }));
+    } else {
+      dispatch(quoteCompose(status, this.context.router.history));
+    }
   }
 
   handleDeleteClick = (status, history, withRedraft = false) => {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7ddd4908b..69668a201 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.quote.confirm": "Quote",
+  "confirmations.quote.message": "Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c39b92e04..79512b6ef 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
   "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
+  "confirmations.quote.confirm": "引用",
+  "confirmations.quote.message": "今引用すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "本当にこの投稿を削除して下書きに戻しますか？ この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。",
   "confirmations.reply.confirm": "返信",

From 1502f9fa422a1e693c03261125a85e3554e8ce64 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 28 Feb 2020 07:45:54 +0900
Subject: [PATCH 148/200] Fix to reject status quotations other than public and
 unlisted

---
 app/models/status.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/status.rb b/app/models/status.rb
index e06048679..6e088570d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -80,6 +80,7 @@ class Status < ApplicationRecord
   validates_with DisallowedHashtagsValidator
   validates :reblog, uniqueness: { scope: :account }, if: :reblog?
   validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog?
+  validates :quote_visibility, inclusion: { in: %w(public unlisted) }, if: :quote?
 
   accepts_nested_attributes_for :poll
 
@@ -176,6 +177,10 @@ class Status < ApplicationRecord
     !quote_id.nil? && quote
   end
 
+  def quote_visibility
+    quote&.visibility
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end

From def6c3eb1f8c1aecf361c4ec3b7b119e9b2ff44b Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 1 Mar 2020 19:31:59 +0900
Subject: [PATCH 149/200] Add index to statuses quote_id

---
 .../20200301102028_add_index_to_statuses_quote_id.rb     | 9 +++++++++
 db/schema.rb                                             | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 db/migrate/20200301102028_add_index_to_statuses_quote_id.rb

diff --git a/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
new file mode 100644
index 000000000..45293db98
--- /dev/null
+++ b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexToStatusesQuoteId < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :quote_id, algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7a47e6711..fff9e49ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -821,6 +821,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["quote_id"], name: "index_statuses_on_quote_id"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
     t.index ["uri"], name: "index_statuses_on_uri", unique: true
   end

From 95c39af5c20e81fafe5a310f2cc0c01e0f67f176 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 23:56:04 +0900
Subject: [PATCH 150/200] Change not to delete the element specified in
 invisible

---
 app/javascript/mastodon/actions/importer/normalizer.js | 1 -
 app/lib/formatter.rb                                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index d274a0226..1b9d781a7 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -92,7 +92,6 @@ export function normalizeStatus(status, normalOldStatus) {
       normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
       normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
       let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
-      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
       Array.from(docElem.querySelectorAll('p,br'), line => {
         let parentNode = line.parentNode;
         if (line.nextSibling) {
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d94e01c07..85f1de9d6 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -48,7 +48,6 @@ class Formatter
     html = format(status)
     return '' if html.empty?
     doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
-    doc.search('span.invisible').remove
     html = doc.css('body')[0].inner_html
     html.sub!(/^<p>(.+)<\/p>$/, '\1')
     html = Sanitize.clean(html).delete("\n").truncate(150)

From 4ae259d9907343243bcb12c53a76a3fbe00cf47d Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 20:20:08 +0900
Subject: [PATCH 151/200] Compatible with Misskey quote

---
 app/lib/activitypub/activity/create.rb         | 12 ++++++++++--
 app/lib/activitypub/case_transform.rb          |  2 ++
 app/serializers/activitypub/note_serializer.rb | 13 +++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 8c937cd1f..2edeae0d3 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,7 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
-        quote: quote_from_url(@object['quoteUrl']),
+        quote: quote,
       }
     end
   end
@@ -383,7 +383,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def text_from_content
     return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || object_uri].join(' ')) if converted_object_type?
 
-    if @object['content'].present?
+    if @object['quoteUrl'].blank? && @object['_misskey_quote'].present?
+      Formatter.instance.linkify(@object['_misskey_content'])
+    elsif @object['content'].present?
       @object['content']
     elsif content_language_map?
       @object['contentMap'].values.first
@@ -502,10 +504,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     retry
   end
 
+  def quote
+    @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
     quote = ResolveURLService.new.call(url)
     status_from_uri(quote.uri) if quote
+  rescue
+    nil
   end
 end
diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb
index 7f716f862..ef0c6e1f9 100644
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@@ -14,6 +14,8 @@ module ActivityPub::CaseTransform
       when String
         camel_lower_cache[value] ||= if value.start_with?('_:')
                                        '_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower)
+                                     elsif value.start_with?('_')
+                                       value
                                      else
                                        value.underscore.camelize(:lower)
                                      end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index c26d01caf..a9e15e6f8 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,8 +7,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation, :quote_url
+             :conversation
 
+  attribute :quote_url, if: -> { object.quote? }
+  attribute :misskey_quote, key: :_misskey_quote, if: -> { object.quote? }
+  attribute :misskey_content, key: :_misskey_content, if: -> { object.quote? }
   attribute :content
   attribute :content_map, if: :language?
 
@@ -126,7 +129,13 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def quote_url
-    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+    ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote?
+  end
+
+  alias misskey_quote quote_url
+
+  def misskey_content
+    object.text if object.quote?
   end
 
   def local?

From 09ba90ad8c11f6ee86285bb99c5a27c3d41886ea Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 29 Nov 2019 12:10:59 +0900
Subject: [PATCH 152/200] Apply quote by parsing post body

---
 app/lib/activitypub/activity/create.rb |  8 ++++++++
 app/services/post_status_service.rb    | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2edeae0d3..dbd191103 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -73,6 +73,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @mentions = []
     @params   = {}
 
+    process_quote
     process_status_params
     process_tags
     process_audience
@@ -508,6 +509,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
   end
 
+  def process_quote
+    if quote.nil? && md = @object['content']&.match(/QT:\s*\[<a href=\"([^\"]+).*?\]/)
+      @quote = quote_from_url(md[1])
+      @object['content'] = @object['content'].sub(/QT:\s*\[.*?\]/, '<span class="quote-inline"><br/>\1</span>')
+    end
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index accfcec21..f594b02a2 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -31,8 +31,8 @@ class PostStatusService < BaseService
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
-    preprocess_quote!
     preprocess_attributes!
+    preprocess_quote!
 
     if scheduled?
       schedule_status!
@@ -49,6 +49,19 @@ class PostStatusService < BaseService
 
   private
 
+  def status_from_uri(uri)
+    ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+  end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  rescue
+    nil
+  end
+
   def preprocess_attributes!
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@@ -56,6 +69,10 @@ class PostStatusService < BaseService
     @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+    if @quote_id.nil? && md = @text.match(/QT:\s*\[\s*(https:\/\/.+?)\s*\]/)
+      @quote_id = quote_from_url(md[1])&.id
+      @text.sub!(/QT:\s*\[.*?\]/, '')
+    end
   rescue ArgumentError
     raise ActiveRecord::RecordInvalid
   end

From e408db4bb1b71a1c8d6d2ddd1993261bc5d562bf Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 14:09:06 +0900
Subject: [PATCH 153/200] Add "Show poll" link to quoted poll

---
 app/javascript/mastodon/components/poll.js      |  5 ++++-
 .../mastodon/components/status_content.js       | 17 ++++++++++++++---
 app/javascript/mastodon/locales/en.json         |  1 +
 app/javascript/mastodon/locales/ja.json         |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 477f56e13..1126b0121 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -39,6 +39,9 @@ class Poll extends ImmutablePureComponent {
 
   static getDerivedStateFromProps (props, state) {
     const { poll, intl } = props;
+    if (!poll) {
+      return null;
+    }
     const expires_at = poll.get('expires_at');
     const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
     return (expired === state.expired) ? null : { expired };
@@ -59,7 +62,7 @@ class Poll extends ImmutablePureComponent {
   _setupTimer () {
     const { poll, intl } = this.props;
     clearTimeout(this._timer);
-    if (!this.state.expired) {
+    if (!this.state.expired && !!poll) {
       const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 70081f45f..71fbbd7c5 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -183,6 +183,7 @@ export default class StatusContent extends React.PureComponent {
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+    const renderShowPoll = !!status.get('poll');
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
@@ -204,6 +205,16 @@ export default class StatusContent extends React.PureComponent {
       </button>
     );
 
+    const showPollButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick} key='show-poll'>
+        <FormattedMessage id='status.show_poll' defaultMessage='Show poll' /><Icon id='angle-right' fixedWidth />
+      </button>
+    );
+
+    const pollContainer = (
+      <PollContainer pollId={status.get('poll')} />
+    );
+
     if (status.get('spoiler_text').length > 0) {
       let mentionsPlaceholder = '';
 
@@ -231,7 +242,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!hidden && renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -241,7 +252,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -257,7 +268,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 69668a201..6e69d7c4d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -420,6 +420,7 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
+  "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 79512b6ef..598f8d33a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -421,6 +421,7 @@
   "status.show_less_all": "全て隠す",
   "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
+  "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
   "status.unmute_conversation": "会話のミュートを解除",

From 9b06011b0a27f552cc7256b457ce9d4a43b096c3 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 4 Jun 2020 05:28:05 +0900
Subject: [PATCH 154/200] Fix an avatar icon size of the status quoted on the
 public page

---
 app/javascript/styles/mastodon/statuses.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ad23efae8..ab91b3123 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -78,7 +78,7 @@
         top: 5px;
         left: 5px;
 
-        & > div {
+        & img {
           width: 18px;
           height: 18px;
         }

From 55d2f6b791129042e181f8e9e6adfa033864513a Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 26 Jun 2020 07:26:25 +0900
Subject: [PATCH 155/200] Fix tooltip 'cannot be quoted'

---
 app/javascript/mastodon/components/status_action_bar.js       | 4 ++--
 .../mastodon/features/status/components/action_bar.js         | 3 ++-
 app/javascript/mastodon/locales/en.json                       | 1 +
 app/javascript/mastodon/locales/ja.json                       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 804e05717..a6447b8ab 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -23,6 +23,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -332,8 +333,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
-
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {shareButton}
 
         <div className='status__action-bar-dropdown'>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 013dfed9a..61833f37b 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -17,6 +17,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -283,7 +284,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6e69d7c4d..e4d97fc34 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -386,6 +386,7 @@
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
+  "status.cannot_quote": "This post cannot be quoted",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 598f8d33a..53597ac85 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -386,6 +386,7 @@
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
   "status.cancel_reblog_private": "ブースト解除",
+  "status.cannot_quote": "この投稿は引用できません",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.copy": "投稿へのリンクをコピー",
   "status.delete": "削除",

From c5300b0df43efacdf8305fa535558ce3ee16b7ec Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 25 Jul 2020 19:16:43 +0900
Subject: [PATCH 156/200] Fix quoted audio

---
 app/javascript/mastodon/components/status.js              | 8 ++++++--
 .../features/status/components/detailed_status.js         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3019500ec..937b618c1 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -508,10 +508,14 @@ class Status extends ImmutablePureComponent {
                 <Component
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
+                  poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+                  backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+                  foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+                  accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
                   duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-                  peaks={[0]}
+                  width={this.props.cachedMediaWidth}
                   height={70}
-                  quote
+                  cacheWidth={this.props.cacheMediaWidth}
                 />
               )}
             </Bundle>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index ae90a622d..242b4aee9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -152,8 +152,11 @@ class DetailedStatus extends ImmutablePureComponent {
               src={attachment.get('url')}
               alt={attachment.get('description')}
               duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+              backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+              foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+              accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
               height={60}
-              preload
             />
           );
         } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {

From 77c98a35038927a84d46d0d46937049461e275a9 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Wed, 7 Oct 2020 22:28:02 +0900
Subject: [PATCH 157/200] Fix PictureInPicture to work in quotes

---
 app/javascript/mastodon/components/status.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 937b618c1..39ca49693 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -381,10 +381,10 @@ class Status extends ImmutablePureComponent {
       status  = status.get('reblog');
     }
 
-    if (pictureInPicture.get('inUse')) {
-      media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
-    } else if (status.get('media_attachments').size > 0) {
-      if (this.props.muted) {
+    if (status.get('media_attachments').size > 0) {
+      if (pictureInPicture.get('inUse')) {
+        media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+      } else if (this.props.muted) {
         media = (
           <AttachmentList
             compact
@@ -492,7 +492,9 @@ class Status extends ImmutablePureComponent {
 
       let quote_media = null;
       if (quote_status.get('media_attachments').size > 0) {
-        if (this.props.muted) {
+        if (pictureInPicture.get('inUse')) {
+          quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+        } else if (this.props.muted) {
           quote_media = (
             <AttachmentList
               compact
@@ -516,7 +518,8 @@ class Status extends ImmutablePureComponent {
                   width={this.props.cachedMediaWidth}
                   height={70}
                   cacheWidth={this.props.cacheMediaWidth}
-                />
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                  />
               )}
             </Bundle>
           );
@@ -537,6 +540,7 @@ class Status extends ImmutablePureComponent {
                   sensitive={quote_status.get('sensitive')}
                   onOpenVideo={this.handleOpenVideo}
                   cacheWidth={this.props.cacheMediaWidth}
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
                   onToggleVisibility={this.handleToggleQuoteMediaVisibility}
                   quote

From 17e0ba29e442c8c57d01c00266e0e0d61d35b81d Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 6 Jun 2020 12:59:45 +0900
Subject: [PATCH 158/200] Fix to hide mute and blocked quotes

---
 .../api/v1/accounts/statuses_controller.rb    |  5 +-
 .../api/v1/bookmarks_controller.rb            |  5 +-
 .../api/v1/favourites_controller.rb           |  5 +-
 app/controllers/api/v1/statuses_controller.rb |  3 +-
 .../api/v1/timelines/home_controller.rb       |  4 +-
 .../api/v1/timelines/list_controller.rb       |  5 +-
 .../api/v1/timelines/public_controller.rb     |  6 +-
 .../api/v1/timelines/tag_controller.rb        |  5 +-
 app/javascript/mastodon/actions/bookmarks.js  |  4 +
 app/javascript/mastodon/actions/favourites.js |  4 +
 .../mastodon/actions/importer/index.js        |  4 +
 .../mastodon/actions/notifications.js         |  2 +-
 app/javascript/mastodon/actions/timelines.js  |  4 +
 app/javascript/mastodon/components/status.js  | 56 ++++++++++--
 .../status/components/detailed_status.js      | 65 +++++++++++--
 .../mastodon/locales/defaultMessages.json     |  4 +
 app/javascript/mastodon/locales/en.json       |  4 +-
 app/javascript/mastodon/locales/ja.json       |  5 +-
 app/javascript/mastodon/selectors/index.js    | 30 +++++-
 app/javascript/mastodon/utils/uniq.js         |  3 +
 .../styles/mastodon/components.scss           | 91 ++++---------------
 app/serializers/rest/status_serializer.rb     | 10 ++
 22 files changed, 219 insertions(+), 105 deletions(-)
 create mode 100644 app/javascript/mastodon/utils/uniq.js

diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 92ccb8061..f301666db 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -7,8 +7,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index aa3fb88f0..f666a1d8d 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::BookmarksController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 21836bc17..651a057d5 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::FavouritesController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 1e23cf300..d8f4db42f 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -30,8 +30,9 @@ class Api::V1::StatusesController < Api::BaseController
 
     @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
     statuses = [@status] + @context.ancestors + @context.descendants
+    accountIds = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
-    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
+    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   def create
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ae6dbcb8b..c07e1a820 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -6,11 +6,13 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id),
            status: account_home_feed.regenerating? ? 206 : 200
   end
 
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index a15eae468..bc13ed5ec 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -9,9 +9,12 @@ class Api::V1::Timelines::ListController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
-           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index d253b744f..1a778012b 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -5,8 +5,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 64a1db58d..c7afd4580 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -5,8 +5,9 @@ class Api::V1::Timelines::TagController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 544ed2ff2..b3e0a2ab4 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
 export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchBookmarkedStatuses() {
     api(getState).get('/api/v1/bookmarks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchBookmarkedStatusesFail(error));
@@ -61,6 +64,7 @@ export function expandBookmarkedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandBookmarkedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 9448b1efe..9b28ac4c4 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchFavouritedStatuses() {
     api(getState).get('/api/v1/favourites').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchFavouritedStatusesFail(error));
@@ -64,6 +67,7 @@ export function expandFavouritedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandFavouritedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index f4372fb31..35032fc70 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -70,6 +70,10 @@ export function importFetchedStatuses(statuses) {
         processStatus(status.reblog);
       }
 
+      if (status.quote && status.quote.id) {
+        processStatus(status.quote);
+      }
+
       if (status.poll && status.poll.id) {
         pushUnique(polls, normalizePoll(status.poll));
       }
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 3464ac995..22f1e0cbb 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -46,7 +46,7 @@ defineMessages({
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
-  const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id);
+  const accountIds = notifications.map(item => item.account.id);
 
   if (accountIds.length > 0) {
     dispatch(fetchRelationships(accountIds));
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 31ae09e4a..d82bf1d0d 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,9 +1,11 @@
+import { fetchRelationships } from './accounts';
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { submitMarkers } from './markers';
 import api, { getLinks } from 'mastodon/api';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import compareId from 'mastodon/compare_id';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
+import { uniq } from '../utils/uniq';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
@@ -39,6 +41,7 @@ export function updateTimeline(timeline, status, accept) {
     }
 
     dispatch(importFetchedStatus(status));
+    dispatch(fetchRelationships([status.reblog ? status.reblog.account.id : status.account.id, status.quote ? status.quote.account.id : null].filter(function(e){return e})));
 
     dispatch({
       type: TIMELINE_UPDATE,
@@ -111,6 +114,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id).concat(response.data.map(item => item.quote ? item.quote.account.id : null)).filter(function(e){return e}))));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
       if (timelineId === 'home') {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 39ca49693..f4d80c00e 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
@@ -23,6 +24,29 @@ import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
 export const textForScreenReader = (intl, status, rebloggedByText = false) => {
   const displayName = status.getIn(['account', 'display_name']);
 
@@ -59,7 +83,8 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default @injectIntl
+export default @connect(mapStateToProps)
+@injectIntl
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -70,6 +95,7 @@ class Status extends ImmutablePureComponent {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.map,
     otherAccounts: ImmutablePropTypes.list,
+    quote_muted: PropTypes.bool,
     onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
@@ -114,6 +140,7 @@ class Status extends ImmutablePureComponent {
     'hidden',
     'unread',
     'pictureInPicture',
+    'quote_muted',
   ];
 
   state = {
@@ -308,9 +335,9 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
+    let statusAvatar, prepend, rebloggedByText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType, quote_muted } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -569,12 +596,21 @@ class Status extends ImmutablePureComponent {
         }
       }
 
-      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
-        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+      if (quote_muted) {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
-              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+              <button onClick={this.handleQuoteClick}>
+                <FormattedMessage id='status.unlisted_quote' defaultMessage='Unlisted quote' />
+              </button>
             </div>
           </div>
         );
@@ -592,6 +628,14 @@ class Status extends ImmutablePureComponent {
           </div>
         );
       }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
+        </div>
+      );
     }
 
     return (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 242b4aee9..2344d8019 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Avatar from '../../../components/avatar';
@@ -6,7 +7,7 @@ import DisplayName from '../../../components/display_name';
 import StatusContent from '../../../components/status_content';
 import MediaGallery from '../../../components/media_gallery';
 import { Link } from 'react-router-dom';
-import { injectIntl, defineMessages, FormattedDate } from 'react-intl';
+import { injectIntl, defineMessages, FormattedDate, FormattedMessage } from 'react-intl';
 import Card from './card';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
@@ -24,7 +25,31 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default  @injectIntl
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
+export default @connect(mapStateToProps)
+@injectIntl
 class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -33,6 +58,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map,
+    quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
@@ -120,6 +146,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
+    const quote_muted = this.props.quote_muted
     const outerStyle = { boxSizing: 'border-box' };
     const { intl, compact, pictureInPicture } = this.props;
 
@@ -194,15 +221,33 @@ class DetailedStatus extends ImmutablePureComponent {
         }
       }
 
-      quote = (
-        <div className='quote-status'>
-          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
-            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
-          </a>
+      if (quote_muted) {
+        quote = (
+          <div className='quote-status'>
+            <div className='status__content muted-quote'>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className='quote-status'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+              <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+              <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+            </a>
 
-          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
-          {quote_media}
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
         </div>
       );
     }
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 7cbb11dc6..321d7507d 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -457,6 +457,10 @@
         "defaultMessage": "Unlisted quote",
         "id": "status.unlisted_quote"
       },
+      {
+        "defaultMessage": "Muted quote",
+        "id": "status.muted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e4d97fc34..8e9eeff8f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -401,11 +401,12 @@
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
+  "status.muted_quote": "Muted quote",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
-  "status.read_more": "Read more",
   "status.quote": "Quote",
+  "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
@@ -424,6 +425,7 @@
   "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
+  "status.unlisted_quote": "Unlisted quote",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "suggestions.dismiss": "Dismiss suggestion",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 53597ac85..45ddd4ef5 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -401,12 +401,12 @@
   "status.more": "もっと見る",
   "status.mute": "@{name}さんをミュート",
   "status.mute_conversation": "会話をミュート",
+  "status.muted_quote": "ミュートされた引用",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
-  "status.read_more": "もっと見る",
   "status.quote": "引用",
-  "status.unlisted_quote": "未収載の引用",
+  "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
@@ -425,6 +425,7 @@
   "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
+  "status.unlisted_quote": "未収載の引用",
   "status.unmute_conversation": "会話のミュートを解除",
   "status.unpin": "プロフィールへの固定を解除",
   "suggestions.dismiss": "隠す",
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d..f84152199 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -88,22 +88,49 @@ export const makeGetStatus = () => {
     [
       (state, { id }) => state.getIn(['statuses', id]),
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
+      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
 
+      accountBase = accountBase.withMutations(map => {
+        map.set('relationship', relationship);
+        map.set('moved', moved);
+      });
+
       if (statusReblog) {
+        accountReblog = accountReblog.withMutations(map => {
+          map.set('relationship', reblogRelationship);
+          map.set('moved', reblogMoved);
+        });
         statusReblog = statusReblog.set('account', accountReblog);
       } else {
         statusReblog = null;
       }
 
+      if (statusQuote) {
+        accountQuote = accountQuote.withMutations(map => {
+          map.set('relationship', quoteRelationship);
+          map.set('moved', quoteMoved);
+        });
+        statusQuote = statusQuote.set('account', accountQuote);
+      } else {
+        statusQuote = null;
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;
@@ -114,6 +141,7 @@ export const makeGetStatus = () => {
 
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
+        map.set('quote', statusQuote);
         map.set('account', accountBase);
         map.set('filtered', filtered);
       });
diff --git a/app/javascript/mastodon/utils/uniq.js b/app/javascript/mastodon/utils/uniq.js
new file mode 100644
index 000000000..00f1804a1
--- /dev/null
+++ b/app/javascript/mastodon/utils/uniq.js
@@ -0,0 +1,3 @@
+export const uniq = array => {
+  return array.filter((x, i, self) => self.indexOf(x) === i)
+};
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8e965d080..cba90481d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1036,6 +1036,12 @@
     }
   }
 
+  & > .muted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+    font-size: 100%;
+  }
+
   .status__avatar,
   .detailed-status__display-avatar {
     height: 18px;
@@ -1531,77 +1537,6 @@ a .account__avatar {
   }
 }
 
-.account__action-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  line-height: 36px;
-  overflow: hidden;
-  flex: 0 0 auto;
-  display: flex;
-}
-
-.account__action-bar-dropdown {
-  padding: 10px;
-
-  .icon-button {
-    vertical-align: middle;
-  }
-
-  .dropdown--active {
-    .dropdown__content.dropdown__right {
-      left: 6px;
-      right: initial;
-    }
-
-    &::after {
-      bottom: initial;
-      margin-left: 11px;
-      margin-top: -7px;
-      right: initial;
-    }
-  }
-}
-
-.account__action-bar-links {
-  display: flex;
-  flex: 1 1 auto;
-  line-height: 18px;
-  text-align: center;
-}
-
-.account__action-bar__tab {
-  text-decoration: none;
-  overflow: hidden;
-  flex: 0 1 100%;
-  border-right: 1px solid lighten($ui-base-color, 8%);
-  padding: 10px 0;
-  border-bottom: 4px solid transparent;
-
-  &.active {
-    border-bottom: 4px solid $ui-highlight-color;
-  }
-
-  & > span {
-    display: block;
-    text-transform: uppercase;
-    font-size: 11px;
-    color: $darker-text-color;
-  }
-
-  strong {
-    display: block;
-    font-size: 15px;
-    font-weight: 500;
-    color: $primary-text-color;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-}
-
 .account-authorize {
   padding: 14px 10px;
 
@@ -1688,6 +1623,15 @@ a.account__display-name {
   margin-right: 10px;
 }
 
+.account__action-bar {
+  position: absolute;
+  height: 24px;
+  width: 48px;
+  top: 60px;
+  left: 10px;
+  z-index: 1;
+}
+
 .status__avatar {
   height: 48px;
   left: 10px;
@@ -2456,6 +2400,11 @@ a.account__display-name {
         margin-right: 15px;
       }
     }
+
+    .account__action-bar {
+      top: 67px;
+      left: 15px;
+    }
   }
 }
 
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 12c386600..f49b365bf 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -178,6 +178,16 @@ class REST::NestedQuoteSerializer < REST::StatusSerializer
   attribute :quote do
     nil
   end
+  attribute :quote_muted, if: :current_user?
+
+  def quote_muted
+    if instance_options && instance_options[:account_relationships]
+      instance_options[:account_relationships].muting[object.account_id] ? true : false || instance_options[:account_relationships].blocking[object.account_id] || instance_options[:account_relationships].blocked_by[object.account_id] || instance_options[:account_relationships].domain_blocking[object.account_id] || false
+    else
+      current_user.account.muting?(object.account) || object.account.blocking?(current_user.account) || current_user.account.blocking?(object.account) || current_user.account.domain_blocking?(object.account.domain) 
+    end
+  end
+
 end
 
 class REST::StatusSerializer < ActiveModel::Serializer

From 3c889eda8ee28bf9b24ceefd01fb5bee4f8bcd99 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 27 Dec 2020 21:53:54 +0900
Subject: [PATCH 159/200] Add quote button in PiP

---
 .../picture_in_picture/components/footer.js   | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 1ecb18bf8..c89b86ffe 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button';
 import classNames from 'classnames';
 import { me, boostModal } from 'mastodon/initial_state';
 import { defineMessages, injectIntl } from 'react-intl';
-import { replyCompose } from 'mastodon/actions/compose';
+import { replyCompose, quoteCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { makeGetStatus } from 'mastodon/selectors';
 import { initBoostModal } from 'mastodon/actions/boosts';
@@ -20,9 +20,13 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
@@ -119,6 +123,31 @@ class Footer extends ImmutablePureComponent {
     router.history.push(`/statuses/${status.get('id')}`);
   }
 
+  _performQuote = () => {
+    const { dispatch, status, onClose } = this.props;
+    const { router } = this.context;
+
+    if (onClose) {
+      onClose();
+    }
+
+    dispatch(quoteCompose(status, router.history));
+  };
+
+  handleQuoteClick = () => {
+    const { dispatch, askReplyConfirmation, intl } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: this._performQuote,
+      }));
+    } else {
+      this._performQuote();
+    }
+  }
+
   render () {
     const { status, intl, withOpenButton } = this.props;
 
@@ -152,6 +181,7 @@ class Footer extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        <IconButton className='status__action-bar-button' disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
       </div>
     );

From afc65e901ff136563e749f0031ea9c0c94ac5c7b Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 8 Dec 2020 22:58:24 +0900
Subject: [PATCH 160/200] Fix Open handler in quote media

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index f4d80c00e..fe2ee6a0f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -583,7 +583,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.props.onOpenMedia}
+                  onOpenMedia={this.handleOpenMedia}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}

From b205de3fd006f38b75fd808873f75265a39b59ce Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 19 Dec 2020 10:14:10 +0900
Subject: [PATCH 161/200] fix rtl in quote_indicator

---
 .../mastodon/features/compose/components/quote_indicator.js | 6 +-----
 app/views/statuses/_quote_status.html.haml                  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index a48289de2..1d4c6a341 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,7 +6,6 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
 import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
@@ -45,9 +44,6 @@ class QuoteIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
 
     return (
       <div className='quote-indicator'>
@@ -60,7 +56,7 @@ class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+        <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
           <AttachmentList
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index de5fb6762..f2fc02258 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -16,7 +16,7 @@
       %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" }
       = Formatter.instance.format_in_quote(status, custom_emojify: true)
   
   - if !status.media_attachments.empty?

From 6a29bb763961877f05ce3b6edc3b063c1ec780b7 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 31 Dec 2020 08:27:24 +0900
Subject: [PATCH 162/200] Fix expand video on public page for quote

---
 app/views/statuses/_quote_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index f2fc02258..fa0b7b1b1 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -22,7 +22,7 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json, quote: true do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first

From 6d58d975dfbea6d9f2c73abec33c1d1b9dd94658 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 3 Jan 2021 23:19:41 +0900
Subject: [PATCH 163/200] Fix quoted account link in detailed status

---
 .../mastodon/features/status/components/detailed_status.js   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 2344d8019..8b9f3d711 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -83,8 +83,9 @@ class DetailedStatus extends ImmutablePureComponent {
 
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
+      const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${id}`);
     }
 
     e.stopPropagation();
@@ -232,7 +233,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status'>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>

From d4474db28810f9f5c8eb8a91e14acec6f7cc852d Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 00:28:17 +0900
Subject: [PATCH 164/200] Fix modal footer to react to quoted posts

---
 app/javascript/mastodon/components/status.js  | 31 +++++++++++++------
 .../status/components/detailed_status.js      | 10 ++++--
 .../mastodon/features/status/index.js         | 10 ++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index fe2ee6a0f..b12b02dbd 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -245,10 +245,19 @@ class Status extends ImmutablePureComponent {
     this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    const status = this._properQuoteStatus();
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
+  }
+
   handleOpenMedia = (media, index) => {
     this.props.onOpenMedia(this._properStatus().get('id'), media, index);
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.onOpenMedia(this._properQuoteStatus().get('id'), media, index);
+  }
+
   handleHotkeyOpenMedia = e => {
     const { onOpenMedia, onOpenVideo } = this.props;
     const status = this._properStatus();
@@ -323,14 +332,18 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-  handleRef = c => {
-    this.node = c;
+  _properQuoteStatus () {
+    const status = this._properStatus();
+
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
+      return status.get('quote');
+    } else {
+      return status;
+    }
   }
 
-  _properQuoteStatus () {
-    const { status } = this.props;
-
-    return status.get('quote');
+  handleRef = c => {
+    this.node = c;
   }
 
   render () {
@@ -514,7 +527,7 @@ class Status extends ImmutablePureComponent {
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
     let quote = null;
-    if (status.get('quote', null) !== null) {
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
       let quote_status = status.get('quote');
 
       let quote_media = null;
@@ -565,7 +578,7 @@ class Status extends ImmutablePureComponent {
                   height={110}
                   inline
                   sensitive={quote_status.get('sensitive')}
-                  onOpenVideo={this.handleOpenVideo}
+                  onOpenVideo={this.handleOpenVideoQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
@@ -583,7 +596,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.handleOpenMedia}
+                  onOpenMedia={this.handleOpenMediaQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 8b9f3d711..3856bb47c 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -61,6 +61,8 @@ class DetailedStatus extends ImmutablePureComponent {
     quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
+    onOpenMediaQuote: PropTypes.func.isRequired,
+    onOpenVideoQuote: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
     measureHeight: PropTypes.bool,
     onHeightChange: PropTypes.func,
@@ -95,6 +97,10 @@ class DetailedStatus extends ImmutablePureComponent {
     this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    this.props.onOpenVideoQuote(this.props.status.getIn(['quote', 'media_attachments', 0]), options);
+  }
+
   handleExpandedToggle = () => {
     this.props.onToggleHidden(this.props.status);
   }
@@ -199,7 +205,7 @@ class DetailedStatus extends ImmutablePureComponent {
               width={300}
               height={150}
               inline
-              onOpenVideo={this.handleOpenVideo}
+              onOpenVideo={this.handleOpenVideoQuote}
               sensitive={quote_status.get('sensitive')}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
@@ -213,7 +219,7 @@ class DetailedStatus extends ImmutablePureComponent {
               sensitive={quote_status.get('sensitive')}
               media={quote_status.get('media_attachments')}
               height={300}
-              onOpenMedia={this.props.onOpenMedia}
+              onOpenMedia={this.props.onOpenMediaQuote}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
               quote
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index ce0a26cb3..79bbdefa8 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -313,6 +313,14 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.get('id'), media, options }));
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.dispatch(openModal('MEDIA', { statusId: this.props.status.getIn(['quote', 'id']), media, index }));
+  }
+
+  handleOpenVideoQuote = (media, options) => {
+    this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.getIn(['quote', 'id']), media, options }));
+  }
+
   handleHotkeyOpenMedia = e => {
     const { status } = this.props;
 
@@ -584,6 +592,8 @@ class Status extends ImmutablePureComponent {
                   status={status}
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
+                  onOpenVideoQuote={this.handleOpenVideoQuote}
+                  onOpenMediaQuote={this.handleOpenMediaQuote}
                   onToggleHidden={this.handleToggleHidden}
                   domain={domain}
                   showMedia={this.state.showMedia}

From bf17a8141b896312cf83656ca2657fe91e1d78d9 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 04:49:35 +0900
Subject: [PATCH 165/200] Fix missing reblog_of_quote

---
 app/javascript/mastodon/selectors/index.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index f84152199..a274fbfe9 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -92,16 +92,19 @@ export const makeGetStatus = () => {
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, accountReblogQuote, relationship, reblogRelationship, quoteRelationship, reblogQuoteRelationship, moved, reblogMoved, quoteMoved, reblogQuoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
@@ -131,6 +134,14 @@ export const makeGetStatus = () => {
         statusQuote = null;
       }
 
+      if (statusReblog && accountReblogQuote) {
+        accountReblogQuote = accountReblog.withMutations(map => {
+          map.set('relationship', reblogQuoteRelationship);
+          map.set('moved', reblogQuoteMoved);
+        });
+        statusReblog = statusReblog.setIn(['quote', 'account'], accountReblogQuote);
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;

From 707f69e851d44621ee19a859afc6003a42d896a5 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 09:45:37 +0900
Subject: [PATCH 166/200] Fix missing frameRate

---
 app/javascript/mastodon/components/status.js                     | 1 +
 .../mastodon/features/status/components/detailed_status.js       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index b12b02dbd..17f0de99f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -571,6 +571,7 @@ class Status extends ImmutablePureComponent {
               {Component => (
                 <Component
                   preview={attachment.get('preview_url')}
+                  frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
                   blurhash={attachment.get('blurhash')}
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3856bb47c..3eca8b092 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -199,6 +199,7 @@ class DetailedStatus extends ImmutablePureComponent {
           quote_media = (
             <Video
               preview={attachment.get('preview_url')}
+              frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={attachment.get('blurhash')}
               src={attachment.get('url')}
               alt={attachment.get('description')}

From 64a4e4de0a83bc97e5c6a39d2a56b485c4482a1f Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 13:39:11 +0900
Subject: [PATCH 167/200] Fix not hiding quoted unlisted status in non public
 timeline

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 17f0de99f..a08bb291a 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -618,7 +618,7 @@ class Status extends ImmutablePureComponent {
             </div>
           </div>
         );
-      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+      } else if (quote_status.get('visibility') === 'unlisted' && !!contextType && ['public', 'community', 'hashtag'].includes(contextType.split(':', 2)[0])) {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>

From d6fff9ba2335c868fd37e4dfcc43e30317c9d2ae Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 7 Jan 2021 15:56:40 +0900
Subject: [PATCH 168/200] Fix quote on public stream

---
 .../mastodon/containers/timeline_container.js   |  4 +++-
 .../status/components/detailed_status.js        |  6 +++---
 .../containers/detailed_status_container.js     | 17 +++++++++++++++++
 app/javascript/packs/public.js                  |  2 ++
 app/javascript/styles/mastodon/statuses.scss    |  4 ++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index ed8095f90..768169458 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,7 +47,9 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            {timeline}
+            <div className='standalone-timeline'>
+              {timeline}
+            </div>
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3eca8b092..9d16a9aa9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -231,7 +231,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
       if (quote_muted) {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <div className='status__content muted-quote'>
               <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
             </div>
@@ -239,7 +239,7 @@ class DetailedStatus extends ImmutablePureComponent {
         );
       } else {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
@@ -252,7 +252,7 @@ class DetailedStatus extends ImmutablePureComponent {
       }
     } else if (quote_muted) {
       quote = (
-        <div className={classNames('quote-status', { muted: this.props.muted })}>
+        <div className={classNames('quote-status', { muted: this.props.muted })} data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
           <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
             <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
           </div>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index bfed16620..8238f654d 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,6 +20,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -136,6 +138,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
+  onOpenMediaQuote (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+
+  onOpenVideoQuote (media, options) {
+    dispatch(openModal('VIDEO', { media, options }));
+  },
+
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -165,6 +175,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index f6acf706c..3a92d891a 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -303,6 +303,8 @@ function main() {
     let url = target.closest('.quote-status').getAttribute('dataurl');
     if (target.closest('.status__display-name')) {
       url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.detailed-status__display-name')) {
+      url = target.closest('.detailed-status__display-name').getAttribute('href');
     } else if (target.closest('.status-card')) {
       url = target.closest('.status-card').getAttribute('href');
     }
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ab91b3123..47dde12fd 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -99,6 +99,10 @@
   }
 }
 
+.standalone-timeline .quote-status {
+  cursor: pointer;
+}
+
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;

From 50c03ba7734558f337be55253f2a3633d6681e9f Mon Sep 17 00:00:00 2001
From: YorimiMochida <yuuman002@gmail.com>
Date: Wed, 19 May 2021 16:57:25 +0900
Subject: [PATCH 169/200] Update ja.json

---
 app/javascript/mastodon/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 22fe37731..b3984d3e5 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -304,7 +304,7 @@
   "navigation_bar.announcements": "運営からのお知らせ",
   "navigation_bar.trends": "トレンド",
   "navigation_bar.bookmarks": "ブックマーク",
-  "notification.favourite": "{name}さんがあなたのに╰( ^o^)╮-=ﾆ=一＝三★しました",
+  "notification.favourite": "{name}さんがあなたの投稿に╰( ^o^)╮-=ﾆ=一＝三★しました",
   "navigation_bar.short.community_timeline": "ローカル",
   "navigation_bar.short.getting_started": "スタート",
   "navigation_bar.short.home": "ホーム",

From 7529fbfa55f58de7c29659f999f1db950913d6df Mon Sep 17 00:00:00 2001
From: Genbu Hase <hasegenbu@gmail.com>
Date: Sun, 8 Apr 2018 16:56:25 +0900
Subject: [PATCH 170/200] [New] Implement a feature of quote

---
 app/javascript/mastodon/actions/compose.js    | 32 ++++++++-
 .../mastodon/components/status_action_bar.js  |  7 ++
 .../mastodon/components/status_content.js     | 17 +++++
 .../mastodon/containers/status_container.js   |  5 ++
 .../compose/components/compose_form.js        |  2 +
 .../compose/components/quote_indicator.js     | 67 +++++++++++++++++++
 .../containers/quote_indicator_container.js   | 24 +++++++
 .../features/status/components/action_bar.js  |  7 ++
 .../features/status/components/card.js        |  4 ++
 .../mastodon/features/status/index.js         |  6 ++
 .../mastodon/locales/defaultMessages.json     | 13 ++++
 app/javascript/mastodon/locales/en.json       |  2 +
 app/javascript/mastodon/locales/ja.json       |  2 +
 app/javascript/mastodon/reducers/compose.js   | 21 ++++++
 .../styles/mastodon/components.scss           | 28 ++++++--
 app/services/fetch_link_card_service.rb       |  4 +-
 16 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/quote_indicator.js
 create mode 100644 app/javascript/mastodon/features/compose/containers/quote_indicator_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 891403969..26e7bfab2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -20,6 +20,8 @@ export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
 export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
 export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
+export const COMPOSE_QUOTE           = 'COMPOSE_QUOTE';
+export const COMPOSE_QUOTE_CANCEL    = 'COMPOSE_QUOTE_CANCEL';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
@@ -100,6 +102,25 @@ export function cancelReplyCompose() {
   };
 };
 
+export function quoteCompose(status, router) {
+  return (dispatch, getState) => {
+    dispatch({
+      type: COMPOSE_QUOTE,
+      status: status,
+    });
+
+    if (!getState().getIn(['compose', 'mounted'])) {
+      router.push('/statuses/new');
+    }
+  };
+};
+
+export function cancelQuoteCompose() {
+  return {
+    type: COMPOSE_QUOTE_CANCEL,
+  };
+};
+
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
@@ -130,13 +151,22 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
+    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
+    if (quoteId) {
+      status = [
+        status,
+        "~~~~~~~~~~",
+        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
+      ].join("\n");
+    }
+
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 9981f2449..804e05717 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -24,6 +24,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
@@ -61,6 +62,7 @@ class StatusActionBar extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
+    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -129,6 +131,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onBookmark(this.props.status);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status, this.context.router.history);
   }
@@ -326,6 +332,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
 
         {shareButton}
 
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index bf21a9fd6..5cf7ca802 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -38,6 +38,8 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
+    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
+    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -46,6 +48,12 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
+      if (quote) {
+        if (link.href.match(QuoteUrlFormat)) {
+          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
+        }
+      }
+
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -125,6 +133,15 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  onQuoteClick = (statusId, e) => {
+    let statusUrl = `/statuses/${statusId}`;
+
+    if (this.context.router && e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(statusUrl);
+    }
+  }
+
   handleMouseDown = (e) => {
     this.startXY = [e.clientX, e.clientY];
   }
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 9abdec138..43acf597d 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -4,6 +4,7 @@ import Status from '../components/status';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../actions/compose';
@@ -99,6 +100,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuote (status, router) {
+    dispatch(quoteCompose(status, router));
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index ba2d20cc7..8f9a8a261 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -4,6 +4,7 @@ import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import QuoteIndicatorContainer from '../containers/quote_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import AutosuggestInput from '../../../components/autosuggest_input';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -209,6 +210,7 @@ class ComposeForm extends ImmutablePureComponent {
         <WarningContainer />
 
         <ReplyIndicatorContainer />
+        <QuoteIndicatorContainer />
 
         <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef}>
           <AutosuggestInput
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
new file mode 100644
index 000000000..515c79fca
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import Avatar from '../../../components/avatar';
+import IconButton from '../../../components/icon_button';
+import DisplayName from '../../../components/display_name';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { isRtl } from '../../../rtl';
+
+const messages = defineMessages({
+  cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+@injectIntl
+export default class QuoteIndicator extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    onCancel: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.onCancel();
+  }
+
+  handleAccountClick = (e) => {
+    if (e.button === 0) {
+      e.preventDefault();
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+    }
+  }
+
+  render () {
+    const { status, intl } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    const content = { __html: status.get('contentHtml') };
+    const style   = {
+      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
+    };
+
+    return (
+      <div className='quote-indicator'>
+        <div className='quote-indicator__header'>
+          <div className='quote-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} /></div>
+
+          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='quote-indicator__display-name'>
+            <div className='quote-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
+            <DisplayName account={status.get('account')} />
+          </a>
+        </div>
+
+        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
new file mode 100644
index 000000000..eb67f3939
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { cancelQuoteCompose } from '../../../actions/compose';
+import { makeGetStatus } from '../../../selectors';
+import QuoteIndicator from '../components/quote_indicator';
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = state => ({
+    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+  onCancel () {
+    dispatch(cancelQuoteCompose());
+  },
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(QuoteIndicator);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index ffa2510c0..1da4b52a4 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -18,6 +18,7 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -56,6 +57,7 @@ class ActionBar extends React.PureComponent {
     relationship: ImmutablePropTypes.map,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
+    onQuote: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -82,6 +84,10 @@ class ActionBar extends React.PureComponent {
     this.props.onReblog(this.props.status, e);
   }
 
+  handleQuoteClick = () => {
+    this.props.onQuote(this.props.status, this.context.router.history);
+  }
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -277,6 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 90f9ae7ae..317163648 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -60,6 +60,10 @@ const addAutoPlay = html => {
 
 export default class Card extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index df8362a1b..0cd25955b 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -22,6 +22,7 @@ import {
 } from '../../actions/interactions';
 import {
   replyCompose,
+  quoteCompose,
   mentionCompose,
   directCompose,
 } from '../../actions/compose';
@@ -259,6 +260,10 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+    handleQuoteClick = (status) => {
+    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  }
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -566,6 +571,7 @@ class Status extends ImmutablePureComponent {
                   onFavourite={this.handleFavouriteClick}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
+                  onQuote={this.handleQuoteClick}
                   onDelete={this.handleDeleteClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6d1db70ab..f0522d148 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -449,6 +449,10 @@
         "defaultMessage": "This post cannot be boosted",
         "id": "status.cannot_reblog"
       },
+      {
+        "defaultMessage": "Quote",
+        "id": "status.quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
@@ -1229,6 +1233,15 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Cancel",
+        "id": "quote_indicator.cancel"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/quote_indicator.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d67ad6862..7ddd4908b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Visible for all, but not in public timelines",
   "privacy.unlisted.short": "Unlisted",
+  "quote_indicator.cancel": "Cancel",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -401,6 +402,7 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
+  "status.quote": "Quote",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ae0e0f5da..d979a08fd 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -350,6 +350,7 @@
   "privacy.public.short": "公開",
   "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
   "privacy.unlisted.short": "未収載",
+  "quote_indicator.cancel": "キャンセル",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
@@ -401,6 +402,7 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
   "status.read_more": "もっと見る",
+  "status.quote": "引用ブースト",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4c0ba1c36..596e1a68b 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -5,6 +5,8 @@ import {
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
+  COMPOSE_QUOTE_CANCEL,
   COMPOSE_MENTION,
   COMPOSE_SUBMIT_REQUEST,
   COMPOSE_SUBMIT_SUCCESS,
@@ -59,6 +61,8 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  quote_from: null,
+  quote_from_uri: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -102,6 +106,7 @@ function clearAll(state) {
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
+    map.set('quote_from', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
     map.update('media_attachments', list => list.clear());
@@ -292,6 +297,8 @@ export default function compose(state = initialState, action) {
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -307,10 +314,24 @@ export default function compose(state = initialState, action) {
         map.set('spoiler_text', '');
       }
     });
+  case COMPOSE_QUOTE:
+    return state.withMutations(map => {
+      map.set('in_reply_to', null);
+      map.set('quote_from', action.status.get('id'));
+      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('text', '');
+      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
+      map.set('focusDate', new Date());
+      map.set('preselectDate', new Date());
+      map.set('idempotencyKey', uuid());
+    });
   case COMPOSE_REPLY_CANCEL:
+  case COMPOSE_QUOTE_CANCEL:
   case COMPOSE_RESET:
     return state.withMutations(map => {
       map.set('in_reply_to', null);
+      map.set('quote_from', null);
+      map.set('quote_from_uri', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 7ca027e81..00bdd4d33 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -761,26 +761,37 @@
 }
 
 .reply-indicator {
+  background: $ui-primary-color;
+}
+
+.quote-indicator {
+  background: $success-green;
+}
+
+.reply-indicator,
+.quote-indicator {
   border-radius: 4px;
   margin-bottom: 10px;
-  background: $ui-primary-color;
   padding: 10px;
   min-height: 23px;
   overflow-y: auto;
   flex: 0 2 auto;
 }
 
-.reply-indicator__header {
+.reply-indicator__header,
+.quote-indicator__header {
   margin-bottom: 5px;
   overflow: hidden;
 }
 
-.reply-indicator__cancel {
+.reply-indicator__cancel,
+.quote-indicator__cancel {
   float: right;
   line-height: 24px;
 }
 
-.reply-indicator__display-name {
+.reply-indicator__display-name,
+.quote-indicator__display-name {
   color: $inverted-text-color;
   display: block;
   max-width: 100%;
@@ -790,7 +801,8 @@
   text-decoration: none;
 }
 
-.reply-indicator__display-avatar {
+.reply-indicator__display-avatar,
+.quote-indicator__display-avatar {
   float: left;
   margin-right: 5px;
 }
@@ -804,7 +816,8 @@
 }
 
 .status__content,
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   position: relative;
   font-size: 15px;
   line-height: 20px;
@@ -1254,7 +1267,8 @@
   margin-left: 6px;
 }
 
-.reply-indicator__content {
+.reply-indicator__content,
+.quote-indicator__content {
   color: $inverted-text-color;
   font-size: 14px;
 
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 5732ce8ac..0243128e1 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-
+    
     @card.save_with_optional_image!
   end
 

From 199a09a8e675126520714d88ed60572dab7e6031 Mon Sep 17 00:00:00 2001
From: wakin <8th.mail@gmail.com>
Date: Sun, 29 Sep 2019 13:41:03 +0900
Subject: [PATCH 171/200] remake quote feature

---
 app/controllers/api/v1/statuses_controller.rb |   4 +-
 app/javascript/mastodon/actions/compose.js    |  18 +--
 .../mastodon/actions/importer/normalizer.js   |  26 ++++
 app/javascript/mastodon/actions/statuses.js   |  25 ++++
 .../mastodon/components/media_gallery.js      |   8 +-
 app/javascript/mastodon/components/status.js  | 132 +++++++++++++++++-
 .../mastodon/components/status_content.js     |  17 +--
 .../mastodon/containers/status_container.js   |  10 ++
 .../compose/components/quote_indicator.js     |  14 +-
 .../containers/quote_indicator_container.js   |   2 +-
 .../features/status/components/action_bar.js  |   2 +-
 .../features/status/components/card.js        |   9 +-
 .../status/components/detailed_status.js      |  84 +++++++++++
 .../mastodon/features/status/index.js         |  21 ++-
 .../mastodon/features/video/index.js          |   8 +-
 .../mastodon/locales/defaultMessages.json     |   4 +
 app/javascript/mastodon/locales/ja.json       |   3 +-
 app/javascript/mastodon/reducers/compose.js   |  31 +++-
 app/javascript/mastodon/reducers/search.js    |   2 +
 app/javascript/mastodon/reducers/statuses.js  |  10 ++
 app/javascript/packs/public.js                |  23 +++
 .../styles/mastodon/components.scss           |  64 +++++++++
 app/javascript/styles/mastodon/statuses.scss  |  22 +++
 app/lib/activitypub/activity/create.rb        |   8 ++
 app/lib/activitypub/adapter.rb                |   1 +
 app/lib/formatter.rb                          |  19 +++
 app/models/status.rb                          |   9 +-
 .../activitypub/note_serializer.rb            |   6 +-
 app/serializers/rest/status_serializer.rb     |   1 +
 app/services/fetch_link_card_service.rb       |   6 +-
 app/services/post_status_service.rb           |   1 +
 app/views/statuses/_detailed_status.html.haml |   3 +
 app/views/statuses/_quote_status.html.haml    |  35 +++++
 app/views/statuses/_simple_status.html.haml   |   3 +
 ...20180419235016_add_quote_id_to_statuses.rb |   5 +
 db/schema.rb                                  |   1 +
 lib/sanitize_ext/sanitize_config.rb           |   1 +
 37 files changed, 588 insertions(+), 50 deletions(-)
 create mode 100644 app/views/statuses/_quote_status.html.haml
 create mode 100644 db/migrate/20180419235016_add_quote_id_to_statuses.rb

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 106fc8224..1e23cf300 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -46,7 +46,8 @@ class Api::V1::StatusesController < Api::BaseController
                                          application: doorkeeper_token.application,
                                          poll: status_params[:poll],
                                          idempotency: request.headers['Idempotency-Key'],
-                                         with_rate_limit: true)
+                                         with_rate_limit: true,
+                                         quote_id: status_params[:quote_id].presence)
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
@@ -85,6 +86,7 @@ class Api::V1::StatusesController < Api::BaseController
       :spoiler_text,
       :visibility,
       :scheduled_at,
+      :quote_id,
       media_ids: [],
       poll: [
         :multiple,
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 26e7bfab2..fb4d26cf2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -102,16 +102,14 @@ export function cancelReplyCompose() {
   };
 };
 
-export function quoteCompose(status, router) {
+export function quoteCompose(status, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_QUOTE,
       status: status,
     });
 
-    if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
-    }
+    ensureComposeIsVisible(getState, routerHistory);
   };
 };
 
@@ -151,22 +149,13 @@ export function directCompose(account, routerHistory) {
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    let status = getState().getIn(['compose', 'text'], '');
+    const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
-    const quoteId = getState().getIn(['compose', 'quote_from'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
     }
 
-    if (quoteId) {
-      status = [
-        status,
-        "~~~~~~~~~~",
-        `[${quoteId}][${getState().getIn(['compose', 'quote_from_uri'], null)}]`
-      ].join("\n");
-    }
-
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/v1/statuses', {
@@ -177,6 +166,7 @@ export function submitCompose(routerHistory) {
       spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
       visibility: getState().getIn(['compose', 'privacy']),
       poll: getState().getIn(['compose', 'poll'], null),
+      quote_id: getState().getIn(['compose', 'quote_from'], null),
     }, {
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 5002292b9..d274a0226 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -62,6 +62,8 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
     normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
+    normalStatus.quote = normalOldStatus.get('quote');
+    normalStatus.quote_hidden = normalOldStatus.get('quote_hidden');
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the
     // status' contents, to avoid having a CW toggle with seemingly no effect.
@@ -78,6 +80,30 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
     normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+
+    if (status.quote && status.quote.id) {
+      const quote_spoilerText = status.quote.spoiler_text || '';
+      const quote_searchContent = [quote_spoilerText, status.quote.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+
+      const quote_emojiMap = makeEmojiMap(normalStatus.quote);
+
+      const quote_account_emojiMap = makeEmojiMap(status.quote.account);
+      const displayName = normalStatus.quote.account.display_name.length === 0 ? normalStatus.quote.account.username : normalStatus.quote.account.display_name;
+      normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
+      normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
+      let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
+      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
+      Array.from(docElem.querySelectorAll('p,br'), line => {
+        let parentNode = line.parentNode;
+        if (line.nextSibling) {
+          parentNode.insertBefore(document.createTextNode(' '), line.nextSibling);
+        }
+      });
+      let _contentHtml = docElem.textContent;
+      normalStatus.quote.contentHtml  = '<p>'+emojify(_contentHtml.substr(0, 150), quote_emojiMap) + (_contentHtml.substr(150) ? '...' : '')+'</p>';
+      normalStatus.quote.spoilerHtml  = emojify(escapeTextContentForBrowser(quote_spoilerText), quote_emojiMap);
+      normalStatus.quote_hidden       = expandSpoilers ? false : quote_spoilerText.length > 0 || normalStatus.quote.sensitive;
+    }
   }
 
   return normalStatus;
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3fc7c0702..0c520a796 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -30,6 +30,9 @@ export const STATUS_COLLAPSE = 'STATUS_COLLAPSE';
 
 export const REDRAFT = 'REDRAFT';
 
+export const QUOTE_REVEAL = 'QUOTE_REVEAL';
+export const QUOTE_HIDE   = 'QUOTE_HIDE';
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
@@ -272,3 +275,25 @@ export function toggleStatusCollapse(id, isCollapsed) {
     isCollapsed,
   };
 }
+
+export function hideQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_HIDE,
+    ids,
+  };
+};
+
+export function revealQuote(ids) {
+  if (!Array.isArray(ids)) {
+    ids = [ids];
+  }
+
+  return {
+    type: QUOTE_REVEAL,
+    ids,
+  };
+};
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2e7ce2e60..5c303a1a0 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -236,10 +236,12 @@ class MediaGallery extends React.PureComponent {
     visible: PropTypes.bool,
     autoplay: PropTypes.bool,
     onToggleVisibility: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
     standalone: false,
+    quote: false,
   };
 
   state = {
@@ -310,7 +312,7 @@ class MediaGallery extends React.PureComponent {
   }
 
   render () {
-    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay } = this.props;
+    const { media, intl, sensitive, height, defaultWidth, standalone, autoplay, quote } = this.props;
     const { visible } = this.state;
 
     const width = this.state.width || defaultWidth;
@@ -332,6 +334,10 @@ class MediaGallery extends React.PureComponent {
     const size     = media.take(4).size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
+    if (quote && style.height) {
+      style.height /= 2;
+    }
+
     if (standalone && this.isFullSizeEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />;
     } else {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f58..3019500ec 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -85,6 +85,7 @@ class Status extends ImmutablePureComponent {
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
     onToggleCollapsed: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -101,6 +102,7 @@ class Status extends ImmutablePureComponent {
       inUse: PropTypes.bool,
       available: PropTypes.bool,
     }),
+    contextType: PropTypes.string,
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -116,6 +118,7 @@ class Status extends ImmutablePureComponent {
 
   state = {
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     statusId: undefined,
   };
 
@@ -123,6 +126,7 @@ class Status extends ImmutablePureComponent {
     if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
       return {
         showMedia: defaultMediaVisibility(nextProps.status),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)),
         statusId: nextProps.status.get('id'),
       };
     } else {
@@ -134,6 +138,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleClick = () => {
     if (this.props.onClick) {
       this.props.onClick();
@@ -164,6 +172,15 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'quote', 'id'], status.getIn(['quote', 'id']))}`);
+  }
+
   handleAccountClick = (e) => {
     if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       const id = e.currentTarget.getAttribute('data-id');
@@ -180,6 +197,10 @@ class Status extends ImmutablePureComponent {
     this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this._properStatus());
+  };
+
   renderLoadingMediaGallery () {
     return <div className='media-gallery' style={{ height: '110px' }} />;
   }
@@ -279,11 +300,17 @@ class Status extends ImmutablePureComponent {
     this.node = c;
   }
 
+  _properQuoteStatus () {
+    const { status } = this.props;
+
+    return status.get('quote');
+  }
+
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText;
+    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -459,6 +486,106 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+        if (this.props.muted) {
+          quote_media = (
+            <AttachmentList
+              compact
+              media={quote_status.get('media_attachments')}
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+              {Component => (
+                <Component
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+                  peaks={[0]}
+                  height={70}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+              {Component => (
+                <Component
+                  preview={attachment.get('preview_url')}
+                  blurhash={attachment.get('blurhash')}
+                  src={attachment.get('url')}
+                  alt={attachment.get('description')}
+                  width={this.props.cachedMediaWidth}
+                  height={110}
+                  inline
+                  sensitive={quote_status.get('sensitive')}
+                  onOpenVideo={this.handleOpenVideo}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        } else {
+          quote_media = (
+            <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
+              {Component => (
+                <Component
+                  media={quote_status.get('media_attachments')}
+                  sensitive={quote_status.get('sensitive')}
+                  height={110}
+                  onOpenMedia={this.props.onOpenMedia}
+                  cacheWidth={this.props.cacheMediaWidth}
+                  defaultWidth={this.props.cachedMediaWidth}
+                  visible={this.state.showQuoteMedia}
+                  onToggleVisibility={this.handleToggleQuoteMediaVisibility}
+                  quote
+                />
+              )}
+            </Bundle>
+          );
+        }
+      }
+
+      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
+              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className='status__info'>
+              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
+                <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+                <DisplayName account={quote_status.get('account')} />
+              </a>
+            </div>
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    }
+
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
@@ -483,6 +610,7 @@ class Status extends ImmutablePureComponent {
 
             <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
 
+            {quote}
             {media}
 
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} {...other} />
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 5cf7ca802..70081f45f 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -24,6 +24,7 @@ export default class StatusContent extends React.PureComponent {
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
     onCollapsedToggle: PropTypes.func,
+    quote: PropTypes.bool,
   };
 
   state = {
@@ -38,8 +39,6 @@ export default class StatusContent extends React.PureComponent {
     }
 
     const links = node.querySelectorAll('a');
-    const QuoteUrlFormat = /(?:https?|ftp):\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+\/users\/[\w-_]+(\/statuses\/\w+)/;
-    const quote = node.innerText.match(new RegExp(`\\[(\\w+)\\]\\[${QuoteUrlFormat.source}\\]`));
 
     for (var i = 0; i < links.length; ++i) {
       let link = links[i];
@@ -48,12 +47,6 @@ export default class StatusContent extends React.PureComponent {
       }
       link.classList.add('status-link');
 
-      if (quote) {
-        if (link.href.match(QuoteUrlFormat)) {
-          link.addEventListener('click', this.onQuoteClick.bind(this, quote[1]), false);
-        }
-      }
-
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -185,7 +178,7 @@ export default class StatusContent extends React.PureComponent {
   }
 
   render () {
-    const { status } = this.props;
+    const { status, quote } = this.props;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
@@ -238,7 +231,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -248,7 +241,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -264,7 +257,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 43acf597d..8e0730625 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -25,6 +25,8 @@ import {
   hideStatus,
   revealStatus,
   toggleStatusCollapse,
+  hideQuote,
+  revealQuote,
 } from '../actions/statuses';
 import {
   unmuteAccount,
@@ -220,6 +222,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index 515c79fca..a48289de2 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -7,13 +7,14 @@ import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { isRtl } from '../../../rtl';
+import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
   cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
 });
 
-@injectIntl
-export default class QuoteIndicator extends ImmutablePureComponent {
+export default @injectIntl
+class QuoteIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -30,7 +31,7 @@ export default class QuoteIndicator extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
@@ -60,6 +61,13 @@ export default class QuoteIndicator extends ImmutablePureComponent {
         </div>
 
         <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+
+        {status.get('media_attachments').size > 0 && (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        )}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
index eb67f3939..8a3ad4959 100644
--- a/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/quote_indicator_container.js
@@ -7,7 +7,7 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
   const mapStateToProps = state => ({
-    status: getStatus(state, state.getIn(['compose', 'quote_from'])),
+    status: getStatus(state, { id: state.getIn(['compose', 'quote_from']) }),
   });
 
   return mapStateToProps;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 1da4b52a4..013dfed9a 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -283,7 +283,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={reblog_disabled} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 317163648..f4d95b4cb 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -72,6 +72,7 @@ export default class Card extends React.PureComponent {
     defaultWidth: PropTypes.number,
     cacheWidth: PropTypes.func,
     sensitive: PropTypes.bool,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -188,7 +189,7 @@ export default class Card extends React.PureComponent {
   }
 
   render () {
-    const { card, maxDescription, compact } = this.props;
+    const { card, maxDescription, compact, quote } = this.props;
     const { width, embedded, revealed } = this.state;
 
     if (card === null) {
@@ -201,7 +202,11 @@ export default class Card extends React.PureComponent {
     const className   = classnames('status-card', { horizontal, compact, interactive });
     const title       = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
     const ratio       = card.get('width') / card.get('height');
-    const height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+    let height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
+
+    if (quote && height) {
+      height /= 2;
+    }
 
     const description = (
       <div className='status-card__content'>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 043a749ed..ae90a622d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -46,6 +46,9 @@ class DetailedStatus extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     onToggleMediaVisibility: PropTypes.func,
+    onQuoteToggleHidden: PropTypes.func.isRequired,
+    showQuoteMedia: PropTypes.bool,
+    onToggleQuoteMediaVisibility: PropTypes.func,
   };
 
   state = {
@@ -102,6 +105,19 @@ class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
+  handleExpandedQuoteToggle = () => {
+    this.props.onQuoteToggleHidden(this.props.status);
+  }
+
+  handleQuoteClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { status } = this.props;
+    this.context.router.history.push(`/statuses/${status.getIn(['quote', 'id'])}`);
+  }
+
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
@@ -121,6 +137,73 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    let quote = null;
+    if (status.get('quote', null) !== null) {
+      let quote_status = status.get('quote');
+
+      let quote_media = null;
+      if (quote_status.get('media_attachments').size > 0) {
+
+        if (quote_status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Audio
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              height={60}
+              preload
+            />
+          );
+        } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {
+          const attachment = quote_status.getIn(['media_attachments', 0]);
+
+          quote_media = (
+            <Video
+              preview={attachment.get('preview_url')}
+              blurhash={attachment.get('blurhash')}
+              src={attachment.get('url')}
+              alt={attachment.get('description')}
+              width={300}
+              height={150}
+              inline
+              onOpenVideo={this.handleOpenVideo}
+              sensitive={quote_status.get('sensitive')}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        } else {
+          quote_media = (
+            <MediaGallery
+              standalone
+              sensitive={quote_status.get('sensitive')}
+              media={quote_status.get('media_attachments')}
+              height={300}
+              onOpenMedia={this.props.onOpenMedia}
+              visible={this.props.showQuoteMedia}
+              onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
+              quote
+            />
+          );
+        }
+      }
+
+      quote = (
+        <div className='quote-status'>
+          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+          </a>
+
+          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+          {quote_media}
+        </div>
+      );
+    }
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
@@ -247,6 +330,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
 
+          {quote}
           {media}
 
           <div className='detailed-status__meta'>
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 0cd25955b..d25905d8e 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -32,6 +32,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../actions/statuses';
 import {
   unblockAccount,
@@ -181,6 +183,7 @@ class Status extends ImmutablePureComponent {
   state = {
     fullscreen: false,
     showMedia: defaultMediaVisibility(this.props.status),
+    showQuoteMedia: defaultMediaVisibility(this.props.status ? this.props.status.get('quote', null) : null),
     loadedStatusId: undefined,
   };
 
@@ -199,7 +202,8 @@ class Status extends ImmutablePureComponent {
     }
 
     if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
-      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
+      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id'),
+        showQuoteMedia: defaultMediaVisibility(nextProps.status.get('quote', null)) });
     }
   }
 
@@ -207,6 +211,10 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   }
 
+  handleToggleQuoteMediaVisibility = () => {
+    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
+  }
+
   handleFavouriteClick = (status) => {
     if (status.get('favourited')) {
       this.props.dispatch(unfavourite(status));
@@ -328,6 +336,14 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleQuoteToggleHidden = (status) => {
+    if (status.get('quote_hidden')) {
+      this.props.dispatch(revealQuote(status.get('id')));
+    } else {
+      this.props.dispatch(hideQuote(status.get('id')));
+    }
+  }
+
   handleToggleAll = () => {
     const { status, ancestorsIds, descendantsIds } = this.props;
     const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
@@ -562,6 +578,9 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  onQuoteToggleHidden={this.handleQuoteToggleHidden}
+                  showQuoteMedia={this.state.showQuoteMedia}
+                  onToggleQuoteMediaVisibility={this.handleToggleQuoteMediaVisibility}
                 />
 
                 <ActionBar
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 70e3cd6e8..d1857fdd5 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -122,6 +122,7 @@ class Video extends React.PureComponent {
     volume: PropTypes.number,
     muted: PropTypes.bool,
     componetIndex: PropTypes.number,
+    quote: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -523,7 +524,7 @@ class Video extends React.PureComponent {
   }
 
   render () {
-    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash } = this.props;
+    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, editable, blurhash, quote } = this.props;
     const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
     const progress = Math.min((currentTime / duration) * 100, 100);
     const playerStyle = {};
@@ -537,6 +538,11 @@ class Video extends React.PureComponent {
       playerStyle.height = height;
     }
 
+    if (quote && height) {
+      height /= 2;
+      playerStyle.height = height;
+    }
+
     let preload;
 
     if (this.props.currentTime || fullscreen || dragging) {
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index f0522d148..7cbb11dc6 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -453,6 +453,10 @@
         "defaultMessage": "Quote",
         "id": "status.quote"
       },
+      {
+        "defaultMessage": "Unlisted quote",
+        "id": "status.unlisted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index d979a08fd..c39b92e04 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -402,7 +402,8 @@
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
   "status.read_more": "もっと見る",
-  "status.quote": "引用ブースト",
+  "status.quote": "引用",
+  "status.unlisted_quote": "未収載の引用",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 596e1a68b..d3ca96a3e 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -62,7 +62,7 @@ const initialState = ImmutableMap({
   preselectDate: null,
   in_reply_to: null,
   quote_from: null,
-  quote_from_uri: null,
+  quote_from_url: null,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -252,6 +252,17 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const rejectQuoteAltText = html => {
+  const fragment = domParser.parseFromString(html, 'text/html').documentElement;
+
+  const quote_inline = fragment.querySelector('span.quote-inline');
+  if (quote_inline) {
+    quote_inline.remove();
+  }
+
+  return fragment.innerHTML;
+};
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -298,7 +309,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
@@ -318,12 +329,20 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', action.status.get('id'));
-      map.set('quote_from_uri', action.status.get('uri'));
+      map.set('quote_from_url', action.status.get('url'));
       map.set('text', '');
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
       map.set('focusDate', new Date());
       map.set('preselectDate', new Date());
       map.set('idempotencyKey', uuid());
+
+      if (action.status.get('spoiler_text').length > 0) {
+        map.set('spoiler', true);
+        map.set('spoiler_text', action.status.get('spoiler_text'));
+      } else {
+        map.set('spoiler', false);
+        map.set('spoiler_text', '');
+      }
     });
   case COMPOSE_REPLY_CANCEL:
   case COMPOSE_QUOTE_CANCEL:
@@ -331,7 +350,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('in_reply_to', null);
       map.set('quote_from', null);
-      map.set('quote_from_uri', null);
+      map.set('quote_from_url', null);
       map.set('text', '');
       map.set('spoiler', false);
       map.set('spoiler_text', '');
@@ -420,8 +439,10 @@ export default function compose(state = initialState, action) {
       }));
   case REDRAFT:
     return state.withMutations(map => {
-      map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
+      map.set('text', action.raw_text || unescapeHTML(rejectQuoteAltText(expandMentions(action.status))));
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
+      map.set('quote_from', action.status.getIn(['quote', 'id']));
+      map.set('quote_from_url', action.status.getIn(['quote', 'url']));
       map.set('privacy', action.status.get('visibility'));
       map.set('media_attachments', action.status.get('media_attachments'));
       map.set('focusDate', new Date());
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 875b2d92b..f139a124b 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -9,6 +9,7 @@ import {
   COMPOSE_MENTION,
   COMPOSE_REPLY,
   COMPOSE_DIRECT,
+  COMPOSE_QUOTE,
 } from '../actions/compose';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
@@ -36,6 +37,7 @@ export default function search(state = initialState, action) {
   case COMPOSE_REPLY:
   case COMPOSE_MENTION:
   case COMPOSE_DIRECT:
+  case COMPOSE_QUOTE:
     return state.set('hidden', true);
   case SEARCH_FETCH_SUCCESS:
     return state.set('results', ImmutableMap({
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 53dec9585..7f656ba90 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -13,6 +13,8 @@ import {
   STATUS_REVEAL,
   STATUS_HIDE,
   STATUS_COLLAPSE,
+  QUOTE_REVEAL,
+  QUOTE_HIDE,
 } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
@@ -75,6 +77,14 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_COLLAPSE:
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
+  case QUOTE_REVEAL:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], false));
+    });
+  case QUOTE_HIDE:
+    return state.withMutations(map => {
+      action.ids.forEach(id => map.setIn([id, 'quote_hidden'], true));
+    });
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
   default:
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8c5c15b8f..f6acf706c 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,6 +291,29 @@ function main() {
       }
     });
   });
+
+  delegate(document, '.quote-status', 'click', ({ target }) => {
+    if (target.closest('.status__content__spoiler-link') ||
+      target.closest('.media-gallery') ||
+      target.closest('.video-player') ||
+      target.closest('.audio-player')) {
+      return false;
+    }
+
+    let url = target.closest('.quote-status').getAttribute('dataurl');
+    if (target.closest('.status__display-name')) {
+      url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.status-card')) {
+      url = target.closest('.status-card').getAttribute('href');
+    }
+
+    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
+      window.location.href = url;
+    } else {
+      window.open(url, 'blank');
+    }
+    return false;
+  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 00bdd4d33..8e965d080 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1009,6 +1009,70 @@
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 }
 
+.quote-inline {
+  display: none;
+}
+
+.quote-status {
+  border: solid 1px $ui-base-lighter-color;
+  border-radius: 4px;
+  padding: 5px;
+  margin-top: 8px;
+  position: relative;
+
+  & > .unlisted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+
+    & > button {
+      color: $dark-text-color;
+      font-size: 100%;
+      background-color: transparent;
+      border: 0;
+      cursor: pointer;
+      outline: none;
+      padding: 0;
+      appearance: none;
+    }
+  }
+
+  .status__avatar,
+  .detailed-status__display-avatar {
+    height: 18px;
+    width: 18px;
+    position: absolute;
+    top: 5px !important;
+    left: 5px !important;
+    cursor: pointer;
+
+    & > div {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  .display-name__account {
+    color: $ui-base-lighter-color;
+  }
+
+  .display-name {
+    padding-left: 20px;
+  }
+
+  .detailed-status__display-name {
+    margin-bottom: 0px;
+
+    strong,
+    span {
+      display: inline;
+    }
+  }
+}
+
+.muted .quote-status .display-name {
+  color: $ui-base-lighter-color;
+}
+
 .status__prepend-icon-wrapper {
   left: -26px;
   position: absolute;
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 078714325..ad23efae8 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -63,6 +63,28 @@
       }
     }
 
+    .status.quote-status {
+      border: solid 1px $ui-base-lighter-color;
+      border-radius: 4px;
+      padding: 5px;
+      margin-top: 15px;
+      cursor: pointer;
+      width: 100%;
+
+      .status__avatar {
+        height: 18px;
+        width: 18px;
+        position: absolute;
+        top: 5px;
+        left: 5px;
+
+        & > div {
+          width: 18px;
+          height: 18px;
+        }
+      }
+    }
+
     @media screen and (max-width: 740px) {
       .detailed-status,
       .status,
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 9a2960507..8c937cd1f 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,6 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
+        quote: quote_from_url(@object['quoteUrl']),
       }
     end
   end
@@ -500,4 +501,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     poll.reload
     retry
   end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  end
 end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 2d6b87659..e6f8e4d37 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -24,6 +24,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+    quoteUrl: { 'quoteUrl' => 'as:quoteUrl' },
   }.freeze
 
   def self.default_key_transform
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index fd6537526..d94e01c07 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -38,11 +38,24 @@ class Formatter
     html = encode_and_link_urls(html, linkable_accounts)
     html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
+    html = quotify(html, status) if status.quote? && !options[:escape_quotify]
     html = html.delete("\n")
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
+  def format_in_quote(status, **options)
+    html = format(status)
+    return '' if html.empty?
+    doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
+    doc.search('span.invisible').remove
+    html = doc.css('body')[0].inner_html
+    html.sub!(/^<p>(.+)<\/p>$/, '\1')
+    html = Sanitize.clean(html).delete("\n").truncate(150)
+    html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
+    html.html_safe
+  end
+
   def reformat(html)
     sanitize(html, Sanitize::Config::MASTODON_STRICT)
   rescue ArgumentError
@@ -191,6 +204,12 @@ class Formatter
   end
   # rubocop:enable Metrics/BlockNesting
 
+  def quotify(html, status)
+    url = ActivityPub::TagManager.instance.url_for(status.quote)
+    link = encode_and_link_urls(url)
+    html.sub(/(<[^>]+>)\z/, "<span class=\"quote-inline\"><br/>QT: #{link}</span>\\1")
+  end
+
   def rewrite(text, entities)
     text = text.to_s
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 847921ac2..e06048679 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -23,6 +23,7 @@
 #  in_reply_to_account_id :bigint(8)
 #  poll_id                :bigint(8)
 #  deleted_at             :datetime
+#  quote_id               :bigint(8)
 #
 
 class Status < ApplicationRecord
@@ -55,6 +56,7 @@ class Status < ApplicationRecord
 
   belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
   belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
+  belongs_to :quote, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quoted, optional: true
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
@@ -63,6 +65,7 @@ class Status < ApplicationRecord
   has_many :mentions, dependent: :destroy, inverse_of: :status
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status
   has_many :media_attachments, dependent: :nullify
+  has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify
 
   has_and_belongs_to_many :tags
   has_and_belongs_to_many :preview_cards
@@ -169,6 +172,10 @@ class Status < ApplicationRecord
     !reblog_of_id.nil?
   end
 
+  def quote?
+    !quote_id.nil? && quote
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end
@@ -229,7 +236,7 @@ class Status < ApplicationRecord
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
   end
 
   def replies_count
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 7c52b634d..c26d01caf 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,7 +7,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :quote_url
 
   attribute :content
   attribute :content_map, if: :language?
@@ -125,6 +125,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
   end
 
+  def quote_url
+    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+  end
+
   def local?
     object.account.local?
   end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bb6df90b7..67449716e 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -18,6 +18,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
+  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 0243128e1..0e41240af 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -67,7 +67,7 @@ class FetchLinkCardService < BaseService
       urls = @status.text.scan(URL_PATTERN).map { |array| Addressable::URI.parse(array[1]).normalize }
     else
       html  = Nokogiri::HTML(@status.text)
-      links = html.css('a')
+      links = html.css(':not(.quote-inline) > a')
       urls  = links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
     end
 
@@ -76,7 +76,7 @@ class FetchLinkCardService < BaseService
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || (TagManager.instance.local_url?(uri.to_s) && uri.to_s !~ %r(/users/[\w_-]+/statuses/\w+)) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
   # rubocop:disable Naming/MethodParameterName
@@ -132,7 +132,7 @@ class FetchLinkCardService < BaseService
       # Most providers rely on <script> tags, which is a no-no
       return false
     end
-    
+
     @card.save_with_optional_image!
   end
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 0a383d6a3..854e1d874 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -164,6 +164,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
+      quote_id: @options[:quote_id],
     }.compact
   end
 
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index daf164949..25231d440 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -25,6 +25,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 670, height: 380, detailed: true)
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
new file mode 100644
index 000000000..de5fb6762
--- /dev/null
+++ b/app/views/statuses/_quote_status.html.haml
@@ -0,0 +1,35 @@
+.status.quote-status{ dataurl:  ActivityPub::TagManager.instance.url_for(status) }
+  = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+    .status__avatar
+      %div
+        = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar'
+    %span.display-name
+      %bdi
+        %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true)
+      &nbsp;
+      %span.display-name__account
+        = acct(status.account)
+        = fa_icon('lock') if status.account.locked?
+
+  .status__content.emojify<
+    - if status.spoiler_text?
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+        %button.status__content__spoiler-link= t('statuses.show_more')
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+      = Formatter.instance.format_in_quote(status, custom_emojify: true)
+  
+  - if !status.media_attachments.empty?
+    - if status.media_attachments.first.video?
+      - video = status.media_attachments.first
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - elsif status.media_attachments.first.audio?
+      - audio = status.media_attachments.first
+      = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+    - else
+      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do
+        = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 728e6b9b0..d134b1008 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -34,6 +34,9 @@
       - if status.preloadable_poll
         = render_poll_component(status)
 
+  - if status.quote?
+    = render partial: "statuses/quote_status", locals: {status: status.quote}
+
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       = render_video_component(status, width: 610, height: 343)
diff --git a/db/migrate/20180419235016_add_quote_id_to_statuses.rb b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
new file mode 100644
index 000000000..d7550b248
--- /dev/null
+++ b/db/migrate/20180419235016_add_quote_id_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddQuoteIdToStatuses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :statuses, :quote_id, :bigint, null: true, default: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 583bdf317..7a47e6711 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -815,6 +815,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.bigint "in_reply_to_account_id"
     t.bigint "poll_id"
     t.datetime "deleted_at"
+    t.bigint "quote_id"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index a2e1d9d01..de6b132ee 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -31,6 +31,7 @@ class Sanitize
         next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
         next true if /^(mention|hashtag)$/.match?(e) # semantic classes
         next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
+        next true if /^quote-inline$/.match?(e) # quote inline classes
       end
 
       node['class'] = class_list.join(' ')

From 352313323825a4d8b6bb970668be8bda95c82421 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 21 Feb 2020 21:49:06 +0900
Subject: [PATCH 172/200] Fix quote nesting at once, add quote_id

---
 app/serializers/rest/status_serializer.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 67449716e..12c386600 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -15,10 +15,11 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attribute :content, unless: :source_requested?
   attribute :text, if: :source_requested?
 
+  attribute :quote_id, if: -> { object.quote? }
+
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
-  belongs_to :quote, serializer: REST::StatusSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
@@ -40,6 +41,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.in_reply_to_account_id&.to_s
   end
 
+  def quote_id
+    object.quote_id.to_s
+  end
+
   def current_user?
     !current_user.nil?
   end
@@ -168,3 +173,13 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 end
+
+class REST::NestedQuoteSerializer < REST::StatusSerializer
+  attribute :quote do
+    nil
+  end
+end
+
+class REST::StatusSerializer < ActiveModel::Serializer
+  belongs_to :quote, serializer: REST::NestedQuoteSerializer
+end

From 50f7bcd05a29155c6cb22f0d4d2cecdd68a9831f Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 11:36:40 +0900
Subject: [PATCH 173/200] Fix boost target to be quoted if boosted

---
 app/services/post_status_service.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 854e1d874..accfcec21 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -26,10 +26,12 @@ class PostStatusService < BaseService
     @options     = options
     @text        = @options[:text] || ''
     @in_reply_to = @options[:thread]
+    @quote_id    = @options[:quote_id]
 
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
+    preprocess_quote!
     preprocess_attributes!
 
     if scheduled?
@@ -58,6 +60,13 @@ class PostStatusService < BaseService
     raise ActiveRecord::RecordInvalid
   end
 
+  def preprocess_quote!
+    if @quote_id.present?
+      quote = Status.find(@quote_id)
+      @quote_id = quote.reblog_of_id.to_s if quote.reblog?
+    end
+  end
+
   def process_status!
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
@@ -164,7 +173,7 @@ class PostStatusService < BaseService
       language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
-      quote_id: @options[:quote_id],
+      quote_id: @quote_id,
     }.compact
   end
 

From 17414d5f055194f362a4d559cd7aca67f8bfa6f4 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 12:53:28 +0900
Subject: [PATCH 174/200] Add feature_quote to instance API

---
 app/serializers/rest/instance_serializer.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d39092b56..6683ac48f 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,7 +5,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
   attributes :uri, :title, :short_description, :description, :email,
              :version, :urls, :stats, :thumbnail,
-             :languages, :registrations, :approval_required, :invites_enabled
+             :languages, :registrations, :approval_required, :invites_enabled,
+             :feature_quote
 
   has_one :contact_account, serializer: REST::AccountSerializer
 
@@ -69,6 +70,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     Setting.min_invite_role == 'user'
   end
 
+  def feature_quote
+    true
+  end
+
   private
 
   def instance_presenter

From 0d9dd4f83d42d1a30702f7831acb01dfbc092380 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 14:19:46 +0900
Subject: [PATCH 175/200] Add confirmation of overwriting of input content when
 quoting

---
 .../mastodon/containers/status_container.js      | 16 +++++++++++++++-
 app/javascript/mastodon/features/status/index.js | 15 +++++++++++++--
 app/javascript/mastodon/locales/en.json          |  2 ++
 app/javascript/mastodon/locales/ja.json          |  2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 8e0730625..ce055cd96 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -53,6 +53,8 @@ const messages = defineMessages({
   redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -103,7 +105,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onQuote (status, router) {
-    dispatch(quoteCompose(status, router));
+    dispatch((_, getState) => {
+      let state = getState();
+
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.quoteMessage),
+          confirm: intl.formatMessage(messages.quoteConfirm),
+          onConfirm: () => dispatch(quoteCompose(status, router)),
+        }));
+      } else {
+        dispatch(quoteCompose(status, router));
+      }
+    });
   },
 
   onFavourite (status) {
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index d25905d8e..ce0a26cb3 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -71,6 +71,8 @@ const messages = defineMessages({
   detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
 
@@ -268,8 +270,17 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-    handleQuoteClick = (status) => {
-    this.props.dispatch(quoteCompose(status, this.context.router.history));
+  handleQuoteClick = (status) => {
+    let { askReplyConfirmation, dispatch, intl } = this.props;
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: () => dispatch(quoteCompose(status, this.context.router.history)),
+      }));
+    } else {
+      dispatch(quoteCompose(status, this.context.router.history));
+    }
   }
 
   handleDeleteClick = (status, history, withRedraft = false) => {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7ddd4908b..69668a201 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.quote.confirm": "Quote",
+  "confirmations.quote.message": "Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c39b92e04..79512b6ef 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -120,6 +120,8 @@
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
   "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
+  "confirmations.quote.confirm": "引用",
+  "confirmations.quote.message": "今引用すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "本当にこの投稿を削除して下書きに戻しますか？ この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。",
   "confirmations.reply.confirm": "返信",

From 73f197a4e955d8d4a7c82c17af87127a1f091bfc Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 28 Feb 2020 07:45:54 +0900
Subject: [PATCH 176/200] Fix to reject status quotations other than public and
 unlisted

---
 app/models/status.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/status.rb b/app/models/status.rb
index e06048679..6e088570d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -80,6 +80,7 @@ class Status < ApplicationRecord
   validates_with DisallowedHashtagsValidator
   validates :reblog, uniqueness: { scope: :account }, if: :reblog?
   validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog?
+  validates :quote_visibility, inclusion: { in: %w(public unlisted) }, if: :quote?
 
   accepts_nested_attributes_for :poll
 
@@ -176,6 +177,10 @@ class Status < ApplicationRecord
     !quote_id.nil? && quote
   end
 
+  def quote_visibility
+    quote&.visibility
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end

From 903db2a4577a4b25de4f8d2c4da8263907f0d1d8 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 1 Mar 2020 19:31:59 +0900
Subject: [PATCH 177/200] Add index to statuses quote_id

---
 .../20200301102028_add_index_to_statuses_quote_id.rb     | 9 +++++++++
 db/schema.rb                                             | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 db/migrate/20200301102028_add_index_to_statuses_quote_id.rb

diff --git a/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
new file mode 100644
index 000000000..45293db98
--- /dev/null
+++ b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexToStatusesQuoteId < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :quote_id, algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7a47e6711..fff9e49ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -821,6 +821,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["quote_id"], name: "index_statuses_on_quote_id"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
     t.index ["uri"], name: "index_statuses_on_uri", unique: true
   end

From 7bc410d09d301d6b95fe37a17439eb764cc28fd3 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 24 Feb 2020 23:56:04 +0900
Subject: [PATCH 178/200] Change not to delete the element specified in
 invisible

---
 app/javascript/mastodon/actions/importer/normalizer.js | 1 -
 app/lib/formatter.rb                                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index d274a0226..1b9d781a7 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -92,7 +92,6 @@ export function normalizeStatus(status, normalOldStatus) {
       normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
       normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
       let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
-      Array.from(docElem.querySelectorAll('span.invisible'), span => span.remove());
       Array.from(docElem.querySelectorAll('p,br'), line => {
         let parentNode = line.parentNode;
         if (line.nextSibling) {
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d94e01c07..85f1de9d6 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -48,7 +48,6 @@ class Formatter
     html = format(status)
     return '' if html.empty?
     doc = Nokogiri::HTML.parse(html, nil, 'utf-8')
-    doc.search('span.invisible').remove
     html = doc.css('body')[0].inner_html
     html.sub!(/^<p>(.+)<\/p>$/, '\1')
     html = Sanitize.clean(html).delete("\n").truncate(150)

From 8ee14ca4f32c38291c8f22fbc866c095fa36dbf6 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 20:20:08 +0900
Subject: [PATCH 179/200] Compatible with Misskey quote

---
 app/lib/activitypub/activity/create.rb         | 12 ++++++++++--
 app/lib/activitypub/case_transform.rb          |  2 ++
 app/serializers/activitypub/note_serializer.rb | 13 +++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 8c937cd1f..2edeae0d3 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -112,7 +112,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
         poll: process_poll,
-        quote: quote_from_url(@object['quoteUrl']),
+        quote: quote,
       }
     end
   end
@@ -383,7 +383,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def text_from_content
     return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || object_uri].join(' ')) if converted_object_type?
 
-    if @object['content'].present?
+    if @object['quoteUrl'].blank? && @object['_misskey_quote'].present?
+      Formatter.instance.linkify(@object['_misskey_content'])
+    elsif @object['content'].present?
       @object['content']
     elsif content_language_map?
       @object['contentMap'].values.first
@@ -502,10 +504,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     retry
   end
 
+  def quote
+    @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
     quote = ResolveURLService.new.call(url)
     status_from_uri(quote.uri) if quote
+  rescue
+    nil
   end
 end
diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb
index 7f716f862..ef0c6e1f9 100644
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@@ -14,6 +14,8 @@ module ActivityPub::CaseTransform
       when String
         camel_lower_cache[value] ||= if value.start_with?('_:')
                                        '_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower)
+                                     elsif value.start_with?('_')
+                                       value
                                      else
                                        value.underscore.camelize(:lower)
                                      end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index c26d01caf..a9e15e6f8 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -7,8 +7,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation, :quote_url
+             :conversation
 
+  attribute :quote_url, if: -> { object.quote? }
+  attribute :misskey_quote, key: :_misskey_quote, if: -> { object.quote? }
+  attribute :misskey_content, key: :_misskey_content, if: -> { object.quote? }
   attribute :content
   attribute :content_map, if: :language?
 
@@ -126,7 +129,13 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def quote_url
-    object.quote? ? ActivityPub::TagManager.instance.uri_for(object.quote) : nil
+    ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote?
+  end
+
+  alias misskey_quote quote_url
+
+  def misskey_content
+    object.text if object.quote?
   end
 
   def local?

From 1ee56bbb355b158ad54f5d5a82019d8cba477985 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 29 Nov 2019 12:10:59 +0900
Subject: [PATCH 180/200] Apply quote by parsing post body

---
 app/lib/activitypub/activity/create.rb |  8 ++++++++
 app/services/post_status_service.rb    | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2edeae0d3..dbd191103 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -73,6 +73,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @mentions = []
     @params   = {}
 
+    process_quote
     process_status_params
     process_tags
     process_audience
@@ -508,6 +509,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @quote ||= quote_from_url(@object['quoteUrl'] || @object['_misskey_quote'])
   end
 
+  def process_quote
+    if quote.nil? && md = @object['content']&.match(/QT:\s*\[<a href=\"([^\"]+).*?\]/)
+      @quote = quote_from_url(md[1])
+      @object['content'] = @object['content'].sub(/QT:\s*\[.*?\]/, '<span class="quote-inline"><br/>\1</span>')
+    end
+  end
+
   def quote_from_url(url)
     return nil if url.nil?
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index accfcec21..f594b02a2 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -31,8 +31,8 @@ class PostStatusService < BaseService
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
-    preprocess_quote!
     preprocess_attributes!
+    preprocess_quote!
 
     if scheduled?
       schedule_status!
@@ -49,6 +49,19 @@ class PostStatusService < BaseService
 
   private
 
+  def status_from_uri(uri)
+    ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+  end
+
+  def quote_from_url(url)
+    return nil if url.nil?
+
+    quote = ResolveURLService.new.call(url)
+    status_from_uri(quote.uri) if quote
+  rescue
+    nil
+  end
+
   def preprocess_attributes!
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@@ -56,6 +69,10 @@ class PostStatusService < BaseService
     @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+    if @quote_id.nil? && md = @text.match(/QT:\s*\[\s*(https:\/\/.+?)\s*\]/)
+      @quote_id = quote_from_url(md[1])&.id
+      @text.sub!(/QT:\s*\[.*?\]/, '')
+    end
   rescue ArgumentError
     raise ActiveRecord::RecordInvalid
   end

From bcd114ed55752b3678c2cff0dae2d314089ba910 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 12 Nov 2019 14:09:06 +0900
Subject: [PATCH 181/200] Add "Show poll" link to quoted poll

---
 app/javascript/mastodon/components/poll.js      |  5 ++++-
 .../mastodon/components/status_content.js       | 17 ++++++++++++++---
 app/javascript/mastodon/locales/en.json         |  1 +
 app/javascript/mastodon/locales/ja.json         |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 477f56e13..1126b0121 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -39,6 +39,9 @@ class Poll extends ImmutablePureComponent {
 
   static getDerivedStateFromProps (props, state) {
     const { poll, intl } = props;
+    if (!poll) {
+      return null;
+    }
     const expires_at = poll.get('expires_at');
     const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
     return (expired === state.expired) ? null : { expired };
@@ -59,7 +62,7 @@ class Poll extends ImmutablePureComponent {
   _setupTimer () {
     const { poll, intl } = this.props;
     clearTimeout(this._timer);
-    if (!this.state.expired) {
+    if (!this.state.expired && !!poll) {
       const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 70081f45f..71fbbd7c5 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -183,6 +183,7 @@ export default class StatusContent extends React.PureComponent {
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+    const renderShowPoll = !!status.get('poll');
 
     const content = { __html: status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
@@ -204,6 +205,16 @@ export default class StatusContent extends React.PureComponent {
       </button>
     );
 
+    const showPollButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick} key='show-poll'>
+        <FormattedMessage id='status.show_poll' defaultMessage='Show poll' /><Icon id='angle-right' fixedWidth />
+      </button>
+    );
+
+    const pollContainer = (
+      <PollContainer pollId={status.get('poll')} />
+    );
+
     if (status.get('spoiler_text').length > 0) {
       let mentionsPlaceholder = '';
 
@@ -231,7 +242,7 @@ export default class StatusContent extends React.PureComponent {
 
           <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
 
-          {!quote && !hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {!hidden && renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
@@ -241,7 +252,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>,
@@ -257,7 +268,7 @@ export default class StatusContent extends React.PureComponent {
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
 
-          {!quote && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+          {renderShowPoll && quote ? showPollButton : pollContainer}
 
           {renderViewThread && showThreadButton}
         </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 69668a201..6e69d7c4d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -420,6 +420,7 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
+  "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 79512b6ef..598f8d33a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -421,6 +421,7 @@
   "status.show_less_all": "全て隠す",
   "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
+  "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
   "status.unmute_conversation": "会話のミュートを解除",

From 9149fc0b18f3bb725b61ca4e06cc28b4b55046cf Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 4 Jun 2020 05:28:05 +0900
Subject: [PATCH 182/200] Fix an avatar icon size of the status quoted on the
 public page

---
 app/javascript/styles/mastodon/statuses.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ad23efae8..ab91b3123 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -78,7 +78,7 @@
         top: 5px;
         left: 5px;
 
-        & > div {
+        & img {
           width: 18px;
           height: 18px;
         }

From 4ffb66bfeff41e8f423a1fa371f98e9a39ba9a4f Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 26 Jun 2020 07:26:25 +0900
Subject: [PATCH 183/200] Fix tooltip 'cannot be quoted'

---
 app/javascript/mastodon/components/status_action_bar.js       | 4 ++--
 .../mastodon/features/status/components/action_bar.js         | 3 ++-
 app/javascript/mastodon/locales/en.json                       | 1 +
 app/javascript/mastodon/locales/ja.json                       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 804e05717..a6447b8ab 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -23,6 +23,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -332,8 +333,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
-
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {shareButton}
 
         <div className='status__action-bar-dropdown'>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 013dfed9a..61833f37b 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -17,6 +17,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
@@ -283,7 +284,7 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
+        <div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
         {shareButton}
         <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6e69d7c4d..e4d97fc34 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -386,6 +386,7 @@
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
+  "status.cannot_quote": "This post cannot be quoted",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 598f8d33a..53597ac85 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -386,6 +386,7 @@
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
   "status.cancel_reblog_private": "ブースト解除",
+  "status.cannot_quote": "この投稿は引用できません",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.copy": "投稿へのリンクをコピー",
   "status.delete": "削除",

From 191bc96cca3d6803876f98c6f2a3f25fb515195b Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 25 Jul 2020 19:16:43 +0900
Subject: [PATCH 184/200] Fix quoted audio

---
 app/javascript/mastodon/components/status.js              | 8 ++++++--
 .../features/status/components/detailed_status.js         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3019500ec..937b618c1 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -508,10 +508,14 @@ class Status extends ImmutablePureComponent {
                 <Component
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
+                  poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+                  backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+                  foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+                  accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
                   duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-                  peaks={[0]}
+                  width={this.props.cachedMediaWidth}
                   height={70}
-                  quote
+                  cacheWidth={this.props.cacheMediaWidth}
                 />
               )}
             </Bundle>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index ae90a622d..242b4aee9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -152,8 +152,11 @@ class DetailedStatus extends ImmutablePureComponent {
               src={attachment.get('url')}
               alt={attachment.get('description')}
               duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+              poster={attachment.get('preview_url') || quote_status.getIn(['account', 'avatar_static'])}
+              backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+              foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+              accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
               height={60}
-              preload
             />
           );
         } else if (quote_status.getIn(['media_attachments', 0, 'type']) === 'video') {

From 0d35be5e2b0b24ded5473b4f00598330efd935b6 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Wed, 7 Oct 2020 22:28:02 +0900
Subject: [PATCH 185/200] Fix PictureInPicture to work in quotes

---
 app/javascript/mastodon/components/status.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 937b618c1..39ca49693 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -381,10 +381,10 @@ class Status extends ImmutablePureComponent {
       status  = status.get('reblog');
     }
 
-    if (pictureInPicture.get('inUse')) {
-      media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
-    } else if (status.get('media_attachments').size > 0) {
-      if (this.props.muted) {
+    if (status.get('media_attachments').size > 0) {
+      if (pictureInPicture.get('inUse')) {
+        media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+      } else if (this.props.muted) {
         media = (
           <AttachmentList
             compact
@@ -492,7 +492,9 @@ class Status extends ImmutablePureComponent {
 
       let quote_media = null;
       if (quote_status.get('media_attachments').size > 0) {
-        if (this.props.muted) {
+        if (pictureInPicture.get('inUse')) {
+          quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
+        } else if (this.props.muted) {
           quote_media = (
             <AttachmentList
               compact
@@ -516,7 +518,8 @@ class Status extends ImmutablePureComponent {
                   width={this.props.cachedMediaWidth}
                   height={70}
                   cacheWidth={this.props.cacheMediaWidth}
-                />
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                  />
               )}
             </Bundle>
           );
@@ -537,6 +540,7 @@ class Status extends ImmutablePureComponent {
                   sensitive={quote_status.get('sensitive')}
                   onOpenVideo={this.handleOpenVideo}
                   cacheWidth={this.props.cacheMediaWidth}
+                  deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
                   onToggleVisibility={this.handleToggleQuoteMediaVisibility}
                   quote

From 86de2ccfa407c9aa88902db1d693bf8c6343c22c Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 6 Jun 2020 12:59:45 +0900
Subject: [PATCH 186/200] Fix to hide mute and blocked quotes

---
 .../api/v1/accounts/statuses_controller.rb    |  5 +-
 .../api/v1/bookmarks_controller.rb            |  5 +-
 .../api/v1/favourites_controller.rb           |  5 +-
 app/controllers/api/v1/statuses_controller.rb |  3 +-
 .../api/v1/timelines/home_controller.rb       |  4 +-
 .../api/v1/timelines/list_controller.rb       |  5 +-
 .../api/v1/timelines/public_controller.rb     |  6 +-
 .../api/v1/timelines/tag_controller.rb        |  5 +-
 app/javascript/mastodon/actions/bookmarks.js  |  4 +
 app/javascript/mastodon/actions/favourites.js |  4 +
 .../mastodon/actions/importer/index.js        |  4 +
 .../mastodon/actions/notifications.js         |  2 +-
 app/javascript/mastodon/actions/timelines.js  |  4 +
 app/javascript/mastodon/components/status.js  | 56 ++++++++++--
 .../status/components/detailed_status.js      | 65 +++++++++++--
 .../mastodon/locales/defaultMessages.json     |  4 +
 app/javascript/mastodon/locales/en.json       |  4 +-
 app/javascript/mastodon/locales/ja.json       |  5 +-
 app/javascript/mastodon/selectors/index.js    | 30 +++++-
 app/javascript/mastodon/utils/uniq.js         |  3 +
 .../styles/mastodon/components.scss           | 91 ++++---------------
 app/serializers/rest/status_serializer.rb     | 10 ++
 22 files changed, 219 insertions(+), 105 deletions(-)
 create mode 100644 app/javascript/mastodon/utils/uniq.js

diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 92ccb8061..f301666db 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -7,8 +7,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index aa3fb88f0..f666a1d8d 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::BookmarksController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 21836bc17..651a057d5 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -6,8 +6,9 @@ class Api::V1::FavouritesController < Api::BaseController
   after_action :insert_pagination_headers
 
   def index
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 1e23cf300..d8f4db42f 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -30,8 +30,9 @@ class Api::V1::StatusesController < Api::BaseController
 
     @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
     statuses = [@status] + @context.ancestors + @context.descendants
+    accountIds = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
-    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
+    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   def create
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ae6dbcb8b..c07e1a820 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -6,11 +6,13 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
 
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id),
            status: account_home_feed.regenerating? ? 206 : 200
   end
 
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index a15eae468..bc13ed5ec 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -9,9 +9,12 @@ class Api::V1::Timelines::ListController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
-           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id),
+           account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index d253b744f..1a778012b 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -5,8 +5,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 64a1db58d..c7afd4580 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -5,8 +5,9 @@ class Api::V1::Timelines::TagController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    @statuses  = load_statuses
+    accountIds = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), account_relationships: AccountRelationshipsPresenter.new(accountIds, current_user&.account_id)
   end
 
   private
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 544ed2ff2..b3e0a2ab4 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
 export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchBookmarkedStatuses() {
     api(getState).get('/api/v1/bookmarks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchBookmarkedStatusesFail(error));
@@ -61,6 +64,7 @@ export function expandBookmarkedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandBookmarkedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 9448b1efe..9b28ac4c4 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -1,5 +1,7 @@
+import { fetchRelationships } from './accounts';
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { uniq } from '../utils/uniq';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@@ -20,6 +22,7 @@ export function fetchFavouritedStatuses() {
     api(getState).get('/api/v1/favourites').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(fetchFavouritedStatusesFail(error));
@@ -64,6 +67,7 @@ export function expandFavouritedStatuses() {
     api(getState).get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id))));
       dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
       dispatch(expandFavouritedStatusesFail(error));
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index f4372fb31..35032fc70 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -70,6 +70,10 @@ export function importFetchedStatuses(statuses) {
         processStatus(status.reblog);
       }
 
+      if (status.quote && status.quote.id) {
+        processStatus(status.quote);
+      }
+
       if (status.poll && status.poll.id) {
         pushUnique(polls, normalizePoll(status.poll));
       }
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 3464ac995..22f1e0cbb 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -46,7 +46,7 @@ defineMessages({
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
-  const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id);
+  const accountIds = notifications.map(item => item.account.id);
 
   if (accountIds.length > 0) {
     dispatch(fetchRelationships(accountIds));
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 31ae09e4a..d82bf1d0d 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,9 +1,11 @@
+import { fetchRelationships } from './accounts';
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { submitMarkers } from './markers';
 import api, { getLinks } from 'mastodon/api';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import compareId from 'mastodon/compare_id';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
+import { uniq } from '../utils/uniq';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
@@ -39,6 +41,7 @@ export function updateTimeline(timeline, status, accept) {
     }
 
     dispatch(importFetchedStatus(status));
+    dispatch(fetchRelationships([status.reblog ? status.reblog.account.id : status.account.id, status.quote ? status.quote.account.id : null].filter(function(e){return e})));
 
     dispatch({
       type: TIMELINE_UPDATE,
@@ -111,6 +114,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchRelationships(uniq(response.data.map(item => item.reblog ? item.reblog.account.id : item.account.id).concat(response.data.map(item => item.quote ? item.quote.account.id : null)).filter(function(e){return e}))));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
       if (timelineId === 'home') {
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 39ca49693..f4d80c00e 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
@@ -23,6 +24,29 @@ import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
 export const textForScreenReader = (intl, status, rebloggedByText = false) => {
   const displayName = status.getIn(['account', 'display_name']);
 
@@ -59,7 +83,8 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default @injectIntl
+export default @connect(mapStateToProps)
+@injectIntl
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -70,6 +95,7 @@ class Status extends ImmutablePureComponent {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.map,
     otherAccounts: ImmutablePropTypes.list,
+    quote_muted: PropTypes.bool,
     onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
@@ -114,6 +140,7 @@ class Status extends ImmutablePureComponent {
     'hidden',
     'unread',
     'pictureInPicture',
+    'quote_muted',
   ];
 
   state = {
@@ -308,9 +335,9 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let media = null;
-    let statusAvatar, prepend, rebloggedByText, unlistedQuoteText;
+    let statusAvatar, prepend, rebloggedByText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture, contextType, quote_muted } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -569,12 +596,21 @@ class Status extends ImmutablePureComponent {
         }
       }
 
-      if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
-        unlistedQuoteText = intl.formatMessage({ id: 'status.unlisted_quote', defaultMessage: 'Unlisted quote' });
+      if (quote_muted) {
+        quote = (
+          <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
+            <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>
-              <button onClick={this.handleQuoteClick}>{unlistedQuoteText}</button>
+              <button onClick={this.handleQuoteClick}>
+                <FormattedMessage id='status.unlisted_quote' defaultMessage='Unlisted quote' />
+              </button>
             </div>
           </div>
         );
@@ -592,6 +628,14 @@ class Status extends ImmutablePureComponent {
           </div>
         );
       }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
+        </div>
+      );
     }
 
     return (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 242b4aee9..2344d8019 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Avatar from '../../../components/avatar';
@@ -6,7 +7,7 @@ import DisplayName from '../../../components/display_name';
 import StatusContent from '../../../components/status_content';
 import MediaGallery from '../../../components/media_gallery';
 import { Link } from 'react-router-dom';
-import { injectIntl, defineMessages, FormattedDate } from 'react-intl';
+import { injectIntl, defineMessages, FormattedDate, FormattedMessage } from 'react-intl';
 import Card from './card';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
@@ -24,7 +25,31 @@ const messages = defineMessages({
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });
 
-export default  @injectIntl
+const mapStateToProps = (state, props) => {
+  let status = props.status;
+
+  if (status === null) {
+    return null;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  if (status.get('quote', null) === null) {
+    return {
+      quote_muted: status.get('quote_id', null) ? true : false,
+    };
+  }
+  const id = status.getIn(['quote', 'account', 'id'], null);
+
+  return {
+    quote_muted: id !== null && (state.getIn(['relationships', id, 'muting']) || state.getIn(['relationships', id, 'blocking']) || state.getIn(['relationships', id, 'blocked_by']) || state.getIn(['relationships', id, 'domain_blocking'])) || status.getIn(['quote', 'quote_muted']),
+  };
+};
+
+export default @connect(mapStateToProps)
+@injectIntl
 class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -33,6 +58,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map,
+    quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
@@ -120,6 +146,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
+    const quote_muted = this.props.quote_muted
     const outerStyle = { boxSizing: 'border-box' };
     const { intl, compact, pictureInPicture } = this.props;
 
@@ -194,15 +221,33 @@ class DetailedStatus extends ImmutablePureComponent {
         }
       }
 
-      quote = (
-        <div className='quote-status'>
-          <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
-            <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
-          </a>
+      if (quote_muted) {
+        quote = (
+          <div className='quote-status'>
+            <div className='status__content muted-quote'>
+              <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+            </div>
+          </div>
+        );
+      } else {
+        quote = (
+          <div className='quote-status'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+              <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
+              <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
+            </a>
 
-          <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
-          {quote_media}
+            <StatusContent status={quote_status} onClick={this.handleQuoteClick} expanded={!status.get('quote_hidden')} onExpandedToggle={this.handleExpandedQuoteToggle} quote />
+            {quote_media}
+          </div>
+        );
+      }
+    } else if (quote_muted) {
+      quote = (
+        <div className={classNames('quote-status', { muted: this.props.muted })}>
+          <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
+            <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
+          </div>
         </div>
       );
     }
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 7cbb11dc6..321d7507d 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -457,6 +457,10 @@
         "defaultMessage": "Unlisted quote",
         "id": "status.unlisted_quote"
       },
+      {
+        "defaultMessage": "Muted quote",
+        "id": "status.muted_quote"
+      },
       {
         "defaultMessage": "Favourite",
         "id": "status.favourite"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e4d97fc34..8e9eeff8f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -401,11 +401,12 @@
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
+  "status.muted_quote": "Muted quote",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
-  "status.read_more": "Read more",
   "status.quote": "Quote",
+  "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
@@ -424,6 +425,7 @@
   "status.show_poll": "Show poll",
   "status.show_thread": "Show thread",
   "status.uncached_media_warning": "Not available",
+  "status.unlisted_quote": "Unlisted quote",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "suggestions.dismiss": "Dismiss suggestion",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 53597ac85..45ddd4ef5 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -401,12 +401,12 @@
   "status.more": "もっと見る",
   "status.mute": "@{name}さんをミュート",
   "status.mute_conversation": "会話をミュート",
+  "status.muted_quote": "ミュートされた引用",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
-  "status.read_more": "もっと見る",
   "status.quote": "引用",
-  "status.unlisted_quote": "未収載の引用",
+  "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
@@ -425,6 +425,7 @@
   "status.show_poll": "アンケートを表示",
   "status.show_thread": "スレッドを表示",
   "status.uncached_media_warning": "利用できません",
+  "status.unlisted_quote": "未収載の引用",
   "status.unmute_conversation": "会話のミュートを解除",
   "status.unpin": "プロフィールへの固定を解除",
   "suggestions.dismiss": "隠す",
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d..f84152199 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -88,22 +88,49 @@ export const makeGetStatus = () => {
     [
       (state, { id }) => state.getIn(['statuses', id]),
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
+      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
 
+      accountBase = accountBase.withMutations(map => {
+        map.set('relationship', relationship);
+        map.set('moved', moved);
+      });
+
       if (statusReblog) {
+        accountReblog = accountReblog.withMutations(map => {
+          map.set('relationship', reblogRelationship);
+          map.set('moved', reblogMoved);
+        });
         statusReblog = statusReblog.set('account', accountReblog);
       } else {
         statusReblog = null;
       }
 
+      if (statusQuote) {
+        accountQuote = accountQuote.withMutations(map => {
+          map.set('relationship', quoteRelationship);
+          map.set('moved', quoteMoved);
+        });
+        statusQuote = statusQuote.set('account', accountQuote);
+      } else {
+        statusQuote = null;
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;
@@ -114,6 +141,7 @@ export const makeGetStatus = () => {
 
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
+        map.set('quote', statusQuote);
         map.set('account', accountBase);
         map.set('filtered', filtered);
       });
diff --git a/app/javascript/mastodon/utils/uniq.js b/app/javascript/mastodon/utils/uniq.js
new file mode 100644
index 000000000..00f1804a1
--- /dev/null
+++ b/app/javascript/mastodon/utils/uniq.js
@@ -0,0 +1,3 @@
+export const uniq = array => {
+  return array.filter((x, i, self) => self.indexOf(x) === i)
+};
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8e965d080..cba90481d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1036,6 +1036,12 @@
     }
   }
 
+  & > .muted-quote {
+    color: $dark-text-color;
+    font-weight: 500;
+    font-size: 100%;
+  }
+
   .status__avatar,
   .detailed-status__display-avatar {
     height: 18px;
@@ -1531,77 +1537,6 @@ a .account__avatar {
   }
 }
 
-.account__action-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  line-height: 36px;
-  overflow: hidden;
-  flex: 0 0 auto;
-  display: flex;
-}
-
-.account__action-bar-dropdown {
-  padding: 10px;
-
-  .icon-button {
-    vertical-align: middle;
-  }
-
-  .dropdown--active {
-    .dropdown__content.dropdown__right {
-      left: 6px;
-      right: initial;
-    }
-
-    &::after {
-      bottom: initial;
-      margin-left: 11px;
-      margin-top: -7px;
-      right: initial;
-    }
-  }
-}
-
-.account__action-bar-links {
-  display: flex;
-  flex: 1 1 auto;
-  line-height: 18px;
-  text-align: center;
-}
-
-.account__action-bar__tab {
-  text-decoration: none;
-  overflow: hidden;
-  flex: 0 1 100%;
-  border-right: 1px solid lighten($ui-base-color, 8%);
-  padding: 10px 0;
-  border-bottom: 4px solid transparent;
-
-  &.active {
-    border-bottom: 4px solid $ui-highlight-color;
-  }
-
-  & > span {
-    display: block;
-    text-transform: uppercase;
-    font-size: 11px;
-    color: $darker-text-color;
-  }
-
-  strong {
-    display: block;
-    font-size: 15px;
-    font-weight: 500;
-    color: $primary-text-color;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-}
-
 .account-authorize {
   padding: 14px 10px;
 
@@ -1688,6 +1623,15 @@ a.account__display-name {
   margin-right: 10px;
 }
 
+.account__action-bar {
+  position: absolute;
+  height: 24px;
+  width: 48px;
+  top: 60px;
+  left: 10px;
+  z-index: 1;
+}
+
 .status__avatar {
   height: 48px;
   left: 10px;
@@ -2456,6 +2400,11 @@ a.account__display-name {
         margin-right: 15px;
       }
     }
+
+    .account__action-bar {
+      top: 67px;
+      left: 15px;
+    }
   }
 }
 
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 12c386600..f49b365bf 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -178,6 +178,16 @@ class REST::NestedQuoteSerializer < REST::StatusSerializer
   attribute :quote do
     nil
   end
+  attribute :quote_muted, if: :current_user?
+
+  def quote_muted
+    if instance_options && instance_options[:account_relationships]
+      instance_options[:account_relationships].muting[object.account_id] ? true : false || instance_options[:account_relationships].blocking[object.account_id] || instance_options[:account_relationships].blocked_by[object.account_id] || instance_options[:account_relationships].domain_blocking[object.account_id] || false
+    else
+      current_user.account.muting?(object.account) || object.account.blocking?(current_user.account) || current_user.account.blocking?(object.account) || current_user.account.domain_blocking?(object.account.domain) 
+    end
+  end
+
 end
 
 class REST::StatusSerializer < ActiveModel::Serializer

From 6cc71e2e58631dd88d2717b8214dc5fdc4e4bc26 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 27 Dec 2020 21:53:54 +0900
Subject: [PATCH 187/200] Add quote button in PiP

---
 .../picture_in_picture/components/footer.js   | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 1ecb18bf8..c89b86ffe 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button';
 import classNames from 'classnames';
 import { me, boostModal } from 'mastodon/initial_state';
 import { defineMessages, injectIntl } from 'react-intl';
-import { replyCompose } from 'mastodon/actions/compose';
+import { replyCompose, quoteCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { makeGetStatus } from 'mastodon/selectors';
 import { initBoostModal } from 'mastodon/actions/boosts';
@@ -20,9 +20,13 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+  cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
+  quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
@@ -119,6 +123,31 @@ class Footer extends ImmutablePureComponent {
     router.history.push(`/statuses/${status.get('id')}`);
   }
 
+  _performQuote = () => {
+    const { dispatch, status, onClose } = this.props;
+    const { router } = this.context;
+
+    if (onClose) {
+      onClose();
+    }
+
+    dispatch(quoteCompose(status, router.history));
+  };
+
+  handleQuoteClick = () => {
+    const { dispatch, askReplyConfirmation, intl } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(messages.quoteMessage),
+        confirm: intl.formatMessage(messages.quoteConfirm),
+        onConfirm: this._performQuote,
+      }));
+    } else {
+      this._performQuote();
+    }
+  }
+
   render () {
     const { status, intl, withOpenButton } = this.props;
 
@@ -152,6 +181,7 @@ class Footer extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        <IconButton className='status__action-bar-button' disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
       </div>
     );

From 2246dd448d936515c7f5547b85de63be0b754c4a Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Tue, 8 Dec 2020 22:58:24 +0900
Subject: [PATCH 188/200] Fix Open handler in quote media

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index f4d80c00e..fe2ee6a0f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -583,7 +583,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.props.onOpenMedia}
+                  onOpenMedia={this.handleOpenMedia}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}

From 952c501dbe31ef66c48bad62735f166867b6cc34 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 19 Dec 2020 10:14:10 +0900
Subject: [PATCH 189/200] fix rtl in quote_indicator

---
 .../mastodon/features/compose/components/quote_indicator.js | 6 +-----
 app/views/statuses/_quote_status.html.haml                  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/quote_indicator.js b/app/javascript/mastodon/features/compose/components/quote_indicator.js
index a48289de2..1d4c6a341 100644
--- a/app/javascript/mastodon/features/compose/components/quote_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/quote_indicator.js
@@ -6,7 +6,6 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
 import AttachmentList from 'mastodon/components/attachment_list';
 
 const messages = defineMessages({
@@ -45,9 +44,6 @@ class QuoteIndicator extends ImmutablePureComponent {
     }
 
     const content = { __html: status.get('contentHtml') };
-    const style   = {
-      direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr',
-    };
 
     return (
       <div className='quote-indicator'>
@@ -60,7 +56,7 @@ class QuoteIndicator extends ImmutablePureComponent {
           </a>
         </div>
 
-        <div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
+        <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
 
         {status.get('media_attachments').size > 0 && (
           <AttachmentList
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index de5fb6762..f2fc02258 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -16,7 +16,7 @@
       %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" }
       = Formatter.instance.format_in_quote(status, custom_emojify: true)
   
   - if !status.media_attachments.empty?

From df96a42c93f5799454ba48b1232c0fd8f2a47f16 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 31 Dec 2020 08:27:24 +0900
Subject: [PATCH 190/200] Fix expand video on public page for quote

---
 app/views/statuses/_quote_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
index f2fc02258..fa0b7b1b1 100644
--- a/app/views/statuses/_quote_status.html.haml
+++ b/app/views/statuses/_quote_status.html.haml
@@ -22,7 +22,7 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, quote: true do
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json, quote: true do
         = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
     - elsif status.media_attachments.first.audio?
       - audio = status.media_attachments.first

From 39c34681456afbf90d0b62291df8d6dfe9261dae Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 3 Jan 2021 23:19:41 +0900
Subject: [PATCH 191/200] Fix quoted account link in detailed status

---
 .../mastodon/features/status/components/detailed_status.js   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 2344d8019..8b9f3d711 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -83,8 +83,9 @@ class DetailedStatus extends ImmutablePureComponent {
 
   handleAccountClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
+      const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${id}`);
     }
 
     e.stopPropagation();
@@ -232,7 +233,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status'>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>

From deeea5f6820ef16217f1d50f0b3ac0162014d8b4 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 00:28:17 +0900
Subject: [PATCH 192/200] Fix modal footer to react to quoted posts

---
 app/javascript/mastodon/components/status.js  | 31 +++++++++++++------
 .../status/components/detailed_status.js      | 10 ++++--
 .../mastodon/features/status/index.js         | 10 ++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index fe2ee6a0f..b12b02dbd 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -245,10 +245,19 @@ class Status extends ImmutablePureComponent {
     this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    const status = this._properQuoteStatus();
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
+  }
+
   handleOpenMedia = (media, index) => {
     this.props.onOpenMedia(this._properStatus().get('id'), media, index);
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.onOpenMedia(this._properQuoteStatus().get('id'), media, index);
+  }
+
   handleHotkeyOpenMedia = e => {
     const { onOpenMedia, onOpenVideo } = this.props;
     const status = this._properStatus();
@@ -323,14 +332,18 @@ class Status extends ImmutablePureComponent {
     }
   }
 
-  handleRef = c => {
-    this.node = c;
+  _properQuoteStatus () {
+    const status = this._properStatus();
+
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
+      return status.get('quote');
+    } else {
+      return status;
+    }
   }
 
-  _properQuoteStatus () {
-    const { status } = this.props;
-
-    return status.get('quote');
+  handleRef = c => {
+    this.node = c;
   }
 
   render () {
@@ -514,7 +527,7 @@ class Status extends ImmutablePureComponent {
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
     let quote = null;
-    if (status.get('quote', null) !== null) {
+    if (status.get('quote', null) !== null && typeof status.get('quote') === 'object') {
       let quote_status = status.get('quote');
 
       let quote_media = null;
@@ -565,7 +578,7 @@ class Status extends ImmutablePureComponent {
                   height={110}
                   inline
                   sensitive={quote_status.get('sensitive')}
-                  onOpenVideo={this.handleOpenVideo}
+                  onOpenVideo={this.handleOpenVideoQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                   visible={this.state.showQuoteMedia}
@@ -583,7 +596,7 @@ class Status extends ImmutablePureComponent {
                   media={quote_status.get('media_attachments')}
                   sensitive={quote_status.get('sensitive')}
                   height={110}
-                  onOpenMedia={this.handleOpenMedia}
+                  onOpenMedia={this.handleOpenMediaQuote}
                   cacheWidth={this.props.cacheMediaWidth}
                   defaultWidth={this.props.cachedMediaWidth}
                   visible={this.state.showQuoteMedia}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 8b9f3d711..3856bb47c 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -61,6 +61,8 @@ class DetailedStatus extends ImmutablePureComponent {
     quote_muted: PropTypes.bool,
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
+    onOpenMediaQuote: PropTypes.func.isRequired,
+    onOpenVideoQuote: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
     measureHeight: PropTypes.bool,
     onHeightChange: PropTypes.func,
@@ -95,6 +97,10 @@ class DetailedStatus extends ImmutablePureComponent {
     this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
   }
 
+  handleOpenVideoQuote = (options) => {
+    this.props.onOpenVideoQuote(this.props.status.getIn(['quote', 'media_attachments', 0]), options);
+  }
+
   handleExpandedToggle = () => {
     this.props.onToggleHidden(this.props.status);
   }
@@ -199,7 +205,7 @@ class DetailedStatus extends ImmutablePureComponent {
               width={300}
               height={150}
               inline
-              onOpenVideo={this.handleOpenVideo}
+              onOpenVideo={this.handleOpenVideoQuote}
               sensitive={quote_status.get('sensitive')}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
@@ -213,7 +219,7 @@ class DetailedStatus extends ImmutablePureComponent {
               sensitive={quote_status.get('sensitive')}
               media={quote_status.get('media_attachments')}
               height={300}
-              onOpenMedia={this.props.onOpenMedia}
+              onOpenMedia={this.props.onOpenMediaQuote}
               visible={this.props.showQuoteMedia}
               onToggleVisibility={this.props.onToggleQuoteMediaVisibility}
               quote
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index ce0a26cb3..79bbdefa8 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -313,6 +313,14 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.get('id'), media, options }));
   }
 
+  handleOpenMediaQuote = (media, index) => {
+    this.props.dispatch(openModal('MEDIA', { statusId: this.props.status.getIn(['quote', 'id']), media, index }));
+  }
+
+  handleOpenVideoQuote = (media, options) => {
+    this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.getIn(['quote', 'id']), media, options }));
+  }
+
   handleHotkeyOpenMedia = e => {
     const { status } = this.props;
 
@@ -584,6 +592,8 @@ class Status extends ImmutablePureComponent {
                   status={status}
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
+                  onOpenVideoQuote={this.handleOpenVideoQuote}
+                  onOpenMediaQuote={this.handleOpenMediaQuote}
                   onToggleHidden={this.handleToggleHidden}
                   domain={domain}
                   showMedia={this.state.showMedia}

From bf125d3b84e428c9659213c7253b5b21f8cf4481 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 04:49:35 +0900
Subject: [PATCH 193/200] Fix missing reblog_of_quote

---
 app/javascript/mastodon/selectors/index.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index f84152199..a274fbfe9 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -92,16 +92,19 @@ export const makeGetStatus = () => {
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account'])]),
+      (state, { id }) => state.getIn(['relationships', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', id, 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account']), 'moved'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id']), 'account']), 'moved'])]),
+      (state, { id }) => state.getIn(['accounts', state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote', 'account']), 'moved'])]),
       getFiltersRegex,
     ],
 
-    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, relationship, reblogRelationship, quoteRelationship, moved, reblogMoved, quoteMoved, filtersRegex) => {
+    (statusBase, statusReblog, statusQuote, accountBase, accountReblog, accountQuote, accountReblogQuote, relationship, reblogRelationship, quoteRelationship, reblogQuoteRelationship, moved, reblogMoved, quoteMoved, reblogQuoteMoved, filtersRegex) => {
       if (!statusBase) {
         return null;
       }
@@ -131,6 +134,14 @@ export const makeGetStatus = () => {
         statusQuote = null;
       }
 
+      if (statusReblog && accountReblogQuote) {
+        accountReblogQuote = accountReblog.withMutations(map => {
+          map.set('relationship', reblogQuoteRelationship);
+          map.set('moved', reblogQuoteMoved);
+        });
+        statusReblog = statusReblog.setIn(['quote', 'account'], accountReblogQuote);
+      }
+
       const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
       if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
         return null;

From 7d5e14b36a67a2eb01e92a3da90a6caf72e2da14 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 09:45:37 +0900
Subject: [PATCH 194/200] Fix missing frameRate

---
 app/javascript/mastodon/components/status.js                     | 1 +
 .../mastodon/features/status/components/detailed_status.js       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index b12b02dbd..17f0de99f 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -571,6 +571,7 @@ class Status extends ImmutablePureComponent {
               {Component => (
                 <Component
                   preview={attachment.get('preview_url')}
+                  frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
                   blurhash={attachment.get('blurhash')}
                   src={attachment.get('url')}
                   alt={attachment.get('description')}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3856bb47c..3eca8b092 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -199,6 +199,7 @@ class DetailedStatus extends ImmutablePureComponent {
           quote_media = (
             <Video
               preview={attachment.get('preview_url')}
+              frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={attachment.get('blurhash')}
               src={attachment.get('url')}
               alt={attachment.get('description')}

From 712b0b3fa3d0afaa40447804c5449c967779e134 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Mon, 4 Jan 2021 13:39:11 +0900
Subject: [PATCH 195/200] Fix not hiding quoted unlisted status in non public
 timeline

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 17f0de99f..a08bb291a 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -618,7 +618,7 @@ class Status extends ImmutablePureComponent {
             </div>
           </div>
         );
-      } else if (quote_status.get('visibility') === 'unlisted' && contextType !== 'home') {
+      } else if (quote_status.get('visibility') === 'unlisted' && !!contextType && ['public', 'community', 'hashtag'].includes(contextType.split(':', 2)[0])) {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className={classNames('status__content unlisted-quote', { 'status__content--with-action': this.context.router })}>

From 89eca938b413ee5ad34d1b9be3cfe5365d329431 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Thu, 7 Jan 2021 15:56:40 +0900
Subject: [PATCH 196/200] Fix quote on public stream

---
 .../mastodon/containers/timeline_container.js   |  4 +++-
 .../status/components/detailed_status.js        |  6 +++---
 .../containers/detailed_status_container.js     | 17 +++++++++++++++++
 app/javascript/packs/public.js                  |  2 ++
 app/javascript/styles/mastodon/statuses.scss    |  4 ++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index ed8095f90..768169458 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,7 +47,9 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            {timeline}
+            <div className='standalone-timeline'>
+              {timeline}
+            </div>
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 3eca8b092..9d16a9aa9 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -231,7 +231,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
       if (quote_muted) {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <div className='status__content muted-quote'>
               <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
             </div>
@@ -239,7 +239,7 @@ class DetailedStatus extends ImmutablePureComponent {
         );
       } else {
         quote = (
-          <div className='quote-status'>
+          <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
             <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
@@ -252,7 +252,7 @@ class DetailedStatus extends ImmutablePureComponent {
       }
     } else if (quote_muted) {
       quote = (
-        <div className={classNames('quote-status', { muted: this.props.muted })}>
+        <div className={classNames('quote-status', { muted: this.props.muted })} data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
           <div className={classNames('status__content muted-quote', { 'status__content--with-action': this.context.router })}>
             <FormattedMessage id='status.muted_quote' defaultMessage='Muted quote' />
           </div>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index bfed16620..8238f654d 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,6 +20,8 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
+  hideQuote,
+  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -136,6 +138,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
+  onOpenMediaQuote (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+
+  onOpenVideoQuote (media, options) {
+    dispatch(openModal('VIDEO', { media, options }));
+  },
+
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -165,6 +175,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onQuoteToggleHidden (status) {
+    if (status.get('quote_hidden')) {
+      dispatch(revealQuote(status.get('id')));
+    } else {
+      dispatch(hideQuote(status.get('id')));
+    }
+  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index f6acf706c..3a92d891a 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -303,6 +303,8 @@ function main() {
     let url = target.closest('.quote-status').getAttribute('dataurl');
     if (target.closest('.status__display-name')) {
       url = target.closest('.status__display-name').getAttribute('href');
+    } else if (target.closest('.detailed-status__display-name')) {
+      url = target.closest('.detailed-status__display-name').getAttribute('href');
     } else if (target.closest('.status-card')) {
       url = target.closest('.status-card').getAttribute('href');
     }
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index ab91b3123..47dde12fd 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -99,6 +99,10 @@
   }
 }
 
+.standalone-timeline .quote-status {
+  cursor: pointer;
+}
+
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;

From a2f5b077b070576595da262b4d3eec0613901b22 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Thu, 20 May 2021 15:25:03 +0200
Subject: [PATCH 197/200] fix account page

---
 .../mastodon/features/status/components/detailed_status.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 9d16a9aa9..14bd6a3bf 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -87,7 +87,7 @@ class DetailedStatus extends ImmutablePureComponent {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
       const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${id}`);
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
 
     e.stopPropagation();

From 9bb16ac0e6ba849d89dbc10204692b8afbeac706 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Thu, 20 May 2021 15:51:00 +0200
Subject: [PATCH 198/200] fix account page

---
 .../mastodon/features/status/components/detailed_status.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 9d16a9aa9..14bd6a3bf 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -87,7 +87,7 @@ class DetailedStatus extends ImmutablePureComponent {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
       const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
-      this.context.router.history.push(`/accounts/${id}`);
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
 
     e.stopPropagation();

From a865832ab03b721bd25200e03345cd962bb04b6c Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 23 May 2021 01:12:55 +0900
Subject: [PATCH 199/200] update material theme

---
 .../mastodon-material/color/plus-classic.scss |  2 +-
 .../mastodon-material/color/v1-light.scss     |  2 +-
 .../mastodon-material/plugins/cards.scss      | 18 +++++++++--
 .../mastodon-material/plugins/fedibird.scss   |  1 +
 .../mastodon-material/plugins/itabashi.scss   | 32 +++++++++++++++++++
 .../mastodon-material/plugins/plus.scss       | 15 +++++++++
 .../mastodon-material-dark/plugins.scss       |  2 ++
 .../mastodon-material-light/plugins.scss      |  2 ++
 .../profiles/material-black/plugins.scss      |  2 ++
 .../profiles/material-dark/plugins.scss       |  2 ++
 .../profiles/material-light/plugins.scss      |  2 ++
 .../profiles/plus/plugins.scss                |  2 ++
 .../profiles/y-zu-dark/config.scss            |  4 ++-
 .../profiles/y-zu-dark/plugins.scss           |  2 ++
 .../profiles/y-zu-light/config.scss           |  4 ++-
 .../profiles/y-zu-light/plugins.scss          |  3 +-
 .../mastodon-material/theme/_mixins.scss      | 21 ++++++++++--
 .../mastodon-material/theme/base_config.scss  |  4 +++
 .../mastodon-material/theme/button.scss       |  5 +--
 .../mastodon-material/theme/columns.scss      |  5 ++-
 .../mastodon-material/theme/components.scss   | 25 ++++++++++-----
 .../mastodon-material/theme/emoji-picker.scss |  2 +-
 .../styles/mastodon-material/theme/icons.scss |  4 +--
 .../mastodon-material/theme/responsive.scss   |  4 +--
 .../mastodon-material/theme/statuses.scss     |  1 +
 25 files changed, 139 insertions(+), 27 deletions(-)
 create mode 100644 app/javascript/styles/mastodon-material/plugins/itabashi.scss

diff --git a/app/javascript/styles/mastodon-material/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
index 837b850cb..1c1f9f200 100644
--- a/app/javascript/styles/mastodon-material/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -125,7 +125,7 @@ $search-bar-focus-color: $bg-color;
 
 // 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/color/v1-light.scss b/app/javascript/styles/mastodon-material/color/v1-light.scss
index 35e1054ae..506f27588 100644
--- a/app/javascript/styles/mastodon-material/color/v1-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-light.scss
@@ -126,7 +126,7 @@ $search-bar-focus-color: $bg-color;
 
 // 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 48faf1ea1..be070c74a 100644
--- a/app/javascript/styles/mastodon-material/plugins/cards.scss
+++ b/app/javascript/styles/mastodon-material/plugins/cards.scss
@@ -6,6 +6,20 @@
     > .scrollable { background: $bg-color }
 }
 
+@media screen and (min-width: 415px) {
+    .column { padding: 0 !important }
+
+    .notification.notification,
+    .status {
+        border-radius: 0;
+
+        &__wrapper.status__wrapper {
+            margin: 8px 0;
+            border-radius: 0;
+        }
+    }
+}
+
 .status {
     border-bottom: 0;
     border-radius: $card-radius;
@@ -26,6 +40,4 @@
 
 .notification .status__wrapper.status__wrapper { box-shadow: none !important }
 
-.notification__filter-bar {
-    @include non-overflow-shadow-4dp;
-}
\ No newline at end of file
+.notification__filter-bar { @include non-overflow-shadow-4dp }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/plugins/fedibird.scss b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
index 2d92ecbf3..bf37885da 100644
--- a/app/javascript/styles/mastodon-material/plugins/fedibird.scss
+++ b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
@@ -13,6 +13,7 @@
     @include shadow-4dp;
     
     .tabs-bar {
+        &__link,
         &__link.active { border-bottom: none }
     }
 
diff --git a/app/javascript/styles/mastodon-material/plugins/itabashi.scss b/app/javascript/styles/mastodon-material/plugins/itabashi.scss
new file mode 100644
index 000000000..abcb30704
--- /dev/null
+++ b/app/javascript/styles/mastodon-material/plugins/itabashi.scss
@@ -0,0 +1,32 @@
+.quote-indicator {
+    @include card-elevation(false);
+    margin-bottom: 16px;
+    padding: 16px;
+
+    &__header { margin-bottom: 4px }
+
+    &__display-avatar { margin-right: 8px }
+
+    &__content { padding-top: 0 }
+}
+
+.quote-status {
+    @include card-elevation(false);
+    padding: 16px;
+
+    .detailed-status__display-avatar,
+    .status__avatar {
+        height: 32px;
+        width: 232px;
+        top: 16px !important;
+        left: 16px !important;
+
+        &>div {
+            width: 32px !important;
+            height: 32px !important;
+            background-size: 32px !important;
+        }
+    }
+
+    .display-name { padding-left: 40px }
+}
\ 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 ad0ed709c..9a5f93d43 100644
--- a/app/javascript/styles/mastodon-material/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material/plugins/plus.scss
@@ -38,4 +38,19 @@
 
         &.active { color: #ffffff }
     }
+}
+
+// Itabashi quote
+.quote-status {
+    border-radius: 0;
+    border: none;
+    border-top: 1px solid $border-color;
+    padding: 16px 0;
+
+    .detailed-status__display-avatar,
+    .status__avatar { left: 0 !important }
+}
+
+@media screen and (min-width: 630px) {
+    .quote-indicator__content, .reply-indicator__content, .status__content { padding-top: 32px }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
index e17916a49..0f869efac 100644
--- a/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-dark/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 //@import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
index e17916a49..0f869efac 100644
--- a/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/mastodon-material-light/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 //@import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
index e17916a49..0f869efac 100644
--- a/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/material-black/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 //@import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
index e17916a49..0f869efac 100644
--- a/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/material-dark/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 //@import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
index e17916a49..0f869efac 100644
--- a/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/material-light/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 //@import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss b/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
index 89adaca8a..25d7fc413 100644
--- a/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/plus/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 @import '../../plugins/cards';
 @import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 @import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
index fb818fab0..52cce4073 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/config.scss
@@ -1,3 +1,5 @@
 // Add your settings below
 
-@import '../../color/v2-dark';
\ No newline at end of file
+@import '../../color/v2-dark';
+
+$separate-address-line: true;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
index 292ec7fa6..77477b80a 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-dark/plugins.scss
@@ -1,4 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 @import '../../plugins/dense';
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
index d250ece15..1a8cac504 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/config.scss
@@ -1,3 +1,5 @@
 // Add your settings below
 
-@import '../../color/v2-light';
\ No newline at end of file
+@import '../../color/v2-light';
+
+$separate-address-line: true;
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
index 7a2d83e4d..77477b80a 100644
--- a/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
+++ b/app/javascript/styles/mastodon-material/profiles/y-zu-light/plugins.scss
@@ -1,5 +1,6 @@
 @import '../../plugins/astarte';
 //@import '../../plugins/cards';
 @import '../../plugins/dense';
-@import '../../plugins/fedibird'
+@import '../../plugins/fedibird';
+@import '../../plugins/itabashi';
 //@import '../../plugins/plus';
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
index a1520380d..8035eb9ba 100644
--- a/app/javascript/styles/mastodon-material/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -38,6 +38,23 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
+@mixin separate-address-line {
+    @if $separate-address-line { display: block }
+}
+
+@mixin card-elevation($elevation) {
+    border-radius: $card-radius;
+    background: $card-bg-color;
+
+    @if $elevation {
+        @include shadow-1dp;
+        border: none;
+    } @else {
+        box-shadow: none;
+        border: 1px solid $border-color;
+    }
+}
+
 @mixin chip-type($chip-type) {
     @if $chip-type == contained {
         background: $contained-chip-color;
@@ -123,9 +140,7 @@ $shadow-color-3: rgba(0,0,0,.12);
         border: 1px solid $border-color;
 
         &:active,
-        &:focus {
-            border: 2px solid $border-active-color;
-        }
+        &:focus { border: 2px solid $border-active-color }
     }
 }
 
diff --git a/app/javascript/styles/mastodon-material/theme/base_config.scss b/app/javascript/styles/mastodon-material/theme/base_config.scss
index a3f28a18e..16af30390 100644
--- a/app/javascript/styles/mastodon-material/theme/base_config.scss
+++ b/app/javascript/styles/mastodon-material/theme/base_config.scss
@@ -21,6 +21,10 @@
 $search-bar-hover: false;
 
 
+// Separate an address from a name line
+$separate-address-line: false;
+
+
 // Status font size in timeline
 $status-font-size: 15px;  // mastodon default
 //$status-font-size: 16px;  // compatible with material design
diff --git a/app/javascript/styles/mastodon-material/theme/button.scss b/app/javascript/styles/mastodon-material/theme/button.scss
index 2caa05ab9..19c5dae19 100644
--- a/app/javascript/styles/mastodon-material/theme/button.scss
+++ b/app/javascript/styles/mastodon-material/theme/button.scss
@@ -109,8 +109,9 @@ label.icon-button {
         background: $contained-button-color;
         margin: 2px;
     
-        &:hover { background: $contained-button-hover-color }
-    
+        &:active,
+        &:focus,
+        &:hover,
         .button--destructive:hover { background: $contained-button-hover-color }
     }
 
diff --git a/app/javascript/styles/mastodon-material/theme/columns.scss b/app/javascript/styles/mastodon-material/theme/columns.scss
index ca3f2d6f7..c543d7bd7 100644
--- a/app/javascript/styles/mastodon-material/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material/theme/columns.scss
@@ -152,7 +152,10 @@
     &:hover { background: $list-bg-hover-color }
 
     &:active,
-    &:focus { background: $list-bg-active-color }
+    &:focus {
+        color: $ui-text-color;
+        background: $list-bg-active-color;
+    }
 
     &__icon {
         margin-right: 32px;
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index d3aa51a2d..23c8ce941 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -394,8 +394,6 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
-
-        &__text { line-height: 36px }
     }
 
     &__chart {
@@ -412,11 +410,10 @@
     }
 
     &__link { color: $ui-text-color }
-
-    &__number { line-height: 36px }
 }
 
 .privacy-dropdown {
+    &.active .privacy-dropdown__value,
     &.active .privacy-dropdown__value.active {
         background: $icon-bg-hover-color;
         border-radius: 50%;
@@ -483,10 +480,7 @@
 .character-counter { color: $secondary-text-color }
 
 .reply-indicator {
-    box-shadow: none;
-    border: 1px solid $border-color;
-    border-radius: $card-radius;
-    background: $card-bg-color;
+    @include card-elevation(false);
     padding: 16px;
 
     &__header { margin-bottom: 4px }
@@ -731,4 +725,19 @@
 .loading-bar {
     background-color: $loading-indicator-color;
     height: 4px;
+}
+
+.regeneration-indicator {
+    color: $ui-text-color;
+    background: $bg-color;
+    padding: 16px;
+
+    &__label {
+        margin-top: 32px;
+
+        strong {
+            margin-bottom: 16px;
+            color: $secondary-text-color;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
index 9f8eeffaf..018264cb9 100644
--- a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
@@ -39,7 +39,7 @@
     &-bar {
         border: 0 solid $border-color;
 
-        &:first-child { background: $menu-bg-color }
+        &:first-child { background: $tab-bg-color }
     }
 
     &-anchor {
diff --git a/app/javascript/styles/mastodon-material/theme/icons.scss b/app/javascript/styles/mastodon-material/theme/icons.scss
index bb4b28eac..fa3cd7d6e 100644
--- a/app/javascript/styles/mastodon-material/theme/icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/icons.scss
@@ -14,6 +14,6 @@
 .icon-with-badge__badge {
     background: $badge-color;
     border: none;
-    padding: 2px 6px;
-    border-radius: 12px;
+    padding: 4px;
+    border-radius: 50%;
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
index 90c3af01e..2fc5cae79 100644
--- a/app/javascript/styles/mastodon-material/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -4,10 +4,10 @@
     &__link {
         padding: 16px 16px 12px 16px;
         color: $tab-item-color;
-        border-bottom: 4px solid transparent;
+        border-bottom: 2px solid transparent;
 
         &.active {
-            border-bottom: 4px solid $tab-item-active-color;
+            border-bottom: 2px solid $tab-item-active-color;
             color: $tab-item-active-color;
         }
 
diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
index 7fd2daa1f..55851e24a 100644
--- a/app/javascript/styles/mastodon-material/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -259,6 +259,7 @@ a.status-card {
 .display-name {
     &__html { color: $primary-text-color }
     &__account { color: $secondary-text-color }
+    strong { @include separate-address-line }
 }
 
 .activity-stream {

From 7d25a9e0306d3460d434a287ce67df71258e642f Mon Sep 17 00:00:00 2001
From: Rintan <12230083+Rintan@users.noreply.github.com>
Date: Sun, 23 May 2021 02:26:52 +0900
Subject: [PATCH 200/200] fix minor bugs

---
 .../mastodon-material/color/v2-light.scss     |  1 -
 .../mastodon-material/plugins/fedibird.scss   |  4 ++-
 .../mastodon-material/plugins/itabashi.scss   | 26 ++++++++++++++++---
 .../styles/mastodon-material/theme/icons.scss |  2 ++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon-material/color/v2-light.scss b/app/javascript/styles/mastodon-material/color/v2-light.scss
index 0e853ed39..3f08216e2 100644
--- a/app/javascript/styles/mastodon-material/color/v2-light.scss
+++ b/app/javascript/styles/mastodon-material/color/v2-light.scss
@@ -131,7 +131,6 @@ $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);
 
-
 // Media indicator color
 $media-page-indicator-color: #9e9e9e;
 $media-page-indicator-active-color: #e6e6e6;
diff --git a/app/javascript/styles/mastodon-material/plugins/fedibird.scss b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
index bf37885da..1eddd4d80 100644
--- a/app/javascript/styles/mastodon-material/plugins/fedibird.scss
+++ b/app/javascript/styles/mastodon-material/plugins/fedibird.scss
@@ -9,12 +9,14 @@
     i { margin: 0 }
 }
 
+.tabs-bar__link span { margin-left: 0 }
+
 .tabs-bar.bottom-bar {
     @include shadow-4dp;
     
     .tabs-bar {
         &__link,
-        &__link.active { border-bottom: none }
+        &__link.active { border-bottom: 4px solid transparent }
     }
 
     &__link span { margin-left: 0 }
diff --git a/app/javascript/styles/mastodon-material/plugins/itabashi.scss b/app/javascript/styles/mastodon-material/plugins/itabashi.scss
index abcb30704..76f1168f0 100644
--- a/app/javascript/styles/mastodon-material/plugins/itabashi.scss
+++ b/app/javascript/styles/mastodon-material/plugins/itabashi.scss
@@ -1,13 +1,26 @@
-.quote-indicator {
+.quote-indicator,
+.reply-indicator {
     @include card-elevation(false);
     margin-bottom: 16px;
     padding: 16px;
 
     &__header { margin-bottom: 4px }
 
-    &__display-avatar { margin-right: 8px }
+    &__display-avatar {
+        margin-right: 8px;
 
-    &__content { padding-top: 0 }
+        .account__avatar {
+            width: 32px !important;
+            height: 32px !important;
+            background-size: 32px !important;
+        }
+    }
+
+    &__content {
+        padding-top: 0;
+        padding-left: 32px;
+        color: $primary-text-color;
+    }
 }
 
 .quote-status {
@@ -28,5 +41,12 @@
         }
     }
 
+    .detailed-status__display-name {
+        span,
+        strong { @include separate-address-line }
+    }
+
     .display-name { padding-left: 40px }
+
+    &>.unlisted-quote>button { color: $ui-text-color }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/icons.scss b/app/javascript/styles/mastodon-material/theme/icons.scss
index fa3cd7d6e..091ccf247 100644
--- a/app/javascript/styles/mastodon-material/theme/icons.scss
+++ b/app/javascript/styles/mastodon-material/theme/icons.scss
@@ -16,4 +16,6 @@
     border: none;
     padding: 4px;
     border-radius: 50%;
+    width: 16px;
+    height: 16px;
 }
\ No newline at end of file